diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
similarity index 81%
rename from app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
rename to app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
index c34b2ffe1..bd2bcccc7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterSmsCodeFragment.kt
@@ -10,9 +10,9 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getCaptchaArguments
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.getViewModel
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.registration.fragments.BaseEnterCodeFragment
+import org.thoughtcrime.securesms.registration.fragments.BaseEnterSmsCodeFragment
 
-class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
+class ChangeNumberEnterSmsCodeFragment : BaseEnterSmsCodeFragment<ChangeNumberViewModel>(R.layout.fragment_change_number_enter_code) {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
@@ -54,10 +54,10 @@ class ChangeNumberEnterCodeFragment : BaseEnterCodeFragment<ChangeNumberViewMode
   }
 
   override fun navigateToRegistrationLock(timeRemaining: Long) {
-    findNavController().navigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
+    findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberRegistrationLock(timeRemaining))
   }
 
   override fun navigateToKbsAccountLocked() {
-    findNavController().navigate(ChangeNumberEnterCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
+    findNavController().navigate(ChangeNumberEnterSmsCodeFragmentDirections.actionChangeNumberEnterCodeFragmentToChangeNumberAccountLocked())
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterCodeFragment.java
rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
index 9b202a018..09290ae25 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterCodeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/BaseEnterSmsCodeFragment.java
@@ -50,9 +50,9 @@ import io.reactivex.rxjava3.disposables.Disposable;
  *
  * @param <ViewModel> - The concrete view model used by the subclasses, for ease of access in said subclass
  */
-public abstract class BaseEnterCodeFragment<ViewModel extends BaseRegistrationViewModel> extends LoggingFragment implements SignalStrengthPhoneStateListener.Callback {
+public abstract class BaseEnterSmsCodeFragment<ViewModel extends BaseRegistrationViewModel> extends LoggingFragment implements SignalStrengthPhoneStateListener.Callback {
 
-  private static final String TAG = Log.tag(BaseEnterCodeFragment.class);
+  private static final String TAG = Log.tag(BaseEnterSmsCodeFragment.class);
 
   private ScrollView              scrollView;
   private TextView                header;
@@ -68,7 +68,7 @@ public abstract class BaseEnterCodeFragment<ViewModel extends BaseRegistrationVi
 
   protected final LifecycleDisposable disposables = new LifecycleDisposable();
 
-  public BaseEnterCodeFragment(@LayoutRes int contentLayoutId) {
+  public BaseEnterSmsCodeFragment(@LayoutRes int contentLayoutId) {
     super(contentLayoutId);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
similarity index 74%
rename from app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
rename to app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
index 07b4f6e0d..100d30589 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterCodeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
@@ -13,11 +13,11 @@ import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 
-public final class EnterCodeFragment extends BaseEnterCodeFragment<RegistrationViewModel> implements SignalStrengthPhoneStateListener.Callback {
+public final class EnterSmsCodeFragment extends BaseEnterSmsCodeFragment<RegistrationViewModel> implements SignalStrengthPhoneStateListener.Callback {
 
-  private static final String TAG = Log.tag(EnterCodeFragment.class);
+  private static final String TAG = Log.tag(EnterSmsCodeFragment.class);
 
-  public EnterCodeFragment() {
+  public EnterSmsCodeFragment() {
     super(R.layout.fragment_registration_enter_code);
   }
 
@@ -37,18 +37,18 @@ public final class EnterCodeFragment extends BaseEnterCodeFragment<RegistrationV
         Log.w(TAG, "Failed to refresh flags after " + (System.currentTimeMillis() - startTime) + " ms.", e);
       }
       return null;
-    }, none -> displaySuccess(() -> Navigation.findNavController(requireView()).navigate(EnterCodeFragmentDirections.actionSuccessfulRegistration())));
+    }, none -> displaySuccess(() -> Navigation.findNavController(requireView()).navigate(EnterSmsCodeFragmentDirections.actionSuccessfulRegistration())));
   }
 
   @Override
   protected void navigateToRegistrationLock(long timeRemaining) {
     Navigation.findNavController(requireView())
-              .navigate(EnterCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining));
+              .navigate(EnterSmsCodeFragmentDirections.actionRequireKbsLockPin(timeRemaining));
   }
 
   @Override
   protected void navigateToCaptcha() {
-    NavHostFragment.findNavController(this).navigate(EnterCodeFragmentDirections.actionRequestCaptcha());
+    NavHostFragment.findNavController(this).navigate(EnterSmsCodeFragmentDirections.actionRequestCaptcha());
   }
 
   @Override
diff --git a/app/src/main/res/layout/fragment_registration_enter_code.xml b/app/src/main/res/layout/fragment_registration_enter_code.xml
index b207407fa..53b36db02 100644
--- a/app/src/main/res/layout/fragment_registration_enter_code.xml
+++ b/app/src/main/res/layout/fragment_registration_enter_code.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".registration.fragments.EnterCodeFragment">
+    tools:context=".registration.fragments.EnterSmsCodeFragment">
 
     <ScrollView
         android:id="@+id/scroll_view"
@@ -17,7 +17,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:context=".registration.fragments.EnterCodeFragment">
+            tools:context=".registration.fragments.EnterSmsCodeFragment">
 
             <Button
                 android:id="@+id/wrong_number"
diff --git a/app/src/main/res/navigation/app_settings_change_number.xml b/app/src/main/res/navigation/app_settings_change_number.xml
index 0c86f65ea..8b7157822 100644
--- a/app/src/main/res/navigation/app_settings_change_number.xml
+++ b/app/src/main/res/navigation/app_settings_change_number.xml
@@ -98,7 +98,7 @@
 
     <fragment
         android:id="@+id/changeNumberEnterCodeFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterCodeFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberEnterSmsCodeFragment"
         tools:layout="@layout/fragment_change_number_enter_code">
 
         <action
diff --git a/app/src/main/res/navigation/registration.xml b/app/src/main/res/navigation/registration.xml
index f28776fc6..500ee5785 100644
--- a/app/src/main/res/navigation/registration.xml
+++ b/app/src/main/res/navigation/registration.xml
@@ -120,7 +120,7 @@
 
     <fragment
         android:id="@+id/enterCodeFragment"
-        android:name="org.thoughtcrime.securesms.registration.fragments.EnterCodeFragment"
+        android:name="org.thoughtcrime.securesms.registration.fragments.EnterSmsCodeFragment"
         android:label="fragment_enter_code"
         tools:layout="@layout/fragment_registration_enter_code">