diff --git a/config/locales/controllers.en.yml b/config/locales/controllers.en.yml
index 04659dab..ebc88235 100644
--- a/config/locales/controllers.en.yml
+++ b/config/locales/controllers.en.yml
@@ -65,11 +65,13 @@ en:
       update:
         success: "Theme saved successfully."
         error: "Theme saving failed. %{errors}"
+    two_factor_authentication:
+      otp_authentication:
+        update:
+          error: :errors.invalid_otp
+        destroy:
+          success: "Two factor authentication has been disabled for your account."
   user:
-    update_2fa:
-      error: :errors.invalid_otp
-    destroy_2fa:
-      success: "Two factor authentication has been disabled for your account."
     sessions:
       create:
         info: "You have %{count} recovery codes remaining."
diff --git a/config/locales/views.en.yml b/config/locales/views.en.yml
index 9f7cd598..b9a1270c 100644
--- a/config/locales/views.en.yml
+++ b/config/locales/views.en.yml
@@ -182,37 +182,40 @@ en:
         adjust:
           profile_picture: "Adjust your new profile picture"
           profile_header: "Adjust your new profile header"
-    security:
-      heading: "Two-factor authentication"
-      recovery_keys:
-        heading: "Your %{app_name} recovery codes"
-        generated_at: "These codes were generated at %{time}"
-        recommendation: "We recommend storing these in a password manager or printing them out on paper."
-        print: "Print"
-        consideration: "Please consider the environment before printing this page."
-      totp_enabled:
-        body: "Your account is set up to require the use of a one-time password in order to log in."
-        recovery_code_count: "You currently have %{count} unused recovery codes."
-        remove:
-          action: "Remove Two-factor authentication"
-          confirm: "Are you sure you want to disable two-factor authentication?"
-        regenerate:
-          action: "Regenerate recovery codes"
-          confirm: "Are you sure? This will disable your previous set of recovery codes."
-      totp_setup:
-        setup_key: "If you cannot scan the QR code, use the following key instead:"
-        setup_qr: "Once you have downloaded an authenticator app, add your %{app_name} account by scanning the QR code displayed on the left."
-        otp_validation: "Enter the code displayed in the app here:"
-        app:
-          none: "If you do not have an authenticator app already installed on your device, we suggest one of the following:"
-          aegis: "Aegis Authenticator for Android"
-          strongbox: "Strongbox Authenticator for iOS"
-          microsoft: "Microsoft Authenticator"
-        source:
-          app_store: "App Store"
-          fdroid: "F-Droid"
-          google_play: "Google Play"
-          code: "Source Code"
+    two_factor_authentication:
+      otp_authentication:
+        index:
+          title: "Security Settings"
+          heading: "Two-factor authentication"
+          recovery_keys:
+            heading: "Your %{app_name} recovery codes"
+            generated_at: "These codes were generated at %{time}"
+            recommendation: "We recommend storing these in a password manager or printing them out on paper."
+            print: "Print"
+            consideration: "Please consider the environment before printing this page."
+        totp_enabled:
+          body: "Your account is set up to require the use of a one-time password in order to log in."
+          recovery_code_count: "You currently have %{count} unused recovery codes."
+          remove:
+            action: "Remove Two-factor authentication"
+            confirm: "Are you sure you want to disable two-factor authentication?"
+          regenerate:
+            action: "Regenerate recovery codes"
+            confirm: "Are you sure? This will disable your previous set of recovery codes."
+        totp_setup:
+          setup_key: "If you cannot scan the QR code, use the following key instead:"
+          setup_qr: "Once you have downloaded an authenticator app, add your %{app_name} account by scanning the QR code displayed on the left."
+          otp_validation: "Enter the code displayed in the app here:"
+          app:
+            none: "If you do not have an authenticator app already installed on your device, we suggest one of the following:"
+            aegis: "Aegis Authenticator for Android"
+            strongbox: "Strongbox Authenticator for iOS"
+            microsoft: "Microsoft Authenticator"
+          source:
+            app_store: "App Store"
+            fdroid: "F-Droid"
+            google_play: "Google Play"
+            code: "Source Code"
     services:
       services:
         one: "Sharing is enabled for the following service:"
@@ -357,9 +360,7 @@ en:
     edit_blocks:
       title: "Blocks"
     edit_mute:
-      title: "Muted Words"      
-    edit_security:
-      title: "Security Settings"  
+      title: "Muted Words"
   moderation:
     inbox:
       header: