diff --git a/components/lib/fieldset/style/FieldsetStyle.js b/components/lib/fieldset/style/FieldsetStyle.js
index 4e8ba220a..b2f7ac33b 100644
--- a/components/lib/fieldset/style/FieldsetStyle.js
+++ b/components/lib/fieldset/style/FieldsetStyle.js
@@ -8,9 +8,9 @@ const classes = {
         }
     ],
     legend: 'p-fieldset-legend',
-    legendtitle: 'p-fieldset-legend-text',
-    togglericon: 'p-fieldset-toggler',
-    toggleablecontent: 'p-toggleable-content',
+    legendtitle: 'p-fieldset-legend-label',
+    togglericon: 'p-fieldset-toggle-icon',
+    toggleablecontent: 'p-fieldset-content-container',
     content: 'p-fieldset-content'
 };
 
diff --git a/components/lib/themes/primeone/base/fieldset/index.js b/components/lib/themes/primeone/base/fieldset/index.js
index 97906d892..421e80e66 100644
--- a/components/lib/themes/primeone/base/fieldset/index.js
+++ b/components/lib/themes/primeone/base/fieldset/index.js
@@ -48,12 +48,12 @@ export default {
     background: ${dt('fieldset.legend.hover.background')};
 }
 
-.p-fieldset-toggler {
+.p-fieldset-toggle-icon {
     color: ${dt('fieldset.toggle.icon.color')};
     transition: color ${dt('transition.duration')};
 }
 
-.p-fieldset-toggleable > .p-fieldset-legend > a:hover > .p-fieldset-toggler {
+.p-fieldset-toggleable > .p-fieldset-legend > a:hover > .p-fieldset-toggle-icon {
     color: ${dt('fieldset.toggle.icon.hover.color')};
 }