diff --git a/native/account/fullscreen-siwe-panel.react.js b/native/account/fullscreen-siwe-panel.react.js
--- a/native/account/fullscreen-siwe-panel.react.js
+++ b/native/account/fullscreen-siwe-panel.react.js
@@ -19,7 +19,7 @@
 import { commRustModule } from '../native-modules.js';
 import {
   AccountDoesNotExistRouteName,
-  RegistrationRouteName,
+  AuthRouteName,
 } from '../navigation/route-names.js';
 import {
   unknownErrorAlertDetails,
@@ -58,7 +58,7 @@
       await getEthereumAccountFromSIWEResult(result);
       setSkipEthereumLoginOnce(true);
       goBackToPrompt();
-      navigate<'Registration'>(RegistrationRouteName, {
+      navigate<'Auth'>(AuthRouteName, {
         screen: AccountDoesNotExistRouteName,
       });
     },
diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js
--- a/native/account/logged-out-modal.react.js
+++ b/native/account/logged-out-modal.react.js
@@ -49,7 +49,7 @@
 import {
   type NavigationRoute,
   LoggedOutModalRouteName,
-  RegistrationRouteName,
+  AuthRouteName,
   QRCodeScreenRouteName,
 } from '../navigation/route-names.js';
 import { useSelector } from '../redux/redux-utils.js';
@@ -401,13 +401,13 @@
 
   const { navigate } = useNavigation();
   const onPressQRCodeSignIn = React.useCallback(() => {
-    navigate(RegistrationRouteName, {
+    navigate(AuthRouteName, {
       screen: QRCodeScreenRouteName,
     });
   }, [navigate]);
 
   const onPressNewRegister = React.useCallback(() => {
-    navigate(RegistrationRouteName);
+    navigate(AuthRouteName);
   }, [navigate]);
 
   const opacityStyle = useAnimatedStyle(() => ({
diff --git a/native/account/qr-code-screen.react.js b/native/account/qr-code-screen.react.js
--- a/native/account/qr-code-screen.react.js
+++ b/native/account/qr-code-screen.react.js
@@ -13,14 +13,14 @@
 import AuthButtonContainer from './auth-components/auth-button-container.react.js';
 import AuthContainer from './auth-components/auth-container.react.js';
 import AuthContentContainer from './auth-components/auth-content-container.react.js';
-import type { RegistrationNavigationProp } from './registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from './registration/auth-navigator.react.js';
 import LinkButton from '../components/link-button.react.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
 import { RestorePromptScreenRouteName } from '../navigation/route-names.js';
 import { useStyles } from '../themes/colors.js';
 
 type QRCodeScreenProps = {
-  +navigation: RegistrationNavigationProp<'QRCodeScreen'>,
+  +navigation: AuthNavigationProp<'QRCodeScreen'>,
   +route: NavigationRoute<'QRCodeScreen'>,
 };
 
diff --git a/native/account/registration/account-does-not-exist.react.js b/native/account/registration/account-does-not-exist.react.js
--- a/native/account/registration/account-does-not-exist.react.js
+++ b/native/account/registration/account-does-not-exist.react.js
@@ -3,7 +3,7 @@
 import * as React from 'react';
 import { Text, View, Image } from 'react-native';
 
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import PrimaryButton from '../../components/primary-button.react.js';
 import commSwooshSource from '../../img/comm-swoosh.png';
 import {
@@ -16,7 +16,7 @@
 import AuthContentContainer from '../auth-components/auth-content-container.react.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'AccountDoesNotExist'>,
+  +navigation: AuthNavigationProp<'AccountDoesNotExist'>,
   +route: NavigationRoute<'AccountDoesNotExist'>,
 };
 function AccountDoesNotExist(props: Props): React.Node {
diff --git a/native/account/registration/registration-navigator.react.js b/native/account/registration/auth-navigator.react.js
rename from native/account/registration/registration-navigator.react.js
rename to native/account/registration/auth-navigator.react.js
--- a/native/account/registration/registration-navigator.react.js
+++ b/native/account/registration/auth-navigator.react.js
@@ -19,6 +19,10 @@
 import * as React from 'react';
 
 import AccountDoesNotExist from './account-does-not-exist.react.js';
+import AuthRouter, {
+  type AuthRouterExtraNavigationHelpers,
+  type AuthRouterNavigationAction,
+} from './auth-router.js';
 import AvatarSelection from './avatar-selection.react.js';
 import ConnectEthereum from './connect-ethereum.react.js';
 import ConnectFarcaster from './connect-farcaster.react.js';
@@ -27,10 +31,6 @@
 import ExistingEthereumAccount from './existing-ethereum-account.react.js';
 import KeyserverSelection from './keyserver-selection.react.js';
 import PasswordSelection from './password-selection.react.js';
-import RegistrationRouter, {
-  type RegistrationRouterExtraNavigationHelpers,
-  type RegistrationRouterNavigationAction,
-} from './registration-router.js';
 import RegistrationTerms from './registration-terms.react.js';
 import { CreateSIWEBackupMessage } from './siwe-backup-message-creation.react.js';
 import UsernameSelection from './username-selection.react.js';
@@ -52,7 +52,7 @@
   RegistrationTermsRouteName,
   AccountDoesNotExistRouteName,
   type ScreenParamList,
-  type RegistrationParamList,
+  type AuthParamList,
   QRCodeScreenRouteName,
   RestorePromptScreenRouteName,
   RestorePasswordAccountScreenRouteName,
@@ -64,17 +64,13 @@
 import RestorePasswordAccountScreen from '../restore-password-account-screen.react.js';
 import RestorePromptScreen from '../restore-prompt-screen.react.js';
 
-export type RegistrationNavigationHelpers<
-  ParamList: ParamListBase = ParamListBase,
-> = {
+type AuthNavigationHelpers<ParamList: ParamListBase = ParamListBase> = {
   ...$Exact<StackNavigationHelpers<ParamList>>,
-  ...RegistrationRouterExtraNavigationHelpers,
+  ...AuthRouterExtraNavigationHelpers,
 };
 
-type RegistrationNavigatorProps = StackNavigatorProps<
-  RegistrationNavigationHelpers<>,
->;
-function RegistrationNavigator({
+type AuthNavigatorProps = StackNavigatorProps<AuthNavigationHelpers<>>;
+function AuthNavigator({
   initialRouteName,
   children,
   screenOptions,
@@ -82,16 +78,16 @@
   screenListeners,
   id,
   ...rest
-}: RegistrationNavigatorProps) {
+}: AuthNavigatorProps) {
   const { state, descriptors, navigation } = useNavigationBuilder<
     StackNavigationState,
-    RegistrationRouterNavigationAction,
+    AuthRouterNavigationAction,
     StackOptions,
     StackRouterOptions,
-    RegistrationNavigationHelpers<>,
+    AuthNavigationHelpers<>,
     StackNavigationEventMap,
     ExtraStackNavigatorProps,
-  >(RegistrationRouter, {
+  >(AuthRouter, {
     id,
     initialRouteName,
     children,
@@ -108,24 +104,24 @@
     />
   );
 }
-const createRegistrationNavigator = createNavigatorFactory<
+const createAuthNavigator = createNavigatorFactory<
   StackNavigationState,
   StackOptions,
   StackNavigationEventMap,
-  RegistrationNavigationHelpers<>,
+  AuthNavigationHelpers<>,
   ExtraStackNavigatorProps,
->(RegistrationNavigator);
+>(AuthNavigator);
 
-export type RegistrationNavigationProp<
-  RouteName: $Keys<RegistrationParamList> = $Keys<RegistrationParamList>,
+export type AuthNavigationProp<
+  RouteName: $Keys<AuthParamList> = $Keys<AuthParamList>,
 > = {
   ...StackNavigationProp<ScreenParamList, RouteName>,
-  ...RegistrationRouterExtraNavigationHelpers,
+  ...AuthRouterExtraNavigationHelpers,
 };
 
-const Registration = createRegistrationNavigator<
+const Auth = createAuthNavigator<
   ScreenParamList,
-  RegistrationParamList,
+  AuthParamList,
   StackNavigationHelpers<ScreenParamList>,
 >();
 
@@ -145,91 +141,88 @@
 };
 
 type Props = {
-  +navigation: RootNavigationProp<'Registration'>,
+  +navigation: RootNavigationProp<'Auth'>,
   ...
 };
 // eslint-disable-next-line no-unused-vars
-function RegistrationComponent(props: Props): React.Node {
+function AuthComponent(props: Props): React.Node {
   return (
-    <Registration.Navigator
+    <Auth.Navigator
       screenOptions={screenOptions}
       initialRouteName={ConnectFarcasterRouteName}
     >
-      <Registration.Screen
+      <Auth.Screen
         name={CoolOrNerdModeSelectionRouteName}
         component={CoolOrNerdModeSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={KeyserverSelectionRouteName}
         component={KeyserverSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={ConnectEthereumRouteName}
         component={ConnectEthereum}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={ExistingEthereumAccountRouteName}
         component={ExistingEthereumAccount}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={ConnectFarcasterRouteName}
         component={ConnectFarcaster}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={CreateSIWEBackupMessageRouteName}
         component={CreateSIWEBackupMessage}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={UsernameSelectionRouteName}
         component={UsernameSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={PasswordSelectionRouteName}
         component={PasswordSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={AvatarSelectionRouteName}
         component={AvatarSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={EmojiAvatarSelectionRouteName}
         component={EmojiAvatarSelection}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={RegistrationUserAvatarCameraModalRouteName}
         component={RegistrationUserAvatarCameraModal}
         options={cameraScreenOptions}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={RegistrationTermsRouteName}
         component={RegistrationTerms}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={AccountDoesNotExistRouteName}
         component={AccountDoesNotExist}
       />
-      <Registration.Screen
-        name={QRCodeScreenRouteName}
-        component={QRCodeScreen}
-      />
-      <Registration.Screen
+      <Auth.Screen name={QRCodeScreenRouteName} component={QRCodeScreen} />
+      <Auth.Screen
         name={RestorePromptScreenRouteName}
         component={RestorePromptScreen}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={RestorePasswordAccountScreenRouteName}
         component={RestorePasswordAccountScreen}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={RestoreBackupScreenRouteName}
         component={RestoreBackupScreen}
       />
-      <Registration.Screen
+      <Auth.Screen
         name={RestoreSIWEBackupRouteName}
         component={RestoreSIWEBackup}
       />
-    </Registration.Navigator>
+    </Auth.Navigator>
   );
 }
 
-export default RegistrationComponent;
+export default AuthComponent;
diff --git a/native/account/registration/registration-router.js b/native/account/registration/auth-router.js
rename from native/account/registration/registration-router.js
rename to native/account/registration/auth-router.js
--- a/native/account/registration/registration-router.js
+++ b/native/account/registration/auth-router.js
@@ -24,17 +24,15 @@
     +params: ConnectEthereumParams,
   },
 };
-export type RegistrationRouterNavigationAction =
-  | StackAction
-  | ReconnectEthereumAction;
+export type AuthRouterNavigationAction = StackAction | ReconnectEthereumAction;
 
-export type RegistrationRouterExtraNavigationHelpers = {
+export type AuthRouterExtraNavigationHelpers = {
   +reconnectEthereum: ConnectEthereumParams => void,
 };
 
-function RegistrationRouter(
+function AuthRouter(
   routerOptions: StackRouterOptions,
-): Router<StackNavigationState, RegistrationRouterNavigationAction> {
+): Router<StackNavigationState, AuthRouterNavigationAction> {
   const {
     getStateForAction: baseGetStateForAction,
     actionCreators: baseActionCreators,
@@ -44,7 +42,7 @@
     ...rest,
     getStateForAction: (
       lastState: StackNavigationState,
-      action: RegistrationRouterNavigationAction,
+      action: AuthRouterNavigationAction,
       options: RouterConfigOptions,
     ) => {
       if (action.type === reconnectEthereumActionType) {
@@ -101,4 +99,4 @@
   };
 }
 
-export default RegistrationRouter;
+export default AuthRouter;
diff --git a/native/account/registration/avatar-selection.react.js b/native/account/registration/avatar-selection.react.js
--- a/native/account/registration/avatar-selection.react.js
+++ b/native/account/registration/avatar-selection.react.js
@@ -9,8 +9,8 @@
   type UserAvatarSelection,
 } from 'lib/components/edit-user-avatar-provider.react.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import {
   type CoolOrNerdMode,
   type AccountSelection,
@@ -45,7 +45,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'AvatarSelection'>,
+  +navigation: AuthNavigationProp<'AvatarSelection'>,
   +route: NavigationRoute<'AvatarSelection'>,
 };
 function AvatarSelection(props: Props): React.Node {
diff --git a/native/account/registration/connect-ethereum.react.js b/native/account/registration/connect-ethereum.react.js
--- a/native/account/registration/connect-ethereum.react.js
+++ b/native/account/registration/connect-ethereum.react.js
@@ -14,12 +14,12 @@
 import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
 import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import {
   useGetEthereumAccountFromSIWEResult,
   siweNonceExpired,
 } from './ethereum-utils.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import type { CoolOrNerdMode } from './registration-types.js';
 import PrimaryButton from '../../components/primary-button.react.js';
 import { commRustModule } from '../../native-modules.js';
@@ -57,7 +57,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'ConnectEthereum'>,
+  +navigation: AuthNavigationProp<'ConnectEthereum'>,
   +route: NavigationRoute<'ConnectEthereum'>,
 };
 function ConnectEthereum(props: Props): React.Node {
diff --git a/native/account/registration/connect-farcaster.react.js b/native/account/registration/connect-farcaster.react.js
--- a/native/account/registration/connect-farcaster.react.js
+++ b/native/account/registration/connect-farcaster.react.js
@@ -8,9 +8,9 @@
 import { useIsAppForegrounded } from 'lib/shared/lifecycle-utils.js';
 import type { BaseFCAvatarInfo } from 'lib/utils/farcaster-helpers.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { siweNonceExpired } from './ethereum-utils.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import type { CoolOrNerdMode } from './registration-types.js';
 import FarcasterPrompt from '../../components/farcaster-prompt.react.js';
 import FarcasterWebView from '../../components/farcaster-web-view.react.js';
@@ -38,7 +38,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'ConnectFarcaster'>,
+  +navigation: AuthNavigationProp<'ConnectFarcaster'>,
   +route: NavigationRoute<'ConnectFarcaster'>,
 };
 
diff --git a/native/account/registration/cool-or-nerd-mode-selection.react.js b/native/account/registration/cool-or-nerd-mode-selection.react.js
--- a/native/account/registration/cool-or-nerd-mode-selection.react.js
+++ b/native/account/registration/cool-or-nerd-mode-selection.react.js
@@ -4,8 +4,8 @@
 import * as React from 'react';
 import { Text } from 'react-native';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import {
   RegistrationTile,
   RegistrationTileHeader,
@@ -22,7 +22,7 @@
 import AuthContentContainer from '../auth-components/auth-content-container.react.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'CoolOrNerdModeSelection'>,
+  +navigation: AuthNavigationProp<'CoolOrNerdModeSelection'>,
   +route: NavigationRoute<'CoolOrNerdModeSelection'>,
 };
 function CoolOrNerdModeSelection(props: Props): React.Node {
diff --git a/native/account/registration/emoji-avatar-selection.react.js b/native/account/registration/emoji-avatar-selection.react.js
--- a/native/account/registration/emoji-avatar-selection.react.js
+++ b/native/account/registration/emoji-avatar-selection.react.js
@@ -8,7 +8,7 @@
 import { getDefaultAvatar } from 'lib/shared/avatar-utils.js';
 import type { UpdateUserAvatarRequest } from 'lib/types/avatar-types';
 
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { useNativeSetUserAvatar } from '../../avatars/avatar-hooks.js';
 import EmojiAvatarCreation from '../../avatars/emoji-avatar-creation.react.js';
 import type { NavigationRoute } from '../../navigation/route-names.js';
@@ -21,7 +21,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'EmojiAvatarSelection'>,
+  +navigation: AuthNavigationProp<'EmojiAvatarSelection'>,
   +route: NavigationRoute<'EmojiAvatarSelection'>,
 };
 function EmojiAvatarSelection(props: Props): React.Node {
diff --git a/native/account/registration/existing-ethereum-account.react.js b/native/account/registration/existing-ethereum-account.react.js
--- a/native/account/registration/existing-ethereum-account.react.js
+++ b/native/account/registration/existing-ethereum-account.react.js
@@ -17,8 +17,8 @@
 import { useDispatch } from 'lib/utils/redux-utils.js';
 import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import PrimaryButton from '../../components/primary-button.react.js';
 import type { RootNavigationProp } from '../../navigation/root-navigator.react.js';
 import type {
@@ -39,7 +39,7 @@
 export type ExistingEthereumAccountParams = SIWEResult;
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'ExistingEthereumAccount'>,
+  +navigation: AuthNavigationProp<'ExistingEthereumAccount'>,
   +route: NavigationRoute<'ExistingEthereumAccount'>,
 };
 function ExistingEthereumAccount(props: Props): React.Node {
@@ -57,11 +57,11 @@
   const { navigation } = props;
   const goBackToHome = navigation.getParent<
     ScreenParamList,
-    'Registration',
+    'Auth',
     StackNavigationState,
     StackOptions,
     StackNavigationEventMap,
-    RootNavigationProp<'Registration'>,
+    RootNavigationProp<'Auth'>,
   >()?.goBack;
   const onProceedToLogIn = React.useCallback(async () => {
     if (logInPending) {
diff --git a/native/account/registration/keyserver-selection.react.js b/native/account/registration/keyserver-selection.react.js
--- a/native/account/registration/keyserver-selection.react.js
+++ b/native/account/registration/keyserver-selection.react.js
@@ -8,8 +8,8 @@
 import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
 import { useIsKeyserverURLValid } from 'lib/shared/keyserver-utils.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import RegistrationTextInput from './registration-text-input.react.js';
 import {
   RegistrationTile,
@@ -44,7 +44,7 @@
 type KeyserverSelectionError = 'cant_reach_keyserver';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'KeyserverSelection'>,
+  +navigation: AuthNavigationProp<'KeyserverSelection'>,
   +route: NavigationRoute<'KeyserverSelection'>,
 };
 function KeyserverSelection(props: Props): React.Node {
diff --git a/native/account/registration/password-selection.react.js b/native/account/registration/password-selection.react.js
--- a/native/account/registration/password-selection.react.js
+++ b/native/account/registration/password-selection.react.js
@@ -6,8 +6,8 @@
 
 import sleep from 'lib/utils/sleep.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import RegistrationTextInput from './registration-text-input.react.js';
 import type { CoolOrNerdMode } from './registration-types.js';
 import PrimaryButton from '../../components/primary-button.react.js';
@@ -34,7 +34,7 @@
 type PasswordError = 'passwords_dont_match' | 'empty_password';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'PasswordSelection'>,
+  +navigation: AuthNavigationProp<'PasswordSelection'>,
   +route: NavigationRoute<'PasswordSelection'>,
 };
 function PasswordSelection(props: Props): React.Node {
diff --git a/native/account/registration/registration-terms.react.js b/native/account/registration/registration-terms.react.js
--- a/native/account/registration/registration-terms.react.js
+++ b/native/account/registration/registration-terms.react.js
@@ -6,8 +6,8 @@
 
 import type { SIWEBackupSecrets } from 'lib/types/siwe-types.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import type {
   CoolOrNerdMode,
   AccountSelection,
@@ -44,7 +44,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'RegistrationTerms'>,
+  +navigation: AuthNavigationProp<'RegistrationTerms'>,
   +route: NavigationRoute<'RegistrationTerms'>,
 };
 function RegistrationTerms(props: Props): React.Node {
diff --git a/native/account/registration/siwe-backup-message-creation.react.js b/native/account/registration/siwe-backup-message-creation.react.js
--- a/native/account/registration/siwe-backup-message-creation.react.js
+++ b/native/account/registration/siwe-backup-message-creation.react.js
@@ -7,8 +7,8 @@
 
 import { type SIWEResult, SIWEMessageTypes } from 'lib/types/siwe-types.js';
 
+import { type AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import { type RegistrationNavigationProp } from './registration-navigator.react.js';
 import type {
   CoolOrNerdMode,
   AccountSelection,
@@ -145,7 +145,7 @@
 };
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'CreateSIWEBackupMessage'>,
+  +navigation: AuthNavigationProp<'CreateSIWEBackupMessage'>,
   +route: NavigationRoute<'CreateSIWEBackupMessage'>,
 };
 function CreateSIWEBackupMessage(props: Props): React.Node {
diff --git a/native/account/registration/username-selection.react.js b/native/account/registration/username-selection.react.js
--- a/native/account/registration/username-selection.react.js
+++ b/native/account/registration/username-selection.react.js
@@ -14,8 +14,8 @@
 import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
 import { isValidEthereumAddress } from 'lib/utils/siwe-utils.js';
 
+import type { AuthNavigationProp } from './auth-navigator.react.js';
 import { RegistrationContext } from './registration-context.js';
-import type { RegistrationNavigationProp } from './registration-navigator.react.js';
 import RegistrationTextInput from './registration-text-input.react.js';
 import type { CoolOrNerdMode } from './registration-types.js';
 import PrimaryButton from '../../components/primary-button.react.js';
@@ -41,7 +41,7 @@
 type UsernameError = 'username_invalid' | 'username_taken';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'UsernameSelection'>,
+  +navigation: AuthNavigationProp<'UsernameSelection'>,
   +route: NavigationRoute<'UsernameSelection'>,
 };
 function UsernameSelection(props: Props): React.Node {
diff --git a/native/account/restore-backup-screen.react.js b/native/account/restore-backup-screen.react.js
--- a/native/account/restore-backup-screen.react.js
+++ b/native/account/restore-backup-screen.react.js
@@ -9,7 +9,7 @@
 import AuthContainer from './auth-components/auth-container.react.js';
 import AuthContentContainer from './auth-components/auth-content-container.react.js';
 import { setNativeCredentials } from './native-credentials.js';
-import type { RegistrationNavigationProp } from './registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from './registration/auth-navigator.react.js';
 import { useRestore } from './restore.js';
 import { commCoreModule } from '../native-modules.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
@@ -22,7 +22,7 @@
 import Alert from '../utils/alert.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'RestoreBackupScreen'>,
+  +navigation: AuthNavigationProp<'RestoreBackupScreen'>,
   +route: NavigationRoute<'RestoreBackupScreen'>,
 };
 
diff --git a/native/account/restore-password-account-screen.react.js b/native/account/restore-password-account-screen.react.js
--- a/native/account/restore-password-account-screen.react.js
+++ b/native/account/restore-password-account-screen.react.js
@@ -15,7 +15,7 @@
 } from './native-credentials.js';
 import type { UserCredentials } from './native-credentials.js';
 import PromptButton from './prompt-button.react.js';
-import type { RegistrationNavigationProp } from './registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from './registration/auth-navigator.react.js';
 import RegistrationTextInput from './registration/registration-text-input.react.js';
 import { useClientBackup } from '../backup/use-client-backup.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
@@ -29,7 +29,7 @@
 import Alert from '../utils/alert.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'RestorePasswordAccountScreen'>,
+  +navigation: AuthNavigationProp<'RestorePasswordAccountScreen'>,
   +route: NavigationRoute<'RestorePasswordAccountScreen'>,
 };
 
diff --git a/native/account/restore-prompt-screen.react.js b/native/account/restore-prompt-screen.react.js
--- a/native/account/restore-prompt-screen.react.js
+++ b/native/account/restore-prompt-screen.react.js
@@ -11,7 +11,7 @@
 import AuthContainer from './auth-components/auth-container.react.js';
 import AuthContentContainer from './auth-components/auth-content-container.react.js';
 import PromptButton from './prompt-button.react.js';
-import type { RegistrationNavigationProp } from './registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from './registration/auth-navigator.react.js';
 import { useSIWEPanelState } from './siwe-hooks.js';
 import SIWEPanel from './siwe-panel.react.js';
 import { useClientBackup } from '../backup/use-client-backup.js';
@@ -29,7 +29,7 @@
 import RestoreIcon from '../vectors/restore-icon.react.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'RestorePromptScreen'>,
+  +navigation: AuthNavigationProp<'RestorePromptScreen'>,
   +route: NavigationRoute<'RestorePromptScreen'>,
 };
 
diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js
--- a/native/media/camera-modal.react.js
+++ b/native/media/camera-modal.react.js
@@ -38,7 +38,7 @@
 import { useDispatch } from 'lib/utils/redux-utils.js';
 
 import SendMediaButton from './send-media-button.react.js';
-import type { RegistrationNavigationProp } from '../account/registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from '../account/registration/auth-navigator.react.js';
 import ContentLoading from '../components/content-loading.react.js';
 import ConnectedStatusBar from '../connected-status-bar.react.js';
 import type { AppNavigationProp } from '../navigation/app-navigator.react.js';
@@ -234,7 +234,7 @@
     | AppNavigationProp<'ChatCameraModal'>
     | AppNavigationProp<'UserAvatarCameraModal'>
     | AppNavigationProp<'ThreadAvatarCameraModal'>
-    | RegistrationNavigationProp<'RegistrationUserAvatarCameraModal'>,
+    | AuthNavigationProp<'RegistrationUserAvatarCameraModal'>,
 };
 type Props = {
   ...BaseProps,
diff --git a/native/media/registration-user-avatar-camera-modal.react.js b/native/media/registration-user-avatar-camera-modal.react.js
--- a/native/media/registration-user-avatar-camera-modal.react.js
+++ b/native/media/registration-user-avatar-camera-modal.react.js
@@ -2,13 +2,13 @@
 
 import * as React from 'react';
 
-import type { RegistrationNavigationProp } from '../account/registration/registration-navigator.react.js';
+import type { AuthNavigationProp } from '../account/registration/auth-navigator.react.js';
 import { useNativeUpdateUserImageAvatar } from '../avatars/avatar-hooks.js';
 import CameraModal from '../media/camera-modal.react.js';
 import type { NavigationRoute } from '../navigation/route-names.js';
 
 type Props = {
-  +navigation: RegistrationNavigationProp<'RegistrationUserAvatarCameraModal'>,
+  +navigation: AuthNavigationProp<'RegistrationUserAvatarCameraModal'>,
   +route: NavigationRoute<'RegistrationUserAvatarCameraModal'>,
 };
 
diff --git a/native/navigation/root-navigator.react.js b/native/navigation/root-navigator.react.js
--- a/native/navigation/root-navigator.react.js
+++ b/native/navigation/root-navigator.react.js
@@ -44,7 +44,7 @@
   type ScreenParamList,
   type RootParamList,
   TermsAndPrivacyRouteName,
-  RegistrationRouteName,
+  AuthRouteName,
   InviteLinkModalRouteName,
   InviteLinkNavigatorRouteName,
   CommunityCreationRouteName,
@@ -60,8 +60,8 @@
 } from './route-names.js';
 import LoggedOutModal from '../account/logged-out-modal.react.js';
 import QRAuthNavigator from '../account/qr-auth/qr-auth-navigator.react.js';
+import RegistrationNavigator from '../account/registration/auth-navigator.react.js';
 import CreateMissingSIWEBackupMessage from '../account/registration/missing-registration-data/missing-siwe-backup-message.react.js';
-import RegistrationNavigator from '../account/registration/registration-navigator.react.js';
 import TermsAndPrivacyModal from '../account/terms-and-privacy-modal.react.js';
 import ThreadPickerModal from '../calendar/thread-picker-modal.react.js';
 import ImagePasteModal from '../chat/image-paste-modal.react.js';
@@ -209,7 +209,7 @@
         options={disableGesturesScreenOptions}
       />
       <Root.Screen
-        name={RegistrationRouteName}
+        name={AuthRouteName}
         component={RegistrationNavigator}
         options={disableGesturesScreenOptions}
       />
diff --git a/native/navigation/route-names.js b/native/navigation/route-names.js
--- a/native/navigation/route-names.js
+++ b/native/navigation/route-names.js
@@ -128,7 +128,7 @@
 export const VideoPlaybackModalRouteName = 'VideoPlaybackModal';
 export const ViewInviteLinksRouteName = 'ViewInviteLinks';
 export const TermsAndPrivacyRouteName = 'TermsAndPrivacyModal';
-export const RegistrationRouteName = 'Registration';
+export const AuthRouteName = 'Auth';
 export const KeyserverSelectionRouteName = 'KeyserverSelection';
 export const CoolOrNerdModeSelectionRouteName = 'CoolOrNerdModeSelection';
 export const ConnectEthereumRouteName = 'ConnectEthereum';
@@ -200,7 +200,7 @@
   +TermsAndPrivacyModal: TermsAndPrivacyModalParams,
   +SubchannelsListModal: SubchannelListModalParams,
   +MessageReactionsModal: MessageReactionsModalParams,
-  +Registration: void,
+  +Auth: void,
   +CommunityCreation: void,
   +InviteLinkModal: InviteLinkModalParams,
   +InviteLinkNavigator: InviteLinksNavigatorParams,
@@ -309,7 +309,7 @@
 
 export type CommunityDrawerParamList = { +TabNavigator: void };
 
-export type RegistrationParamList = {
+export type AuthParamList = {
   +CoolOrNerdModeSelection: void,
   +KeyserverSelection: KeyserverSelectionParams,
   +ConnectEthereum: ConnectEthereumParams,
@@ -372,7 +372,7 @@
   ...ProfileParamList,
   ...CalendarParamList,
   ...CommunityDrawerParamList,
-  ...RegistrationParamList,
+  ...AuthParamList,
   ...InviteLinkParamList,
   ...CommunityCreationParamList,
   ...RolesParamList,
@@ -384,7 +384,7 @@
 export type NavigationRoute<RouteName: string = $Keys<ScreenParamList>> =
   RouteProp<ScreenParamList, RouteName>;
 
-export const accountModals = [LoggedOutModalRouteName, RegistrationRouteName];
+export const accountModals = [LoggedOutModalRouteName, AuthRouteName];
 
 export const scrollBlockingModals = [
   ImageModalRouteName,