diff --git a/samples/test/features/self-service-registration-custom-attribute.feature b/samples/test/features/self-service-registration-custom-attribute.feature
index 1648132f8..7c4dd96a8 100644
--- a/samples/test/features/self-service-registration-custom-attribute.feature
+++ b/samples/test/features/self-service-registration-custom-attribute.feature
@@ -16,4 +16,4 @@ Feature: Add another Required Attribute to the Profile Enrollment Policy
     And she fills out another property
     And she submits the form
     # Then her user is created in the "Staged" state 
-    Then she is redirected to the "Select Authenticator Method" page
+    Then she is redirected to the "Select Authenticator" page
diff --git a/samples/test/features/self-service-registration.feature b/samples/test/features/self-service-registration.feature
index 1fdf7a635..2d40b123b 100644
--- a/samples/test/features/self-service-registration.feature
+++ b/samples/test/features/self-service-registration.feature
@@ -20,8 +20,8 @@ Scenario: Mary signs up for an account with Password, setups up required Email f
   And she fills out her Last Name
   And she fills out her Email
   And she submits the form
-  Then she is redirected to the "Select Authenticator Method" page
-  When she selects the "email" method
+  Then she is redirected to the "Select Authenticator" page
+  When she selects the "Email" factor
   And she submits the form
   Then she sees a page to input a code for email authenticator enrollment
   When she inputs the correct code from her "Email"
@@ -47,8 +47,8 @@ Scenario: Mary signs up for an account with Password, setups up required Email f
     And she fills out her Last Name
     And she fills out her Email
     And she submits the form
-  Then she is redirected to the "Select Authenticator Method" page
-  When she selects the "email" method
+  Then she is redirected to the "Select Authenticator" page
+  When she selects the "Email" factor
     And she submits the form
   Then she sees a page to input a code for email authenticator enrollment
   When she inputs the correct code from her "Email"
@@ -90,8 +90,8 @@ Scenario: Mary signs up for an account with Password, sets up required Email fac
   And she fills out her Last Name
   And she fills out her Email
     And she submits the form
-  Then she is redirected to the "Select Authenticator Method" page
-  When she selects the "email" method
+  Then she is redirected to the "Select Authenticator" page
+  When she selects the "Email" factor
     And she submits the form
   Then she sees a page to input a code for email authenticator enrollment
   When she inputs the correct code from her "Email"
@@ -118,8 +118,8 @@ Scenario: Mary signs up for an account with Password, setups up required Email f
   And she fills out her Last Name
   And she fills out her Email
   And she submits the form
-  Then she is redirected to the "Select Authenticator Method" page
-  When she selects the "email" method
+  Then she is redirected to the "Select Authenticator" page
+  When she selects the "Email" factor
     And she submits the form
   Then she sees a page to input a code for email authenticator enrollment
   When she clicks the Email magic link for email verification