diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index fc8249335..6be11f1be 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -9,7 +9,7 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../session
 import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
 import { PillDivider } from '../session/PillDivider';
 import { SyncUtils, ToastUtils, UserUtils } from '../../session/utils';
-import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationTabs';
+import { MAX_USERNAME_LENGTH } from '../session/registration/RegistrationStages';
 import { SessionSpinner } from '../session/SessionSpinner';
 import { ConversationModel, ConversationTypeEnum } from '../../models/conversation';
 
diff --git a/ts/components/session/SessionRegistrationView.tsx b/ts/components/session/SessionRegistrationView.tsx
index 8e61a7733..e19f94f6a 100644
--- a/ts/components/session/SessionRegistrationView.tsx
+++ b/ts/components/session/SessionRegistrationView.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { AccentText } from './AccentText';
 
-import { RegistrationOptions } from './registration/RegistrationTabs';
+import { RegistrationStages } from './registration/RegistrationStages';
 import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
 import { SessionToastContainer } from './SessionToastContainer';
 import { lightTheme, SessionTheme } from '../../state/ducks/SessionTheme';
@@ -36,7 +36,7 @@ export const SessionRegistrationView = () => {
             <AccentText />
           </div>
           <div className="session-content-registration">
-            <RegistrationOptions theme={lightTheme} />
+            <RegistrationStages theme={lightTheme} />
           </div>
         </div>
       </div>
diff --git a/ts/components/session/registration/RegistrationTabs.tsx b/ts/components/session/registration/RegistrationStages.tsx
similarity index 96%
rename from ts/components/session/registration/RegistrationTabs.tsx
rename to ts/components/session/registration/RegistrationStages.tsx
index 4b807f335..aabc15f15 100644
--- a/ts/components/session/registration/RegistrationTabs.tsx
+++ b/ts/components/session/registration/RegistrationStages.tsx
@@ -5,7 +5,6 @@ import { getConversationController } from '../../../session/conversations';
 import { createOrUpdateItem, removeAll } from '../../../data/data';
 import { SignUpTab } from './SignUpTab';
 import { SignInTab } from './SignInTab';
-import { TabLabel, TabType } from './TabLabel'; // TODO: remove unused tabs
 import { trigger } from '../../../shims/events';
 import {
   generateMnemonic,
@@ -157,12 +156,10 @@ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: str
 export enum RegistrationPhase {
   Start,
   SignIn,
-  CreateSessionID,
-  RestoreYourAccount,
-  LinkDevice
+  SignUp
 }
 
-export const RegistrationOptions = (props: any) => {
+export const RegistrationStages = (props: any) => {
   const [generatedRecoveryPhrase, setGeneratedRecoveryPhrase] = useState('');
   const [hexGeneratedPubKey, setHexGeneratedPubKey] = useState('');
   const [registrationPhase, setRegistrationPhase] = useState(RegistrationPhase.Start);
@@ -195,7 +192,7 @@ export const RegistrationOptions = (props: any) => {
   return (
     <div className="session-registration-container">
       {(registrationPhase === RegistrationPhase.Start ||
-        registrationPhase === RegistrationPhase.CreateSessionID) &&
+        registrationPhase === RegistrationPhase.SignUp) &&
         <SignUpTab
           generatedRecoveryPhrase={generatedRecoveryPhrase}
           hexGeneratedPubKey={hexGeneratedPubKey}
diff --git a/ts/components/session/registration/RegistrationUserDetails.tsx b/ts/components/session/registration/RegistrationUserDetails.tsx
index 73baa4c3d..9648e5c9a 100644
--- a/ts/components/session/registration/RegistrationUserDetails.tsx
+++ b/ts/components/session/registration/RegistrationUserDetails.tsx
@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import React from 'react';
 import { lightTheme } from '../../../state/ducks/SessionTheme';
 import { SessionInput } from '../SessionInput';
-import { MAX_USERNAME_LENGTH } from './RegistrationTabs';
+import { MAX_USERNAME_LENGTH } from './RegistrationStages';
 
 const DisplayNameInput = (props: {
   stealAutoFocus?: boolean;
diff --git a/ts/components/session/registration/SignInTab.tsx b/ts/components/session/registration/SignInTab.tsx
index 6578b31f3..13205f815 100644
--- a/ts/components/session/registration/SignInTab.tsx
+++ b/ts/components/session/registration/SignInTab.tsx
@@ -3,7 +3,7 @@ import { Flex } from '../../basic/Flex';
 import { SpacerLG } from '../../basic/Text';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton';
 import { SessionSpinner } from '../SessionSpinner';
-import { RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationTabs';
+import { RegistrationPhase, signInWithLinking, signInWithRecovery } from './RegistrationStages';
 import { RegistrationUserDetails } from './RegistrationUserDetails';
 import { TermsAndConditions } from './TermsAndConditions';
 
diff --git a/ts/components/session/registration/SignUpTab.tsx b/ts/components/session/registration/SignUpTab.tsx
index 530ab53cc..d9de4e1ca 100644
--- a/ts/components/session/registration/SignUpTab.tsx
+++ b/ts/components/session/registration/SignUpTab.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../SessionButton';
 import { SessionIdEditable } from '../SessionIdEditable';
-import { RegistrationPhase, signUp } from './RegistrationTabs';
+import { RegistrationPhase, signUp } from './RegistrationStages';
 import { RegistrationUserDetails } from './RegistrationUserDetails';
 import { TermsAndConditions } from './TermsAndConditions';
 
@@ -79,7 +79,7 @@ export const SignUpTab = (props: Props) => {
       <SignUpDefault
         createSessionID={() => {
           setSignUpMode(SignUpMode.SessionIDShown);
-          setRegistrationPhase(RegistrationPhase.CreateSessionID)
+          setRegistrationPhase(RegistrationPhase.SignUp)
         }}
       />
     );