diff --git a/app/src/main/java/org/lineageos/aperture/QrImageAnalyzer.kt b/app/src/main/java/org/lineageos/aperture/QrImageAnalyzer.kt
index 1343d27..0bc4e10 100644
--- a/app/src/main/java/org/lineageos/aperture/QrImageAnalyzer.kt
+++ b/app/src/main/java/org/lineageos/aperture/QrImageAnalyzer.kt
@@ -39,19 +39,19 @@
         bottomSheetDialog.findViewById<TextView>(R.id.bytes)!!
     }
     private val bottomSheetDialogBytesTitle by lazy {
-        bottomSheetDialog.findViewById<TextView>(R.id.bytes_title)!!
+        bottomSheetDialog.findViewById<TextView>(R.id.bytesTitle)!!
     }
     private val bottomSheetDialogText by lazy {
         bottomSheetDialog.findViewById<TextView>(R.id.text)!!
     }
     private val bottomSheetDialogTextTitle by lazy {
-        bottomSheetDialog.findViewById<TextView>(R.id.text_title)!!
+        bottomSheetDialog.findViewById<TextView>(R.id.textTitle)!!
     }
     private val bottomSheetDialogType by lazy {
         bottomSheetDialog.findViewById<TextView>(R.id.type)!!
     }
     private val bottomSheetDialogSetType by lazy {
-        bottomSheetDialog.findViewById<Spinner>(R.id.set_type)!!
+        bottomSheetDialog.findViewById<Spinner>(R.id.setType)!!
     }
 
     private val reader by lazy { MultiFormatReader() }
@@ -127,7 +127,7 @@
                 else null
 
             // Set type spinner
-            bottomSheetDialog.findViewById<Spinner>(R.id.set_type)?.onItemSelectedListener =
+            bottomSheetDialog.findViewById<Spinner>(R.id.setType)?.onItemSelectedListener =
                 object : AdapterView.OnItemSelectedListener {
                     override fun onNothingSelected(parent: AdapterView<*>?) {}
 
diff --git a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
index 1e03714..66fedad 100644
--- a/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
+++ b/app/src/main/res/layout/qr_bottom_sheet_dialog.xml
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toBottomOf="@+id/drag" />
 
     <Spinner
-        android:id="@+id/set_type"
+        android:id="@+id/setType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -63,7 +63,7 @@
         app:layout_constraintTop_toTopOf="@+id/title" />
 
     <TextView
-        android:id="@+id/type_title"
+        android:id="@+id/typeTitle"
         style="@style/TextAppearance.AppCompat.Body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -79,11 +79,11 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/type_title"
+        app:layout_constraintTop_toBottomOf="@+id/typeTitle"
         tools:text="QR_CODE" />
 
     <TextView
-        android:id="@+id/bytes_title"
+        android:id="@+id/bytesTitle"
         style="@style/TextAppearance.AppCompat.Body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -100,11 +100,11 @@
         android:layout_marginTop="16dp"
         android:fontFamily="monospace"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bytes_title"
+        app:layout_constraintTop_toBottomOf="@+id/bytesTitle"
         tools:text="41 56 87 47 47 07 33 A2 F2 F6 C6 96 E6 56 16 76 56 F7 32 E6 F7 26 70 EC 11 EC 11 EC 11 EC 11 EC 11 EC" />
 
     <TextView
-        android:id="@+id/text_title"
+        android:id="@+id/textTitle"
         style="@style/TextAppearance.AppCompat.Body2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -120,6 +120,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_title"
+        app:layout_constraintTop_toBottomOf="@+id/textTitle"
         tools:text="https://lineageos.org" />
 </androidx.constraintlayout.widget.ConstraintLayout>
