diff --git a/packages/eui/src/components/steps/__snapshots__/step.test.tsx.snap b/packages/eui/src/components/steps/__snapshots__/step.test.tsx.snap
index ce9e2b643b1..1198e9d88e7 100644
--- a/packages/eui/src/components/steps/__snapshots__/step.test.tsx.snap
+++ b/packages/eui/src/components/steps/__snapshots__/step.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`EuiStep is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -48,7 +48,7 @@ exports[`EuiStep props headingElement 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -86,7 +86,7 @@ exports[`EuiStep props status complete is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-complete-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-complete"
     >
       <span
         class="euiStepNumber__icon emotion-euiStepNumber__icon-complete"
@@ -119,7 +119,7 @@ exports[`EuiStep props status current is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-current-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-current"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -157,7 +157,7 @@ exports[`EuiStep props status danger is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-danger-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-danger"
     >
       <span
         class="euiStepNumber__icon emotion-euiStepNumber__icon-danger"
@@ -190,7 +190,7 @@ exports[`EuiStep props status disabled is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-disabled-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-disabled"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -228,7 +228,7 @@ exports[`EuiStep props status incomplete is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-incomplete-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-incomplete"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -266,7 +266,7 @@ exports[`EuiStep props status loading is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-loading-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-loading"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -303,7 +303,7 @@ exports[`EuiStep props status warning is rendered 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-warning-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s-warning"
     >
       <span
         class="euiStepNumber__icon emotion-euiStepNumber__icon-warning"
@@ -336,7 +336,7 @@ exports[`EuiStep props step 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-s"
     >
       <span
         class="emotion-euiScreenReaderOnly"
@@ -374,7 +374,7 @@ exports[`EuiStep props titleSize 1`] = `
     class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
   >
     <span
-      class="euiStepNumber emotion-euiStepNumber-xs-EuiStep"
+      class="euiStepNumber emotion-euiStepNumber-xs"
     >
       <span
         class="emotion-euiScreenReaderOnly"
diff --git a/packages/eui/src/components/steps/__snapshots__/steps.test.tsx.snap b/packages/eui/src/components/steps/__snapshots__/steps.test.tsx.snap
index d53a9191615..a9f3ac0e7e2 100644
--- a/packages/eui/src/components/steps/__snapshots__/steps.test.tsx.snap
+++ b/packages/eui/src/components/steps/__snapshots__/steps.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`EuiSteps renders step title inside "headingElement" element 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -48,7 +48,7 @@ exports[`EuiSteps renders step title inside "headingElement" element 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -83,7 +83,7 @@ exports[`EuiSteps renders step title inside "headingElement" element 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-incomplete-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s-incomplete"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -127,7 +127,7 @@ exports[`EuiSteps renders steps 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -162,7 +162,7 @@ exports[`EuiSteps renders steps 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -197,7 +197,7 @@ exports[`EuiSteps renders steps 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-incomplete-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s-incomplete"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -241,7 +241,7 @@ exports[`EuiSteps renders steps with firstStepNumber 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -276,7 +276,7 @@ exports[`EuiSteps renders steps with firstStepNumber 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -311,7 +311,7 @@ exports[`EuiSteps renders steps with firstStepNumber 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-s-incomplete-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-s-incomplete"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -355,7 +355,7 @@ exports[`EuiSteps renders steps with titleSize 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-xs-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-xs"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -390,7 +390,7 @@ exports[`EuiSteps renders steps with titleSize 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-xs-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-xs"
       >
         <span
           class="emotion-euiScreenReaderOnly"
@@ -425,7 +425,7 @@ exports[`EuiSteps renders steps with titleSize 1`] = `
       class="euiStep__titleWrapper emotion-euiStep__titleWrapper"
     >
       <span
-        class="euiStepNumber emotion-euiStepNumber-xs-incomplete-EuiStep"
+        class="euiStepNumber emotion-euiStepNumber-xs-incomplete"
       >
         <span
           class="emotion-euiScreenReaderOnly"