diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ApiRequestState.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ApiRequestState.kt
similarity index 60%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ApiRequestState.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ApiRequestState.kt
index edd4dde71b1..3043dcacf37 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ApiRequestState.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ApiRequestState.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.register
+package de.rki.coronawarnapp.ui.submission
 
 enum class ApiRequestState {
     IDLE, STARTED, FAILED, SUCCESS
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ScanStatus.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ScanStatus.kt
similarity index 57%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ScanStatus.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ScanStatus.kt
index 1c0a0ca350f..b3bd73f8a46 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/ScanStatus.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/ScanStatus.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.register
+package de.rki.coronawarnapp.ui.submission
 
 enum class ScanStatus {
     STARTED, INVALID, SUCCESS
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
index 5f5916104e8..b406ffa23c7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragment.kt
@@ -34,12 +34,14 @@ class SubmissionDispatcherFragment : BaseFragment() {
     private fun setButtonOnClickListener() {
         binding.submissionDispatcherQr.dispatcherCard.setOnClickListener {
             doNavigate(
-                SubmissionDispatcherFragmentDirections.actionSubmissionDispatcherFragmentToRegisterQRCodeFragment()
+                SubmissionDispatcherFragmentDirections
+                    .actionSubmissionDispatcherFragmentToSubmissionQRCodeScanFragment()
             )
         }
         binding.submissionDispatcherTanCode.dispatcherCard.setOnClickListener {
             doNavigate(
-                SubmissionDispatcherFragmentDirections.actionSubmissionDispatcherFragmentToSubmissionTanFragment()
+                SubmissionDispatcherFragmentDirections
+                    .actionSubmissionDispatcherFragmentToSubmissionTanFragment()
             )
         }
         binding.submissionDispatcherTanTele.dispatcherCard.setOnClickListener {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterQRCodeScanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt
similarity index 66%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterQRCodeScanFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt
index de5ad319851..55d51d6f8e7 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterQRCodeScanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionQRCodeScanFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.register
+package de.rki.coronawarnapp.ui.submission
 
 import android.Manifest
 import android.content.pm.PackageManager
@@ -13,7 +13,7 @@ import com.google.zxing.BarcodeFormat
 import com.journeyapps.barcodescanner.BarcodeResult
 import com.journeyapps.barcodescanner.DefaultDecoderFactory
 import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.databinding.FragmentRegisterQrCodeScanBinding
+import de.rki.coronawarnapp.databinding.FragmentSubmissionQrCodeScanBinding
 import de.rki.coronawarnapp.ui.BaseFragment
 import de.rki.coronawarnapp.ui.viewmodel.SubmissionViewModel
 import de.rki.coronawarnapp.util.CameraPermissionHelper
@@ -21,22 +21,22 @@ import de.rki.coronawarnapp.util.CameraPermissionHelper
 /**
  * A simple [BaseFragment] subclass.
  */
-class RegisterQRCodeScanFragment : BaseFragment() {
+class SubmissionQRCodeScanFragment : BaseFragment() {
 
     companion object {
-        private val TAG: String? = RegisterQRCodeScanFragment::class.simpleName
+        private val TAG: String? = SubmissionQRCodeScanFragment::class.simpleName
         private const val REQUEST_CAMERA_PERMISSION_CODE = 1
     }
 
     private val viewModel: SubmissionViewModel by viewModels()
-    private lateinit var binding: FragmentRegisterQrCodeScanBinding
+    private lateinit var binding: FragmentSubmissionQrCodeScanBinding
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        binding = FragmentRegisterQrCodeScanBinding.inflate(inflater)
+        binding = FragmentSubmissionQrCodeScanBinding.inflate(inflater)
         binding.lifecycleOwner = this
         return binding.root
     }
@@ -46,7 +46,7 @@ class RegisterQRCodeScanFragment : BaseFragment() {
     }
 
     private fun startDecode() {
-        binding.registerQrCodeScanPreview.decodeSingle { decodeCallback(it) }
+        binding.submissionQrCodeScanPreview.decodeSingle { decodeCallback(it) }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -54,21 +54,19 @@ class RegisterQRCodeScanFragment : BaseFragment() {
 
         checkForCameraPermission()
 
-        binding.registerQrCodeScanTorch.setOnCheckedChangeListener { _, isChecked ->
-            binding.registerQrCodeScanPreview.setTorch(
+        binding.submissionQrCodeScanTorch.setOnCheckedChangeListener { _, isChecked ->
+            binding.submissionQrCodeScanPreview.setTorch(
                 isChecked
             )
         }
 
-        binding.registerQrCodeScanClose.buttonIcon.setOnClickListener {
-            doNavigate(
-                RegisterQRCodeScanFragmentDirections.actionRegisterQRCodeFragmentToSubmissionDispatcherFragment()
-            )
+        binding.submissionQrCodeScanClose.buttonIcon.setOnClickListener {
+            navigateToDispatchScreen()
         }
 
-        binding.registerQrCodeScanPreview.decoderFactory =
+        binding.submissionQrCodeScanPreview.decoderFactory =
             DefaultDecoderFactory(listOf(BarcodeFormat.QR_CODE))
-        binding.registerQrCodeScanViewfinderView.setCameraPreview(binding.registerQrCodeScanPreview)
+        binding.submissionQrCodeScanViewfinderView.setCameraPreview(binding.submissionQrCodeScanPreview)
 
         viewModel.scanStatus.observe(viewLifecycleOwner, Observer {
             if (ScanStatus.SUCCESS == it) {
@@ -85,24 +83,25 @@ class RegisterQRCodeScanFragment : BaseFragment() {
 
     private fun navigateToDispatchScreen() =
         doNavigate(
-            RegisterQRCodeScanFragmentDirections.actionRegisterQRCodeFragmentToSubmissionDispatcherFragment()
+            SubmissionQRCodeScanFragmentDirections.actionSubmissionQRCodeScanFragmentToSubmissionDispatcherFragment()
         )
 
     private fun showSuccessfulScanDialog() {
         val alertDialog: AlertDialog = requireActivity().let {
             val builder = AlertDialog.Builder(it)
             builder.apply {
-                setTitle(R.string.register_qr_code_scan_successful_dialog_headline)
-                setMessage(R.string.register_qr_code_scan_successful_dialog_body)
+                setTitle(R.string.submission_qr_code_scan_successful_dialog_headline)
+                setMessage(R.string.submission_qr_code_scan_successful_dialog_body)
                 setPositiveButton(
-                    R.string.register_qr_code_scan_successful_dialog_button_positive
+                    R.string.submission_qr_code_scan_successful_dialog_button_positive
                 ) { _, _ ->
                     doNavigate(
-                        RegisterQRCodeScanFragmentDirections.actionRegisterQRCodeFragmentToDeviceRegistrationFragment()
+                        SubmissionQRCodeScanFragmentDirections
+                            .actionSubmissionQRCodeScanFragmentToSubmissionRegisterDeviceFragment()
                     )
                 }
                 setNegativeButton(
-                    R.string.register_qr_code_scan_successful_dialog_button_negative
+                    R.string.submission_qr_code_scan_successful_dialog_button_negative
                 ) { _, _ ->
                     viewModel.deleteTestGUID()
                     navigateToDispatchScreen()
@@ -117,15 +116,15 @@ class RegisterQRCodeScanFragment : BaseFragment() {
         val alertDialog: AlertDialog = requireActivity().let {
             val builder = AlertDialog.Builder(it)
             builder.apply {
-                setTitle(R.string.register_qr_code_scan_invalid_dialog_headline)
-                setMessage(R.string.register_qr_code_scan_invalid_dialog_body)
+                setTitle(R.string.submission_qr_code_scan_invalid_dialog_headline)
+                setMessage(R.string.submission_qr_code_scan_invalid_dialog_body)
                 setPositiveButton(
-                    R.string.register_qr_code_scan_invalid_dialog_button_positive
+                    R.string.submission_qr_code_scan_invalid_dialog_button_positive
                 ) { _, _ ->
                     startDecode()
                 }
                 setNegativeButton(
-                    R.string.register_qr_code_scan_invalid_dialog_button_negative
+                    R.string.submission_qr_code_scan_invalid_dialog_button_negative
                 ) { _, _ ->
                     navigateToDispatchScreen()
                 }
@@ -151,7 +150,7 @@ class RegisterQRCodeScanFragment : BaseFragment() {
     }
 
     private fun cameraPermissionIsGranted() {
-        binding.registerQrCodeScanPreview.resume()
+        binding.submissionQrCodeScanPreview.resume()
         startDecode()
     }
 
@@ -172,10 +171,10 @@ class RegisterQRCodeScanFragment : BaseFragment() {
         val alertDialog: AlertDialog = requireActivity().let {
             val builder = AlertDialog.Builder(it)
             builder.apply {
-                setTitle(R.string.register_qr_code_scan_permission_rationale_dialog_headline)
-                setMessage(R.string.register_qr_code_scan_permission_rationale_dialog_body)
+                setTitle(R.string.submission_qr_code_scan_permission_rationale_dialog_headline)
+                setMessage(R.string.submission_qr_code_scan_permission_rationale_dialog_body)
                 setPositiveButton(
-                    R.string.register_qr_code_scan_permission_rationale_dialog_button_positive
+                    R.string.submission_qr_code_scan_permission_rationale_dialog_button_positive
                 ) { _, _ ->
                     requestPermissions(
                         arrayOf(Manifest.permission.CAMERA),
@@ -183,7 +182,7 @@ class RegisterQRCodeScanFragment : BaseFragment() {
                     )
                 }
                 setNegativeButton(
-                    R.string.register_qr_code_scan_permission_rationale_dialog_button_negative
+                    R.string.submission_qr_code_scan_permission_rationale_dialog_button_negative
                 ) { _, _ ->
                     navigateToDispatchScreen()
                 }
@@ -197,10 +196,10 @@ class RegisterQRCodeScanFragment : BaseFragment() {
         val alertDialog: AlertDialog = requireActivity().let {
             val builder = AlertDialog.Builder(it)
             builder.apply {
-                setTitle(R.string.register_qr_code_scan_permission_denied_dialog_headline)
-                setMessage(R.string.register_qr_code_scan_permission_denied_dialog_body)
+                setTitle(R.string.submission_qr_code_scan_permission_denied_dialog_headline)
+                setMessage(R.string.submission_qr_code_scan_permission_denied_dialog_body)
                 setPositiveButton(
-                    R.string.register_qr_code_scan_permission_denied_dialog_button_positive
+                    R.string.submission_qr_code_scan_permission_denied_dialog_button_positive
                 ) { _, _ ->
                     navigateToDispatchScreen()
                 }
@@ -212,11 +211,11 @@ class RegisterQRCodeScanFragment : BaseFragment() {
 
     override fun onResume() {
         super.onResume()
-        binding.registerQrCodeScanPreview.resume()
+        binding.submissionQrCodeScanPreview.resume()
     }
 
     override fun onPause() {
         super.onPause()
-        binding.registerQrCodeScanPreview.pause()
+        binding.submissionQrCodeScanPreview.pause()
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterDeviceFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt
similarity index 67%
rename from Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterDeviceFragment.kt
rename to Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt
index 997a5e6778e..853c16b6e8b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/register/RegisterDeviceFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionRegisterDeviceFragment.kt
@@ -1,4 +1,4 @@
-package de.rki.coronawarnapp.ui.register
+package de.rki.coronawarnapp.ui.submission
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,20 +6,20 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Observer
-import de.rki.coronawarnapp.databinding.FragmentRegisterDeviceBinding
+import de.rki.coronawarnapp.databinding.FragmentSubmissionRegisterDeviceBinding
 import de.rki.coronawarnapp.ui.BaseFragment
 import de.rki.coronawarnapp.ui.viewmodel.SubmissionViewModel
 
-class RegisterDeviceFragment : BaseFragment() {
+class SubmissionRegisterDeviceFragment : BaseFragment() {
     private val viewModel: SubmissionViewModel by activityViewModels()
-    private lateinit var binding: FragmentRegisterDeviceBinding
+    private lateinit var binding: FragmentSubmissionRegisterDeviceBinding
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        binding = FragmentRegisterDeviceBinding.inflate(inflater)
+        binding = FragmentSubmissionRegisterDeviceBinding.inflate(inflater)
         binding.lifecycleOwner = this
         return binding.root
     }
@@ -30,7 +30,8 @@ class RegisterDeviceFragment : BaseFragment() {
         viewModel.registrationState.observe(viewLifecycleOwner, Observer {
             if (ApiRequestState.SUCCESS == it) {
                 doNavigate(
-                    RegisterDeviceFragmentDirections.actionDeviceRegistrationFragmentToSubmissionResultFragment()
+                    SubmissionRegisterDeviceFragmentDirections
+                        .actionSubmissionRegisterDeviceFragmentToSubmissionResultFragment()
                 )
             }
         })
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
index 18e7d982010..4f05de4597f 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/SubmissionTanFragment.kt
@@ -48,6 +48,6 @@ class SubmissionTanFragment : BaseFragment() {
         // store locally
         viewModel.storeTeletan()
 
-        doNavigate(SubmissionTanFragmentDirections.actionSubmissionTanFragmentToDeviceRegistrationFragment())
+        doNavigate(SubmissionTanFragmentDirections.actionSubmissionTanFragmentToSubmissionRegisterDeviceFragment())
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt
index e470de14a82..7e161142394 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModel.kt
@@ -10,8 +10,8 @@ import de.rki.coronawarnapp.exception.report
 import de.rki.coronawarnapp.service.submission.SubmissionService
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.SubmissionRepository
-import de.rki.coronawarnapp.ui.register.ApiRequestState
-import de.rki.coronawarnapp.ui.register.ScanStatus
+import de.rki.coronawarnapp.ui.submission.ApiRequestState
+import de.rki.coronawarnapp.ui.submission.ScanStatus
 import de.rki.coronawarnapp.util.formatter.TestResult
 import kotlinx.coroutines.launch
 import java.util.Date
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
index 53ad88c011d..7f0fb240bb8 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterSubmissionHelper.kt
@@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable
 import android.view.View
 import de.rki.coronawarnapp.CoronaWarnApplication
 import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.ui.register.ApiRequestState
+import de.rki.coronawarnapp.ui.submission.ApiRequestState
 import de.rki.coronawarnapp.ui.submission.TestResultStatus
 import de.rki.coronawarnapp.util.formatter.TestResult.INVALID
 import de.rki.coronawarnapp.util.formatter.TestResult.NEGATIVE
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
index 24ab796e3d3..7909a029da7 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
@@ -45,6 +45,7 @@
                 app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
                 app:layout_constraintEnd_toStartOf="@+id/submission_guideline_end"
                 app:layout_constraintStart_toStartOf="@+id/submission_guideline_start"
+                android:focusable="true"
                 app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_subtitle" />
 
             <include
@@ -99,7 +100,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintGuide_end="@dimen/sm_guideline_button" />
+                app:layout_constraintGuide_end="@dimen/submission_guideline_button" />
 
             <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/submission_guideline_top"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
index f13fe237efd..1d94e24df14 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_positive_other_warning.xml
@@ -97,7 +97,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    app:layout_constraintGuide_end="@dimen/sm_guideline_button" />
+                    app:layout_constraintGuide_end="@dimen/submission_guideline_button" />
 
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/submission_guideline_top"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_register_qr_code_scan.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
similarity index 52%
rename from Corona-Warn-App/src/main/res/layout/fragment_register_qr_code_scan.xml
rename to Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
index 838b11fe08a..ae1053e307c 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_register_qr_code_scan.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_qr_code_scan.xml
@@ -7,22 +7,22 @@
         android:layout_height="match_parent">
 
         <com.journeyapps.barcodescanner.BarcodeView
-            android:id="@+id/register_qr_code_scan_preview"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:id="@+id/submission_qr_code_scan_preview"
+            android:layout_width="@dimen/match_constraint"
+            android:layout_height="@dimen/match_constraint"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:zxing_framing_rect_height="@dimen/scan_qr_code_viewfinder_size"
-            app:zxing_framing_rect_width="@dimen/scan_qr_code_viewfinder_size">
+            app:zxing_framing_rect_height="@dimen/submission_scan_qr_code_viewfinder_size"
+            app:zxing_framing_rect_width="@dimen/submission_scan_qr_code_viewfinder_size">
 
         </com.journeyapps.barcodescanner.BarcodeView>
 
         <com.journeyapps.barcodescanner.ViewfinderView
-            android:id="@+id/register_qr_code_scan_viewfinder_view"
-            android:layout_width="@dimen/scan_qr_code_viewfinder_size"
-            android:layout_height="@dimen/scan_qr_code_viewfinder_size"
+            android:id="@+id/submission_qr_code_scan_viewfinder_view"
+            android:layout_width="@dimen/submission_scan_qr_code_viewfinder_size"
+            android:layout_height="@dimen/submission_scan_qr_code_viewfinder_size"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -30,58 +30,58 @@
             app:zxing_viewfinder_laser_visibility="false" />
 
         <TextView
-            android:id="@+id/register_qr_code_scan_body"
+            android:id="@+id/submission_qr_code_scan_body"
             style="@style/registrationQRCodeScanBody"
-            android:layout_width="@dimen/scan_qr_code_viewfinder_size"
+            android:layout_width="@dimen/submission_scan_qr_code_viewfinder_size"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:text="@string/register_qr_code_scan_body"
-            app:layout_constraintEnd_toEndOf="@+id/register_qr_code_scan_preview"
-            app:layout_constraintStart_toStartOf="@+id/register_qr_code_scan_preview"
-            app:layout_constraintTop_toBottomOf="@+id/register_qr_code_scan_viewfinder_view" />
+            android:layout_marginTop="@dimen/spacing_small"
+            android:text="@string/submission_qr_code_scan_body"
+            app:layout_constraintEnd_toEndOf="@+id/submission_qr_code_scan_preview"
+            app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_preview"
+            app:layout_constraintTop_toBottomOf="@+id/submission_qr_code_scan_viewfinder_view" />
 
 
         <include
-            android:id="@+id/register_qr_code_scan_close"
+            android:id="@+id/submission_qr_code_scan_close"
             layout="@layout/include_button_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:icon="@{@drawable/ic_close}"
-            app:layout_constraintBottom_toTopOf="@+id/register_qr_code_scan_guideline_top"
-            app:layout_constraintEnd_toStartOf="@+id/register_qr_code_scan_guideline_start"
-            app:layout_constraintStart_toStartOf="@+id/register_qr_code_scan_guideline_start"
-            app:layout_constraintTop_toTopOf="@+id/register_qr_code_scan_guideline_top" />
+            app:layout_constraintBottom_toTopOf="@+id/submission_qr_code_scan_guideline_top"
+            app:layout_constraintEnd_toStartOf="@+id/submission_qr_code_scan_guideline_start"
+            app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_guideline_start"
+            app:layout_constraintTop_toTopOf="@+id/submission_qr_code_scan_guideline_top" />
 
         <ToggleButton
-            android:id="@+id/register_qr_code_scan_torch"
+            android:id="@+id/submission_qr_code_scan_torch"
             android:layout_width="@dimen/icon_size"
             android:layout_height="@dimen/icon_size"
             android:background="@drawable/ic_registration_qr_code_scan_torch_toggle"
             android:backgroundTint="@color/iconColor"
             android:textOff=""
             android:textOn=""
-            app:layout_constraintBottom_toTopOf="@+id/register_qr_code_scan_guideline_top"
-            app:layout_constraintEnd_toStartOf="@+id/register_qr_code_scan_guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/register_qr_code_scan_guideline_end"
-            app:layout_constraintTop_toTopOf="@+id/register_qr_code_scan_guideline_top" />
+            app:layout_constraintBottom_toTopOf="@+id/submission_qr_code_scan_guideline_top"
+            app:layout_constraintEnd_toStartOf="@+id/submission_qr_code_scan_guideline_end"
+            app:layout_constraintStart_toStartOf="@+id/submission_qr_code_scan_guideline_end"
+            app:layout_constraintTop_toTopOf="@+id/submission_qr_code_scan_guideline_top" />
 
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/register_qr_code_scan_guideline_start"
+            android:id="@+id/submission_qr_code_scan_guideline_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintGuide_begin="@dimen/guideline_start" />
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/register_qr_code_scan_guideline_top"
+            android:id="@+id/submission_qr_code_scan_guideline_top"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintGuide_end="707dp" />
+            app:layout_constraintGuide_begin="@dimen/spacing_normal" />
 
         <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/register_qr_code_scan_guideline_end"
+            android:id="@+id/submission_qr_code_scan_guideline_end"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_register_device.xml b/Corona-Warn-App/src/main/res/layout/fragment_submission_register_device.xml
similarity index 56%
rename from Corona-Warn-App/src/main/res/layout/fragment_register_device.xml
rename to Corona-Warn-App/src/main/res/layout/fragment_submission_register_device.xml
index d535281319a..359284ebf0a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_register_device.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_submission_register_device.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
-        tools:context=".ui.register.RegisterDeviceFragment">
+        tools:context=".ui.submission.SubmissionRegisterDeviceFragment">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -15,58 +15,58 @@
 
 
             <TextView
-                android:id="@+id/register_device_headline"
+                android:id="@+id/submission_register_device_headline"
                 style="@style/textTitle"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/register_device_headline"
-                app:layout_constraintEnd_toStartOf="@+id/register_device_guideline_end"
-                app:layout_constraintStart_toStartOf="@+id/register_device_guideline_start"
-                app:layout_constraintTop_toTopOf="@+id/register_device_guideline_top" />
+                android:text="@string/submission_register_device_headline"
+                app:layout_constraintEnd_toStartOf="@+id/submission_register_device_guideline_end"
+                app:layout_constraintStart_toStartOf="@+id/submission_register_device_guideline_start"
+                app:layout_constraintTop_toTopOf="@+id/submission_register_device_guideline_top" />
 
             <TextView
-                android:id="@+id/register_device_text"
+                android:id="@+id/submission_register_device_text"
                 style="@style/textMultiline"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/register_device_body"
-                app:layout_constraintEnd_toStartOf="@+id/register_device_guideline_end"
-                app:layout_constraintStart_toStartOf="@+id/register_device_guideline_start"
-                app:layout_constraintTop_toBottomOf="@+id/register_device_headline" />
+                android:text="@string/submission_register_device_body"
+                app:layout_constraintEnd_toStartOf="@+id/submission_register_device_guideline_end"
+                app:layout_constraintStart_toStartOf="@+id/submission_register_device_guideline_start"
+                app:layout_constraintTop_toBottomOf="@+id/submission_register_device_headline" />
 
             <ProgressBar
-                android:id="@+id/register_device_spinner"
+                android:id="@+id/submission_register_device_spinner"
                 style="?android:attr/progressBarStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toTopOf="@+id/register_device_guideline_bottom"
-                app:layout_constraintEnd_toStartOf="@+id/register_device_guideline_end"
-                app:layout_constraintStart_toStartOf="@+id/register_device_guideline_start"
-                app:layout_constraintTop_toBottomOf="@+id/register_device_text" />
+                app:layout_constraintBottom_toTopOf="@+id/submission_register_device_guideline_bottom"
+                app:layout_constraintEnd_toStartOf="@+id/submission_register_device_guideline_end"
+                app:layout_constraintStart_toStartOf="@+id/submission_register_device_guideline_start"
+                app:layout_constraintTop_toBottomOf="@+id/submission_register_device_text" />
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/register_device_guideline_start"
+                android:id="@+id/submission_register_device_guideline_start"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 app:layout_constraintGuide_begin="@dimen/guideline_start" />
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/register_device_guideline_bottom"
+                android:id="@+id/submission_register_device_guideline_bottom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 app:layout_constraintGuide_end="@dimen/guideline_bottom" />
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/register_device_guideline_end"
+                android:id="@+id/submission_register_device_guideline_end"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 app:layout_constraintGuide_end="@dimen/guideline_end" />
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/register_device_guideline_top"
+                android:id="@+id/submission_register_device_guideline_top"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
diff --git a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
index 727d76726dc..1a7d46ac9bb 100644
--- a/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
+++ b/Corona-Warn-App/src/main/res/navigation/nav_graph.xml
@@ -180,12 +180,12 @@
         android:name="de.rki.coronawarnapp.ui.submission.SubmissionDispatcherFragment"
         android:label="fragment_submission_dispatcher"
         tools:layout="@layout/fragment_submission_dispatcher">
-        <action
-            android:id="@+id/action_submissionDispatcherFragment_to_registerQRCodeFragment"
-            app:destination="@id/registerQRCodeFragment" />
         <action
             android:id="@+id/action_submissionDispatcherFragment_to_submissionTanFragment"
             app:destination="@id/submissionTanFragment" />
+        <action
+            android:id="@+id/action_submissionDispatcherFragment_to_submissionQRCodeScanFragment"
+            app:destination="@id/submissionQRCodeScanFragment" />
     </fragment>
     <fragment
         android:id="@+id/submissionResultPositiveOtherWarningFragment"
@@ -218,33 +218,10 @@
             app:popUpTo="@id/submissionDispatcherFragment"
             app:popUpToInclusive="true" />
         <action
-            android:id="@+id/action_submissionTanFragment_to_deviceRegistrationFragment"
-            app:destination="@id/deviceRegistrationFragment" />
+            android:id="@+id/action_submissionTanFragment_to_submissionRegisterDeviceFragment"
+            app:destination="@id/submissionRegisterDeviceFragment" />
     </fragment>
 
-    <fragment
-        android:id="@+id/registerQRCodeFragment"
-        android:name="de.rki.coronawarnapp.ui.register.RegisterQRCodeScanFragment"
-        android:label="RegisterQRCodeFragment">
-        <action
-            android:id="@+id/action_registerQRCodeFragment_to_deviceRegistrationFragment"
-            app:destination="@id/deviceRegistrationFragment" />
-        <action
-            android:id="@+id/action_registerQRCodeFragment_to_submissionDispatcherFragment"
-            app:destination="@id/submissionDispatcherFragment"
-            app:popUpTo="@id/submissionDispatcherFragment"
-            app:popUpToInclusive="true" />
-
-    </fragment>
-
-    <fragment
-        android:id="@+id/deviceRegistrationFragment"
-        android:name="de.rki.coronawarnapp.ui.register.RegisterDeviceFragment"
-        android:label="DeviceRegistrationFragment">
-        <action
-            android:id="@+id/action_deviceRegistrationFragment_to_submissionResultFragment"
-            app:destination="@id/submissionResultFragment" />
-    </fragment>
     <fragment
         android:id="@+id/submissionIntroFragment"
         android:name="de.rki.coronawarnapp.ui.submission.SubmissionIntroFragment"
@@ -266,6 +243,28 @@
             android:id="@+id/deepLink"
             app:uri="coronawarnapp://launch" />
     </activity>
+    <fragment
+        android:id="@+id/submissionQRCodeScanFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.SubmissionQRCodeScanFragment"
+        android:label="SubmissionQRCodeScanFragment">
+        <action
+            android:id="@+id/action_submissionQRCodeScanFragment_to_submissionDispatcherFragment"
+            app:destination="@id/submissionDispatcherFragment"
+            app:popUpTo="@id/submissionDispatcherFragment"
+            app:popUpToInclusive="true" />
+        <action
+            android:id="@+id/action_submissionQRCodeScanFragment_to_submissionRegisterDeviceFragment"
+            app:destination="@id/submissionRegisterDeviceFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/submissionRegisterDeviceFragment"
+        android:name="de.rki.coronawarnapp.ui.submission.SubmissionRegisterDeviceFragment"
+        android:label="SubmissionRegisterDeviceFragment">
+        <action
+            android:id="@+id/action_submissionRegisterDeviceFragment_to_submissionResultFragment"
+            app:destination="@id/submissionResultFragment"
+            app:popUpTo="@id/mainFragment" />
+    </fragment>
     <fragment
         android:id="@+id/submissionDoneFragment"
         android:name="de.rki.coronawarnapp.ui.submission.SubmissionDoneFragment"
diff --git a/Corona-Warn-App/src/main/res/values/dimens.xml b/Corona-Warn-App/src/main/res/values/dimens.xml
index 7613f153fed..059bde7bdef 100644
--- a/Corona-Warn-App/src/main/res/values/dimens.xml
+++ b/Corona-Warn-App/src/main/res/values/dimens.xml
@@ -62,8 +62,7 @@
     <!-- todo illustration sizes -->
 
     <!-- Submission -->
-    <dimen name="sm_guideline_body">200dp</dimen>
-    <dimen name="sm_guideline_button">@dimen/spacing_large</dimen>
+    <dimen name="submission_guideline_button">@dimen/spacing_large</dimen>
 
     <!-- Submission Test Result -->
     <dimen name="submission_test_result_guideline_body">84dp</dimen>
@@ -81,9 +80,6 @@
     <dimen name="submission_tan_input_digit_width">36dp</dimen>
     <dimen name="submission_tan_input_digit_height">50dp</dimen>
 
-    <!-- Registration -->
-    <dimen name="scan_qr_code_guideline_body">200dp</dimen>
-    <dimen name="scan_qr_code_guideline_button">@dimen/spacing_large</dimen>
-    <dimen name="scan_qr_code_close_icon_size">14dp</dimen>
-    <dimen name="scan_qr_code_viewfinder_size">240dp</dimen>
+    <!-- Submission QR Code Scan -->
+    <dimen name="submission_scan_qr_code_viewfinder_size">240dp</dimen>
 </resources>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index d2b1022ce85..10a04aeb67b 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -312,24 +312,57 @@
              Submission
              TODO: rename if screens are available
     ###################################### -->
+    <!-- Permission Rationale Dialog -->
+    <string name="submission_qr_code_scan_permission_rationale_dialog_headline">Kamera Berechtigung benötigt</string>
+    <string name="submission_qr_code_scan_permission_rationale_dialog_body">@string/lorem_ipsum</string>
+
+    <string name="submission_qr_code_scan_permission_rationale_dialog_button_positive">Erlauben</string>
+    <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">Nicht erlauben</string>
+    <!-- Permission Denied Dialog -->
+    <string name="submission_qr_code_scan_permission_denied_dialog_headline">Keine Kamera Berechtigung</string>
+    <string name="submission_qr_code_scan_permission_denied_dialog_body">@string/lorem_ipsum</string>
+
+    <string name="submission_qr_code_scan_permission_denied_dialog_button_positive">Zurück</string>
+    <!-- QR Code Scan Successful Dialog -->
+    <string name="submission_qr_code_scan_successful_dialog_headline">Scan erfolgreich</string>
+    <string name="submission_qr_code_scan_successful_dialog_body">@string/lorem_ipsum</string>
+
+    <string name="submission_qr_code_scan_successful_dialog_button_positive">Registrieren</string>
+    <string name="submission_qr_code_scan_successful_dialog_button_negative">Abbrechen</string>
+    <!-- QR Code Scan Invalid Dialog -->
+    <string name="submission_qr_code_scan_invalid_dialog_headline">Falscher QR Code</string>
+    <string name="submission_qr_code_scan_invalid_dialog_body">@string/lorem_ipsum</string>
+
+    <string name="submission_qr_code_scan_invalid_dialog_button_positive">Erneut versuchen</string>
+    <string name="submission_qr_code_scan_invalid_dialog_button_negative">Abbrechen</string>
+    <!-- QR Code Scan Screen -->
+    <string name="submission_qr_code_scan_body">Positionieren Sie den QR Code in den Rahmen</string>
+    <!-- Register Device Screen -->
+    <string name="submission_register_device_headline">Gerät Registrieren</string>
+    <string name="submission_register_device_body">@string/lorem_ipsum</string>
     <!-- Submission Test Result -->
     <string name="submission_test_result_headline">Testergebnis</string>
     <string name="submission_test_result_subtitle">Info zum Ablauf:</string>
     <string name="submission_test_result_button_finish">Abschließen</string>
+
     <string name="submission_test_result_steps_added_heading">Test erfolgreich hinzugefügt</string>
     <string name="submission_test_result_steps_added_body">Ihr Test wurde in der Corona-Warn-App hinterlegt.</string>
+
     <string name="submission_test_result_pending_steps_waiting_heading">Testergebnis noch nicht verfügbar</string>
     <string name="submission_test_result_pending_steps_waiting_body">Ihr Testergebnis steht noch nicht zur Verfügung. Normalerweise dauert die Auswertung 1–3 Tage.</string>
     <string name="submission_test_result_pending_refresh_button">Aktualisieren</string>
     <string name="submission_test_result_pending_remove_test_button">Test entfernen</string>
+
     <string name="submission_test_result_negative_steps_negative_heading">Testergebnis Negativ</string>
     <string name="submission_test_result_negative_steps_negative_body">Ihr Testergebnis wurde erfolgreich als “Negativ” verifiziert. Bitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können.</string>
     <string name="submission_test_result_negative_remove_test_button">Test entfernen</string>
+
     <string name="submission_test_result_positive_steps_positive_heading">Testergebnis Positiv</string>
     <string name="submission_test_result_positive_steps_positive_body">Ihr Testergebnis wurde erfolgreich als “Positiv” verifiziert.</string>
     <string name="submission_test_result_positive_steps_warning_others_heading">Andere warnen</string>
     <string name="submission_test_result_positive_steps_warning_others_body">Teilen Sie Ihre Zufallskennungen, damit andere gewarnt werden können.</string>
     <string name="submission_test_result_positive_continue_button">Weiter</string>
+
     <string name="submission_test_result_invalid_steps_invalid_heading">Test fehlerhaft</string>
     <string name="submission_test_result_invalid_steps_invalid_body">Es gab ein Problem bei der Auswertung Ihres Tests. Bitte kontaktieren Sie das Gesundheitsamt um Information zum weiteren Vorgehen zu erhalten. Bitte entfernen Sie den Test wieder aus der Corona-Warn-App, damit Sie bei Bedarf einen neuen Test hinterlegen können.</string>
     <string name="submission_test_result_invalid_remove_test_button">Test entfernen</string>
@@ -343,10 +376,6 @@
     <string name="submission_intro_text_a">Damit die Corona-Warn-App funktioniert, wird die freiwillige Mithilfe von allen Corona positiven Personen benötigt.</string>
     <string name="submission_intro_text_b">@string/lorem_ipsum</string>
     <string name="submission_intro_button_next">Weiter</string>
-    <!-- sm Result -->
-    <string name="sm_result_headline">Positive Diagnose</string>
-    <string name="sm_result_body">@string/lorem_ipsum</string>
-    <string name="sm_result_button_finish">Abschliessen</string>
     <!-- sm Notification -->
     <string name="sm_result_dialog_headline">Danke für die Mithilfe!</string>
     <string name="sm_result_dialog_body">Ihr verifizierter Befund wurde anonym übertragen.</string>
@@ -408,34 +437,4 @@
     <string name="test_api_body_other_keys">Other key </string>
     <string name="test_api_calculate_risk_level">Calculate Risk Level</string>
 
-
-    <!-- ####################################
-                Register
-    ###################################### -->
-    <!-- Permission Rationale Dialog -->
-    <string name="register_qr_code_scan_permission_rationale_dialog_headline">Kamera Berechtigung benötigt</string>
-    <string name="register_qr_code_scan_permission_rationale_dialog_body">@string/lorem_ipsum</string>
-    <string name="register_qr_code_scan_permission_rationale_dialog_button_positive">Erlauben</string>
-    <string name="register_qr_code_scan_permission_rationale_dialog_button_negative">Nicht erlauben</string>
-    <!-- Permission Denied Dialog -->
-    <string name="register_qr_code_scan_permission_denied_dialog_headline">Keine Kamera Berechtigung</string>
-    <string name="register_qr_code_scan_permission_denied_dialog_body">@string/lorem_ipsum</string>
-    <string name="register_qr_code_scan_permission_denied_dialog_button_positive">Zurück</string>
-    <!-- QR Code Scan Successful Dialog -->
-    <string name="register_qr_code_scan_successful_dialog_headline">Scan erfolgreich</string>
-    <string name="register_qr_code_scan_successful_dialog_body">@string/lorem_ipsum</string>
-    <string name="register_qr_code_scan_successful_dialog_button_positive">Registrieren</string>
-    <string name="register_qr_code_scan_successful_dialog_button_negative">Abbrechen</string>
-    <!-- QR Code Scan Invalid Dialog -->
-    <string name="register_qr_code_scan_invalid_dialog_headline">Falscher QR Code</string>
-    <string name="register_qr_code_scan_invalid_dialog_body">@string/lorem_ipsum</string>
-    <string name="register_qr_code_scan_invalid_dialog_button_positive">Erneut versuchen</string>
-    <string name="register_qr_code_scan_invalid_dialog_button_negative">Abbrechen</string>
-    <!-- QR Code Scan Screen -->
-    <string name="register_qr_code_scan_headline">QR Code Scannen</string>
-    <string name="register_qr_code_scan_body">Positionieren Sie den QR Code in den Rahmen</string>
-    <!-- Register Device Screen -->
-    <string name="register_device_headline">Gerät Registrieren</string>
-    <string name="register_device_body">@string/lorem_ipsum</string>
-
 </resources>