diff --git a/app/controllers/account_reset/request_controller.rb b/app/controllers/account_reset/request_controller.rb
index 05c18b926a4..0ecc00c604e 100644
--- a/app/controllers/account_reset/request_controller.rb
+++ b/app/controllers/account_reset/request_controller.rb
@@ -24,7 +24,7 @@ def create_account_reset_request
     def confirm_two_factor_enabled
       return if MfaPolicy.new(current_user).two_factor_enabled?
 
-      redirect_to two_factor_options_url
+      redirect_to authentication_methods_setup_url
     end
 
     def analytics_attributes
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 830d7596552..59707cdce32 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -186,7 +186,8 @@ def add_piv_cac_setup_url
   end
 
   def service_provider_mfa_setup_url
-    service_provider_mfa_policy.user_needs_sp_auth_method_setup? ? two_factor_options_url : nil
+    service_provider_mfa_policy.user_needs_sp_auth_method_setup? ?
+      authentication_methods_setup_url : nil
   end
 
   def fix_broken_personal_key_url
@@ -312,7 +313,7 @@ def prompt_to_sign_in_with_request_id(request_id)
   end
 
   def prompt_to_setup_mfa
-    redirect_to two_factor_options_url
+    redirect_to authentication_methods_setup_url
   end
 
   def prompt_to_verify_mfa
diff --git a/app/controllers/sign_up/passwords_controller.rb b/app/controllers/sign_up/passwords_controller.rb
index b5699926e3a..9441308eec8 100644
--- a/app/controllers/sign_up/passwords_controller.rb
+++ b/app/controllers/sign_up/passwords_controller.rb
@@ -75,7 +75,7 @@ def process_unsuccessful_password_creation
 
     def sign_in_and_redirect_user
       sign_in @user
-      redirect_to two_factor_options_url
+      redirect_to authentication_methods_setup_url
     end
   end
 end
diff --git a/app/controllers/two_factor_authentication/personal_key_verification_controller.rb b/app/controllers/two_factor_authentication/personal_key_verification_controller.rb
index eb56cad8773..9237f4bab0e 100644
--- a/app/controllers/two_factor_authentication/personal_key_verification_controller.rb
+++ b/app/controllers/two_factor_authentication/personal_key_verification_controller.rb
@@ -26,7 +26,7 @@ def create
     def check_personal_key_enabled
       return if TwoFactorAuthentication::PersonalKeyPolicy.new(current_user).enabled?
 
-      redirect_to two_factor_options_url
+      redirect_to authentication_methods_setup_url
     end
 
     def presenter_for_two_factor_authentication_method
@@ -97,7 +97,7 @@ def handle_valid_otp
       elsif MfaPolicy.new(current_user).two_factor_enabled?
         redirect_to after_mfa_setup_path
       else
-        redirect_to two_factor_options_url
+        redirect_to authentication_methods_setup_url
       end
       reset_otp_session_data
     end
diff --git a/app/controllers/two_factor_authentication/sms_opt_in_controller.rb b/app/controllers/two_factor_authentication/sms_opt_in_controller.rb
index ea324fc7030..2b66d632443 100644
--- a/app/controllers/two_factor_authentication/sms_opt_in_controller.rb
+++ b/app/controllers/two_factor_authentication/sms_opt_in_controller.rb
@@ -65,7 +65,7 @@ def load_phone
 
     def other_options_mfa_url
       if new_user?
-        two_factor_options_path
+        authentication_methods_setup_path
       elsif has_other_auth_methods? && !user_fully_authenticated?
         login_two_factor_options_path
       end
diff --git a/app/controllers/users/two_factor_authentication_controller.rb b/app/controllers/users/two_factor_authentication_controller.rb
index 2101e98867c..f9ef0680840 100644
--- a/app/controllers/users/two_factor_authentication_controller.rb
+++ b/app/controllers/users/two_factor_authentication_controller.rb
@@ -54,7 +54,7 @@ def redirect_on_nothing_enabled
       if MfaPolicy.new(current_user).two_factor_enabled?
         redirect_to login_two_factor_options_path
       else
-        redirect_to two_factor_options_url
+        redirect_to authentication_methods_setup_url
       end
     end
 
@@ -308,7 +308,7 @@ def handle_too_many_confirmation_sends
       if user_fully_authenticated?
         redirect_to account_url
       else
-        redirect_to two_factor_options_url
+        redirect_to authentication_methods_setup_url
       end
     end
   end
diff --git a/app/controllers/users/two_factor_authentication_setup_controller.rb b/app/controllers/users/two_factor_authentication_setup_controller.rb
index 0ed30946a07..2177883bc12 100644
--- a/app/controllers/users/two_factor_authentication_setup_controller.rb
+++ b/app/controllers/users/two_factor_authentication_setup_controller.rb
@@ -22,14 +22,14 @@ def create
       elsif (result.errors[:selection].include? 'phone') ||
             IdentityConfig.store.kantara_2fa_phone_restricted
         flash[:phone_error] = t('errors.two_factor_auth_setup.must_select_additional_option')
-        redirect_to two_factor_options_path(anchor: 'select_phone')
+        redirect_to authentication_methods_setup_path(anchor: 'select_phone')
       else
         @presenter = two_factor_options_presenter
         render :index
       end
     rescue ActionController::ParameterMissing
       flash[:error] = t('errors.two_factor_auth_setup.must_select_option')
-      redirect_back(fallback_location: two_factor_options_path, allow_other_host: false)
+      redirect_back(fallback_location: authentication_methods_setup_path, allow_other_host: false)
     end
 
     private
diff --git a/app/presenters/cancellation_presenter.rb b/app/presenters/cancellation_presenter.rb
index 209e04529f6..8172dacb267 100644
--- a/app/presenters/cancellation_presenter.rb
+++ b/app/presenters/cancellation_presenter.rb
@@ -9,7 +9,7 @@ def initialize(referer:, url_options:)
   end
 
   def go_back_path
-    referer_path || two_factor_options_path
+    referer_path || authentication_methods_setup_path
   end
 
   def url_options
diff --git a/app/views/idv/doc_auth/welcome.html.erb b/app/views/idv/doc_auth/welcome.html.erb
index f93e9253cc8..dd10278335d 100644
--- a/app/views/idv/doc_auth/welcome.html.erb
+++ b/app/views/idv/doc_auth/welcome.html.erb
@@ -89,7 +89,7 @@
       <%= render 'shared/cancel', link: idv_cancel_path(step: 'welcome') %>
     <% else %>
       <div class='margin-top-2 padding-top-2 border-top border-primary-light'>
-        <%= link_to(t('two_factor_authentication.choose_another_option'), two_factor_options_path) %>
+        <%= link_to(t('two_factor_authentication.choose_another_option'), authentication_methods_setup_path) %>
       </div>
     <% end %>
   <% end %>
diff --git a/app/views/shared/_cancel_or_back_to_options.html.erb b/app/views/shared/_cancel_or_back_to_options.html.erb
index 24e1043e479..0e8e4222890 100644
--- a/app/views/shared/_cancel_or_back_to_options.html.erb
+++ b/app/views/shared/_cancel_or_back_to_options.html.erb
@@ -2,6 +2,6 @@
   <% if MfaPolicy.new(current_user).two_factor_enabled? %>
     <%= link_to t('links.cancel'), account_path %>
   <% else %>
-    <%= link_to t('two_factor_authentication.choose_another_option'), two_factor_options_path %>
+    <%= link_to t('two_factor_authentication.choose_another_option'), authentication_methods_setup_path %>
   <% end %>
 <% end %>
diff --git a/app/views/users/phone_setup/index.html.erb b/app/views/users/phone_setup/index.html.erb
index 26db6c61c61..cb8091f16fd 100644
--- a/app/views/users/phone_setup/index.html.erb
+++ b/app/views/users/phone_setup/index.html.erb
@@ -40,5 +40,5 @@
 <% end %>
 
 <%= render PageFooterComponent.new do %>
-  <%= link_to t('two_factor_authentication.choose_another_option'), two_factor_options_path %>
+  <%= link_to t('two_factor_authentication.choose_another_option'), authentication_methods_setup_path %>
 <% end %>
diff --git a/app/views/users/piv_cac_authentication_setup/error.html.erb b/app/views/users/piv_cac_authentication_setup/error.html.erb
index 1854d359069..4556e2298f7 100644
--- a/app/views/users/piv_cac_authentication_setup/error.html.erb
+++ b/app/views/users/piv_cac_authentication_setup/error.html.erb
@@ -12,6 +12,6 @@
   <% if MfaPolicy.new(current_user).two_factor_enabled? %>
     <%= link_to t('links.cancel'), account_path %>
   <% else %>
-    <%= link_to t('two_factor_authentication.choose_another_option'), two_factor_options_path %>
+    <%= link_to t('two_factor_authentication.choose_another_option'), authentication_methods_setup_path %>
   <% end %>
 <% end %>
diff --git a/app/views/users/two_factor_authentication_setup/index.html.erb b/app/views/users/two_factor_authentication_setup/index.html.erb
index 09efca23017..a77bcfc27f0 100644
--- a/app/views/users/two_factor_authentication_setup/index.html.erb
+++ b/app/views/users/two_factor_authentication_setup/index.html.erb
@@ -17,7 +17,7 @@
 <%= validated_form_for @two_factor_options_form,
                        html: { autocomplete: 'off' },
                        method: :patch,
-                       url: two_factor_options_path do |f| %>
+                       url: authentication_methods_setup_path do |f| %>
   <div class="margin-bottom-4">
     <fieldset class="margin-0 padding-0 border-0">
       <legend class="margin-bottom-2 usa-sr-only"><%= @presenter.intro %></legend>
diff --git a/config/routes.rb b/config/routes.rb
index 28e67cec754..b89f9f8cf8f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -222,9 +222,10 @@
     post '/account/personal_key' => 'accounts/personal_keys#create'
 
     get '/otp/send' => 'users/two_factor_authentication#send_code'
+
     get '/authentication_methods_setup' => 'users/two_factor_authentication_setup#index'
     patch '/authentication_methods_setup' => 'users/two_factor_authentication_setup#create'
-    get '/two_factor_options' => 'users/two_factor_authentication_setup#index'
+    get '/two_factor_options', to: redirect('/authentication_methods_setup')
     patch '/two_factor_options' => 'users/two_factor_authentication_setup#create'
     get '/second_mfa_setup' => 'users/mfa_selection#index'
     patch '/second_mfa_setup' => 'users/mfa_selection#update'
diff --git a/spec/controllers/account_reset/request_controller_spec.rb b/spec/controllers/account_reset/request_controller_spec.rb
index 4c5b54290f0..cf4cd94dd66 100644
--- a/spec/controllers/account_reset/request_controller_spec.rb
+++ b/spec/controllers/account_reset/request_controller_spec.rb
@@ -21,7 +21,7 @@
       stub_sign_in_before_2fa
       get :show
 
-      expect(response).to redirect_to two_factor_options_url
+      expect(response).to redirect_to authentication_methods_setup_url
     end
 
     it 'logs the visit to analytics' do
@@ -100,7 +100,7 @@
       stub_sign_in_before_2fa
       post :create
 
-      expect(response).to redirect_to two_factor_options_url
+      expect(response).to redirect_to authentication_methods_setup_url
     end
   end
 end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index bef613d7310..70d74a5c73a 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -184,7 +184,7 @@ def index
 
         get :index
 
-        expect(response).to redirect_to two_factor_options_url
+        expect(response).to redirect_to authentication_methods_setup_url
       end
     end
 
diff --git a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
index 93fd44df368..034985c3e67 100644
--- a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
+++ b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
@@ -35,7 +35,7 @@
       get :show
 
       expect(response.status).to eq(302)
-      expect(response.location).to eq(two_factor_options_url)
+      expect(response.location).to eq(authentication_methods_setup_url)
     end
   end
 
@@ -90,7 +90,7 @@
       post :create, params: { personal_key_form: { personal_key: raw_key } }
 
       expect(response.status).to eq(302)
-      expect(response.location).to eq(two_factor_options_url)
+      expect(response.location).to eq(authentication_methods_setup_url)
     end
 
     context 'when the personal key field is empty' do
diff --git a/spec/controllers/users/two_factor_authentication_controller_spec.rb b/spec/controllers/users/two_factor_authentication_controller_spec.rb
index 84e9a9b01c4..01c478e2526 100644
--- a/spec/controllers/users/two_factor_authentication_controller_spec.rb
+++ b/spec/controllers/users/two_factor_authentication_controller_spec.rb
@@ -236,7 +236,7 @@ def index
         stub_sign_in_before_2fa(build(:user))
         get :show
 
-        expect(response).to redirect_to two_factor_options_url
+        expect(response).to redirect_to authentication_methods_setup_url
       end
     end
 
@@ -265,7 +265,7 @@ def index
       it 'redirects to MFA setup if no PIV/CAC is enabled' do
         get :show
 
-        expect(response).to redirect_to(two_factor_options_url)
+        expect(response).to redirect_to(authentication_methods_setup_url)
       end
     end
   end
@@ -506,7 +506,7 @@ def index
               timeout: timeout,
             ),
           )
-          expect(response).to redirect_to two_factor_options_url
+          expect(response).to redirect_to authentication_methods_setup_url
         end
       end
 
diff --git a/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb b/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
index 139e3700ee6..d0c9ea0d814 100644
--- a/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
+++ b/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
@@ -113,7 +113,7 @@
       end
 
       it 'the redirect to the form page with an anchor' do
-        expect(response).to redirect_to(two_factor_options_path(anchor: 'select_phone'))
+        expect(response).to redirect_to(authentication_methods_setup_path(anchor: 'select_phone'))
       end
       it 'contains a flash message' do
         expect(flash[:phone_error]).to eq(
diff --git a/spec/features/accessibility/user_pages_spec.rb b/spec/features/accessibility/user_pages_spec.rb
index d96d5120b57..788fe3e789a 100644
--- a/spec/features/accessibility/user_pages_spec.rb
+++ b/spec/features/accessibility/user_pages_spec.rb
@@ -37,7 +37,7 @@
     scenario 'two factor options page' do
       sign_up_and_set_password
 
-      expect(current_path).to eq(two_factor_options_path)
+      expect(current_path).to eq(authentication_methods_setup_path)
       expect(page).to be_axe_clean.according_to :section508, :"best-practice", :wcag21aa
       expect(page).to label_required_fields
       expect(page).to be_uniquely_titled
diff --git a/spec/features/openid_connect/aal3_required_spec.rb b/spec/features/openid_connect/aal3_required_spec.rb
index 78d6795c931..1d7e77734c5 100644
--- a/spec/features/openid_connect/aal3_required_spec.rb
+++ b/spec/features/openid_connect/aal3_required_spec.rb
@@ -11,7 +11,7 @@
         visit_idp_from_ial1_oidc_sp_requesting_aal3(prompt: 'select_account')
         sign_in_live_with_2fa(user)
 
-        expect(current_url).to eq(two_factor_options_url)
+        expect(current_url).to eq(authentication_methods_setup_url)
         expect(page).to have_content(t('two_factor_authentication.two_factor_aal3_choice'))
         expect(page).to have_xpath("//img[@alt='important alert icon']")
       end
@@ -43,7 +43,7 @@
         visit_idp_from_ial1_oidc_sp_defaulting_to_aal3(prompt: 'select_account')
         sign_in_live_with_2fa(user)
 
-        expect(current_url).to eq(two_factor_options_url)
+        expect(current_url).to eq(authentication_methods_setup_url)
         expect(page).to have_content(t('two_factor_authentication.two_factor_aal3_choice'))
         expect(page).to have_xpath("//img[@alt='important alert icon']")
       end
diff --git a/spec/features/phone/confirmation_spec.rb b/spec/features/phone/confirmation_spec.rb
index faf84bb34cc..ad503c58c32 100644
--- a/spec/features/phone/confirmation_spec.rb
+++ b/spec/features/phone/confirmation_spec.rb
@@ -28,7 +28,7 @@ def expect_successful_otp_confirmation(delivery_method)
     def expect_failed_otp_confirmation(_delivery_method)
       visit account_path
 
-      expect(current_path).to eq(two_factor_options_path)
+      expect(current_path).to eq(authentication_methods_setup_path)
       expect(phone_configuration).to be_nil
     end
   end
diff --git a/spec/features/saml/aal3_required_spec.rb b/spec/features/saml/aal3_required_spec.rb
index 2b72e43d460..1f56478d872 100644
--- a/spec/features/saml/aal3_required_spec.rb
+++ b/spec/features/saml/aal3_required_spec.rb
@@ -21,7 +21,7 @@
         sign_in_and_2fa_user(user_with_2fa)
         visit_saml_authn_request_url(overrides: { issuer: aal3_issuer, authn_context: nil })
 
-        expect(current_url).to eq(two_factor_options_url)
+        expect(current_url).to eq(authentication_methods_setup_url)
         expect(page).to have_content(t('two_factor_authentication.two_factor_aal3_choice'))
         expect(page).to have_xpath("//img[@alt='important alert icon']")
       end
diff --git a/spec/features/saml/ial1_sso_spec.rb b/spec/features/saml/ial1_sso_spec.rb
index c61b645dd4c..6608886644f 100644
--- a/spec/features/saml/ial1_sso_spec.rb
+++ b/spec/features/saml/ial1_sso_spec.rb
@@ -148,7 +148,7 @@
 
       visit saml_authn_request_url
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
     end
   end
 
diff --git a/spec/features/saml/saml_spec.rb b/spec/features/saml/saml_spec.rb
index 9b8a2df2485..0905d80b170 100644
--- a/spec/features/saml/saml_spec.rb
+++ b/spec/features/saml/saml_spec.rb
@@ -74,7 +74,7 @@ class MockSession; end
       end
 
       it 'prompts the user to set up 2FA' do
-        expect(current_path).to eq two_factor_options_path
+        expect(current_path).to eq authentication_methods_setup_path
       end
 
       it 'prompts the user to confirm phone after setting up 2FA' do
diff --git a/spec/features/two_factor_authentication/multiple_mfa_sign_up_spec.rb b/spec/features/two_factor_authentication/multiple_mfa_sign_up_spec.rb
index 44f35030338..6158711d305 100644
--- a/spec/features/two_factor_authentication/multiple_mfa_sign_up_spec.rb
+++ b/spec/features/two_factor_authentication/multiple_mfa_sign_up_spec.rb
@@ -10,7 +10,7 @@
     scenario 'user can set up 2 MFA methods properly' do
       sign_in_before_2fa
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
 
       click_2fa_option('phone')
       click_2fa_option('backup_code')
@@ -43,7 +43,7 @@
     scenario 'user can select 1 MFA methods and will be prompted to add another method' do
       sign_in_before_2fa
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
 
       click_2fa_option('backup_code')
 
@@ -81,7 +81,7 @@
       to have_content(t('errors.two_factor_auth_setup.must_select_additional_option'))
       expect(
         URI.parse(current_url).path + '#' + URI.parse(current_url).fragment,
-      ).to eq two_factor_options_path(anchor: 'select_phone')
+      ).to eq authentication_methods_setup_path(anchor: 'select_phone')
     end
 
     scenario 'clears the error when another mfa method is selected' do
diff --git a/spec/features/two_factor_authentication/sign_in_spec.rb b/spec/features/two_factor_authentication/sign_in_spec.rb
index 78d898b5c91..a91ff93fd0d 100644
--- a/spec/features/two_factor_authentication/sign_in_spec.rb
+++ b/spec/features/two_factor_authentication/sign_in_spec.rb
@@ -7,7 +7,7 @@
 
       attempt_to_bypass_2fa_setup
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
 
       select_2fa_option('phone')
 
@@ -55,7 +55,7 @@
 
         click_on t('two_factor_authentication.choose_another_option')
 
-        expect(current_path).to eq two_factor_options_path
+        expect(current_path).to eq authentication_methods_setup_path
       end
     end
 
diff --git a/spec/features/users/sign_in_spec.rb b/spec/features/users/sign_in_spec.rb
index 3b8ae651141..0003f022f1b 100644
--- a/spec/features/users/sign_in_spec.rb
+++ b/spec/features/users/sign_in_spec.rb
@@ -143,7 +143,7 @@
     submit_form_with_valid_email(email)
     click_confirmation_link_in_email(email)
     submit_form_with_valid_password
-    expect(page).to have_current_path(two_factor_options_path)
+    expect(page).to have_current_path(authentication_methods_setup_path)
 
     select_2fa_option('phone')
     fill_in :new_phone_form_phone, with: '2025551314'
@@ -930,7 +930,7 @@
       fill_in_code_with_last_phone_otp
       click_submit_default
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
       select_2fa_option('piv_cac')
 
       expect(page).to have_current_path setup_piv_cac_path
diff --git a/spec/features/users/sign_up_spec.rb b/spec/features/users/sign_up_spec.rb
index aaa40ea4cc6..8bb943b45b8 100644
--- a/spec/features/users/sign_up_spec.rb
+++ b/spec/features/users/sign_up_spec.rb
@@ -124,7 +124,7 @@
         Throttle.attempt_window_in_minutes(:phone_confirmation).minutes,
       )
 
-      expect(current_path).to eq(two_factor_options_path)
+      expect(current_path).to eq(authentication_methods_setup_path)
       expect(page).to have_content(
         I18n.t(
           'errors.messages.phone_confirmation_throttled',
@@ -303,7 +303,7 @@
         click_confirmation_link_in_email(email)
         submit_form_with_valid_password
 
-        expect(page).to have_current_path(two_factor_options_path)
+        expect(page).to have_current_path(authentication_methods_setup_path)
       end
     end
   end
@@ -322,7 +322,7 @@
 
   it 'redirects back with an error if the user does not select 2FA option' do
     sign_in_user
-    visit two_factor_options_path
+    visit authentication_methods_setup_path
     click_on 'Continue'
 
     expect(page).to have_content(t('errors.two_factor_auth_setup.must_select_option'))
diff --git a/spec/features/visitors/email_confirmation_spec.rb b/spec/features/visitors/email_confirmation_spec.rb
index 7ad04872442..622efcc2f32 100644
--- a/spec/features/visitors/email_confirmation_spec.rb
+++ b/spec/features/visitors/email_confirmation_spec.rb
@@ -17,7 +17,7 @@
     fill_in t('forms.password'), with: Features::SessionHelper::VALID_PASSWORD
     click_button t('forms.buttons.continue')
 
-    expect(current_url).to eq two_factor_options_url
+    expect(current_url).to eq authentication_methods_setup_url
     expect(page).to_not have_content t('devise.confirmations.confirmed_but_must_set_password')
   end
 
diff --git a/spec/features/visitors/password_recovery_spec.rb b/spec/features/visitors/password_recovery_spec.rb
index 131bf942438..8d2ec6fe37f 100644
--- a/spec/features/visitors/password_recovery_spec.rb
+++ b/spec/features/visitors/password_recovery_spec.rb
@@ -54,7 +54,7 @@
 
       fill_in_credentials_and_submit(user.email, 'NewVal!dPassw0rd')
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
     end
   end
 
@@ -91,7 +91,7 @@
     it 'prompts user to set up their 2FA options after signing back in' do
       reset_password_and_sign_back_in(@user)
 
-      expect(current_path).to eq two_factor_options_path
+      expect(current_path).to eq authentication_methods_setup_path
     end
   end
 
diff --git a/spec/features/webauthn/sign_up_spec.rb b/spec/features/webauthn/sign_up_spec.rb
index 8446481ef18..c421c1c284f 100644
--- a/spec/features/webauthn/sign_up_spec.rb
+++ b/spec/features/webauthn/sign_up_spec.rb
@@ -18,7 +18,7 @@ def expect_webauthn_setup_success
 
   def expect_webauthn_setup_error
     expect(page).to have_content t('errors.webauthn_setup.general_error')
-    expect(page).to have_current_path(two_factor_options_path)
+    expect(page).to have_current_path(authentication_methods_setup_path)
   end
 
   it_behaves_like 'webauthn setup'
diff --git a/spec/presenters/cancellation_presenter_spec.rb b/spec/presenters/cancellation_presenter_spec.rb
index d56f7794acc..3200f402a01 100644
--- a/spec/presenters/cancellation_presenter_spec.rb
+++ b/spec/presenters/cancellation_presenter_spec.rb
@@ -8,7 +8,7 @@
   subject { described_class.new(referer: referer_header, url_options: {}) }
 
   describe '#go_back_link' do
-    let(:sign_up_path) { '/two_factor_options' }
+    let(:sign_up_path) { '/authentication_methods_setup' }
 
     context 'without a referer header' do
       let(:referer_header) { nil }
diff --git a/spec/support/features/session_helper.rb b/spec/support/features/session_helper.rb
index 34ffe9b3e77..fd55a2e2cb1 100644
--- a/spec/support/features/session_helper.rb
+++ b/spec/support/features/session_helper.rb
@@ -549,7 +549,7 @@ def set_up_2fa_with_authenticator_app
 
     def register_user_with_piv_cac(email = 'test@test.com')
       confirm_email_and_password(email)
-      expect(page).to have_current_path two_factor_options_path
+      expect(page).to have_current_path authentication_methods_setup_path
       expect(page).to have_content(
         t('two_factor_authentication.two_factor_choice_options.piv_cac'),
       )
diff --git a/spec/views/phone_setup/index.html.erb_spec.rb b/spec/views/phone_setup/index.html.erb_spec.rb
index c8fd92fc000..7f1f223a877 100644
--- a/spec/views/phone_setup/index.html.erb_spec.rb
+++ b/spec/views/phone_setup/index.html.erb_spec.rb
@@ -23,7 +23,7 @@
   it 'renders a link to choose a different option' do
     expect(render).to have_link(
       t('two_factor_authentication.choose_another_option'),
-      href: two_factor_options_path,
+      href: authentication_methods_setup_path,
     )
   end
 
diff --git a/spec/views/users/piv_cac_authentication_setup/new.html.erb_spec.rb b/spec/views/users/piv_cac_authentication_setup/new.html.erb_spec.rb
index 3f3bcf9ab25..0bce6af8bb4 100644
--- a/spec/views/users/piv_cac_authentication_setup/new.html.erb_spec.rb
+++ b/spec/views/users/piv_cac_authentication_setup/new.html.erb_spec.rb
@@ -27,7 +27,7 @@
 
       expect(rendered).to have_link(
         t('two_factor_authentication.choose_another_option'),
-        href: two_factor_options_path,
+        href: authentication_methods_setup_path,
       )
     end
   end
diff --git a/spec/views/users/totp_setup/new.html.erb_spec.rb b/spec/views/users/totp_setup/new.html.erb_spec.rb
index d0a669b075f..22220251bb1 100644
--- a/spec/views/users/totp_setup/new.html.erb_spec.rb
+++ b/spec/views/users/totp_setup/new.html.erb_spec.rb
@@ -71,7 +71,7 @@
 
       expect(rendered).to have_link(
         t('two_factor_authentication.choose_another_option'),
-        href: two_factor_options_path,
+        href: authentication_methods_setup_path,
       )
     end
   end