diff --git a/components/lib/datatable/style/DataTableStyle.js b/components/lib/datatable/style/DataTableStyle.js
index 5661f6805..5e2193e8f 100644
--- a/components/lib/datatable/style/DataTableStyle.js
+++ b/components/lib/datatable/style/DataTableStyle.js
@@ -58,7 +58,7 @@ const classes = {
         }
     ],
     filterInput: 'p-datatable-filter-element-container',
-    filterMenuButton: 'p-datatable-column-filter-dropdown',
+    filterMenuButton: 'p-datatable-column-filter-button',
     headerFilterClearButton: 'p-datatable-column-filter-clear-button',
     filterOverlay: ({ instance, props }) => [
         'p-datatable-filter-overlay p-component',
diff --git a/components/lib/themes/primeone/base/tree/index.js b/components/lib/themes/primeone/base/tree/index.js
index b54afa42b..ebf0c2407 100644
--- a/components/lib/themes/primeone/base/tree/index.js
+++ b/components/lib/themes/primeone/base/tree/index.js
@@ -49,7 +49,7 @@ export default {
     color: ${dt('highlight.color')};
 }
 
-.p-tree-node-toggle {
+.p-tree-node-toggle-button {
     cursor: pointer;
     user-select: none;
     display: inline-flex;
@@ -70,17 +70,17 @@ export default {
     padding: 0;
 }
 
-.p-tree-node-toggle:enabled:hover {
+.p-tree-node-toggle-button:enabled:hover {
     background: ${dt('tree.toggle.hover.background')};
     color: ${dt('tree.toggle.hover.color')};
 }
 
-.p-tree-node-content.p-tree-node-selected .p-tree-node-toggle,
+.p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-button,
 .p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-icon {
     color: inherit;
 }
 
-.p-tree-node-content.p-tree-node-selected .p-tree-node-toggle:hover {
+.p-tree-node-content.p-tree-node-selected .p-tree-node-toggle-button:hover {
     background: ${dt('tree.toggle.highlight.hover.background')};
 }
 
@@ -89,7 +89,7 @@ export default {
     color: ${dt('tree.node.hover.color')};
 }
 
-.p-tree-node-content.p-tree-node-selectable:not(.p-tree-node-selected):hover .p-tree-node-toggle {
+.p-tree-node-content.p-tree-node-selectable:not(.p-tree-node-selected):hover .p-tree-node-toggle-button {
     color: ${dt('tree.toggle.hover.color')};
 }
 
@@ -113,7 +113,7 @@ export default {
     user-select: none;
 }
 
-.p-tree-node-leaf > .p-tree-node-content .p-tree-node-toggle {
+.p-tree-node-leaf > .p-tree-node-content .p-tree-node-toggle-button {
     visibility: hidden;
 }
 
diff --git a/components/lib/tree/style/TreeStyle.js b/components/lib/tree/style/TreeStyle.js
index b60ea9b7d..55224706a 100644
--- a/components/lib/tree/style/TreeStyle.js
+++ b/components/lib/tree/style/TreeStyle.js
@@ -25,7 +25,7 @@ const classes = {
             'p-tree-node-selected': instance.checkboxMode && instance.$parentInstance.highlightOnSelect ? instance.checked : instance.selected
         }
     ],
-    toggler: 'p-tree-node-toggle',
+    toggler: 'p-tree-node-toggle-button',
     togglerIcon: 'p-tree-node-toggle-icon',
     nodeTogglerIcon: 'p-tree-node-toggler-icon', //todo: discuss
     nodeCheckbox: 'p-tree-node-checkbox',