diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
index 14adf917..e16ab1b6 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetDoubleEditTextFragment.kt
@@ -30,7 +30,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 		if (isEditingBlinds) {
 			editText2.requestFocus()
 		} else {
-			editText1.requestFocus()
+			editText.requestFocus()
 		}
 	}
 
@@ -65,20 +65,20 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 		values[0] = (data[0].defaultValue ?: "").toString()
 		values[1] = (data[1].defaultValue ?: "").toString()
 
-		data[0].hint?.let { editText1.hint = getString(it) }
-		editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+		data[0].hint?.let { editText.hint = getString(it) }
+		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 		data[1].hint?.let { editText2.hint = getString(it) }
 		editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 
 		if (valueHasPlaceholder) {
-            if (values[0].isNotBlank()) { editText1.hint = values[0] }
+            if (values[0].isNotBlank()) { editText.hint = values[0] }
             if (values[1].isNotBlank()) { editText2.hint = values[1] }
 		} else {
-			editText1.setText(values[0])
+			editText.setText(values[0])
 			editText2.setText(values[1])
 		}
 
-		editText1.addTextChangedListener {
+		editText.addTextChangedListener {
 			values[0] = it?.toString() ?: ""
 		}
 
@@ -87,9 +87,9 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 			if (isEditingBlinds) {
 				try {
 					val bigBlind = values[1].toDouble()
-					editText1.setText((bigBlind / 2.0).round())
+					editText.setText((bigBlind / 2.0).round())
 				} catch (e: Exception) {
-					editText1.setText("")
+					editText.setText("")
 				}
 			}
 		}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
index 86a9a0c1..a93c3e6c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextFragment.kt
@@ -24,7 +24,7 @@ class BottomSheetEditTextFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		editText1.requestFocus()
+		editText.requestFocus()
 	}
 
 	override fun getValue(): Any? {
@@ -57,21 +57,21 @@ class BottomSheetEditTextFragment : BottomSheetFragment() {
 
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true)
 
-		data[0].hint?.let { editText1.hint = getString(it) }
-		editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
-		editText1.addTextChangedListener {
+		data[0].hint?.let { editText.hint = getString(it) }
+		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+		editText.addTextChangedListener {
 			this.value = it?.toString()
 		}
 		data[0].defaultValue?.let {
 			if (valueHasPlaceholder) {
 				this.value = it.toString()
-				editText1.hint = it.toString()
+				editText.hint = it.toString()
 			} else {
-				editText1.setText(it.toString())
+				editText.setText(it.toString())
 			}
 		}
 
-		editText1.setOnEditorActionListener { _, actionId, _ ->
+		editText.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				delegate.onRowValueChanged(getValue(), row)
 				dismiss()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
index 1c929b6b..22f450be 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetEditTextMultiLinesFragment.kt
@@ -22,7 +22,7 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		editText1.requestFocus()
+		editText.requestFocus()
 	}
 
 	override fun getValue(): Any? {
@@ -49,11 +49,11 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
 
 		LayoutInflater.from(requireContext()).inflate(net.pokeranalytics.android.R.layout.bottom_sheet_edit_text_multi_lines, view?.bottomSheetContainer, true)
 
-		data[0].hint?.let { editText1.hint = getString(it) }
-		editText1.inputType = data[0].inputType  ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
-		editText1.addTextChangedListener { this.value = it?.toString() }
+		data[0].hint?.let { editText.hint = getString(it) }
+		editText.inputType = data[0].inputType  ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+		editText.addTextChangedListener { this.value = it?.toString() }
 		data[0].defaultValue?.let {
-			editText1.setText(it.toString())
+			editText.setText(it.toString())
 		}
 	}
 
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
index 90f4d45c..610e701c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetNumericTextFragment.kt
@@ -25,7 +25,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		editText1.requestFocus()
+		editText.requestFocus()
 	}
 
 	override fun getValue(): Any? {
@@ -49,12 +49,12 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_edit_text, view?.bottomSheetContainer, true)
 
-		data[0].hint?.let { editText1.hint = getString(it) }
-		editText1.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
-		editText1.addTextChangedListener {
+		data[0].hint?.let { editText.hint = getString(it) }
+		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
+		editText.addTextChangedListener {
 
 			this.value = try {
-				editText1.text.toString().toDouble()
+				editText.text.toString().toDouble()
 			} catch (e: Exception) {
 				null
 			}
@@ -72,13 +72,13 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 
 			if (valueHasPlaceholder) {
 				this.value = it.toString().toDoubleOrNull()
-				editText1.hint = valueString
+				editText.hint = valueString
 			} else {
-				editText1.setText(valueString)
+				editText.setText(valueString)
 			}
 		}
 
-		editText1.setOnEditorActionListener { _, actionId, _ ->
+		editText.setOnEditorActionListener { _, actionId, _ ->
 			if (actionId == EditorInfo.IME_ACTION_DONE) {
 				delegate.onRowValueChanged(getValue(), row)
 				dismiss()
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
index a672e2c3..8f96c818 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetSumFragment.kt
@@ -28,7 +28,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		editText1.requestFocus()
+		editText.requestFocus()
 	}
 
 	override fun getValue(): Any? {
@@ -98,11 +98,11 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 			}
 
 			// First edit text
-			data[3].hint?.let { editText1.hint = getString(it) }
-			editText1.inputType = data[3].inputType ?: InputType.TYPE_CLASS_TEXT
-			editText1.addTextChangedListener {
+			data[3].hint?.let { editText.hint = getString(it) }
+			editText.inputType = data[3].inputType ?: InputType.TYPE_CLASS_TEXT
+			editText.addTextChangedListener {
 				val valueToAdd = try {
-					editText1.text.toString().toDouble()
+					editText.text.toString().toDouble()
 				} catch (e: Exception) {
 					0.0
 				}
diff --git a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
index 21005821..703d8f60 100644
--- a/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
+++ b/app/src/main/res/layout/bottom_sheet_double_edit_text.xml
@@ -8,7 +8,7 @@
 	tools:background="@color/gray_darker">
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/editText1"
+		android:id="@+id/editText"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
@@ -39,7 +39,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/editText1"
+		app:layout_constraintStart_toEndOf="@+id/editText"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.0"
 		tools:text="20" />
diff --git a/app/src/main/res/layout/bottom_sheet_edit_text.xml b/app/src/main/res/layout/bottom_sheet_edit_text.xml
index d32697a2..bac63ced 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_text.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_text.xml
@@ -8,7 +8,7 @@
 	tools:background="@color/gray_darker">
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/editText1"
+		android:id="@+id/editText"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml b/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
index 766adff7..8fe4b348 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_text_multi_lines.xml
@@ -8,7 +8,7 @@
 	tools:background="@color/gray_darker">
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/editText1"
+		android:id="@+id/editText"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/bottom_sheet_sum.xml b/app/src/main/res/layout/bottom_sheet_sum.xml
index b657682d..8c31ff0c 100644
--- a/app/src/main/res/layout/bottom_sheet_sum.xml
+++ b/app/src/main/res/layout/bottom_sheet_sum.xml
@@ -49,12 +49,12 @@
 		app:autoSizeMinTextSize="12sp"
 		app:autoSizeStepGranularity="2sp"
 		app:autoSizeTextType="uniform"
-		app:layout_constraintBottom_toBottomOf="@+id/editText1"
+		app:layout_constraintBottom_toBottomOf="@+id/editText"
 		app:layout_constraintEnd_toStartOf="@+id/more"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintHorizontal_chainStyle="packed"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="@+id/editText1"
+		app:layout_constraintTop_toTopOf="@+id/editText"
 		tools:text="0 $" />
 
 	<androidx.appcompat.widget.AppCompatTextView
@@ -66,14 +66,14 @@
 		android:gravity="center"
 		android:padding="4dp"
 		android:text="+"
-		app:layout_constraintBottom_toBottomOf="@+id/editText1"
-		app:layout_constraintEnd_toStartOf="@+id/editText1"
+		app:layout_constraintBottom_toBottomOf="@+id/editText"
+		app:layout_constraintEnd_toStartOf="@+id/editText"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/currentValue"
-		app:layout_constraintTop_toTopOf="@+id/editText1" />
+		app:layout_constraintTop_toTopOf="@+id/editText" />
 
 	<androidx.appcompat.widget.AppCompatEditText
-		android:id="@+id/editText1"
+		android:id="@+id/editText"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="8dp"
@@ -99,11 +99,11 @@
 		android:gravity="center"
 		android:padding="4dp"
 		android:text="="
-		app:layout_constraintBottom_toBottomOf="@+id/editText1"
+		app:layout_constraintBottom_toBottomOf="@+id/editText"
 		app:layout_constraintEnd_toStartOf="@+id/editText2"
 		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/editText1"
-		app:layout_constraintTop_toTopOf="@+id/editText1" />
+		app:layout_constraintStart_toEndOf="@+id/editText"
+		app:layout_constraintTop_toTopOf="@+id/editText" />
 
 	<androidx.appcompat.widget.AppCompatEditText
 		android:id="@+id/editText2"
@@ -114,11 +114,11 @@
 		android:gravity="center"
 		android:imeOptions="actionDone"
 		android:lines="1"
-		app:layout_constraintBottom_toBottomOf="@+id/editText1"
+		app:layout_constraintBottom_toBottomOf="@+id/editText"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintHorizontal_bias="0.5"
 		app:layout_constraintStart_toEndOf="@+id/equal"
-		app:layout_constraintTop_toTopOf="@+id/editText1"
+		app:layout_constraintTop_toTopOf="@+id/editText"
 		tools:text="20" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file