diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt
index 6c134bd48..491f53ca6 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/CloneFragment.kt
@@ -43,10 +43,10 @@ class CloneFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.btnCloneRemote.setOnClickListener {
+        binding.cloneRemote.setOnClickListener {
             cloneToHiddenDir()
         }
-        binding.btnCreateLocal.setOnClickListener {
+        binding.createLocal.setOnClickListener {
             parentFragmentManager.performTransactionWithBackStack(RepoLocationFragment.newInstance())
         }
     }
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt
index b0c61e781..27d9e2269 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/RepoLocationFragment.kt
@@ -76,11 +76,11 @@ class RepoLocationFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.btnHidden.setOnClickListener {
+        binding.hidden.setOnClickListener {
             createRepoInHiddenDir()
         }
 
-        binding.btnSdcard.setOnClickListener {
+        binding.sdcard.setOnClickListener {
             createRepoFromExternalDir()
         }
     }
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt
index 74078f9fb..d0d9b80e0 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/ui/onboarding/fragments/WelcomeFragment.kt
@@ -16,7 +16,7 @@ class WelcomeFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val binding = FragmentWelcomeBinding.inflate(layoutInflater)
-        binding.btnGo.setOnClickListener { parentFragmentManager.performTransactionWithBackStack(CloneFragment.newInstance()) }
+        binding.letsGo.setOnClickListener { parentFragmentManager.performTransactionWithBackStack(CloneFragment.newInstance()) }
         return binding.root
     }
 }
diff --git a/app/src/main/res/layout/fragment_clone.xml b/app/src/main/res/layout/fragment_clone.xml
index 74afa4b66..3ef039013 100644
--- a/app/src/main/res/layout/fragment_clone.xml
+++ b/app/src/main/res/layout/fragment_clone.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_app_icon"
+        android:id="@+id/app_icon"
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:layout_marginStart="32dp"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_app_name"
+        android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -27,12 +27,12 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         android:textColor="@color/color_control_normal"
         android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/iv_app_icon"
-        app:layout_constraintTop_toTopOf="@+id/iv_app_icon"
-        app:layout_constraintBottom_toBottomOf="@id/iv_app_icon"/>
+        app:layout_constraintStart_toEndOf="@id/app_icon"
+        app:layout_constraintTop_toTopOf="@+id/app_icon"
+        app:layout_constraintBottom_toBottomOf="@id/app_icon"/>
 
     <TextView
-        android:id="@+id/tv_repo_type"
+        android:id="@+id/repo_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
@@ -41,9 +41,9 @@
         android:textColor="@color/color_control_normal"
         android:textAppearance="@style/TextAppearance.AppCompat.Display1"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="@id/iv_app_icon"
+        app:layout_constraintStart_toStartOf="@id/app_icon"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/iv_app_icon" />
+        app:layout_constraintTop_toBottomOf="@id/app_icon" />
 
     <TextView
         android:id="@+id/tv_repo_type_text"
@@ -55,12 +55,12 @@
         android:textStyle="bold"
         android:textColor="@color/color_control_normal"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintStart_toStartOf="@id/tv_repo_type"
+        app:layout_constraintStart_toStartOf="@id/repo_type"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_repo_type" />
+        app:layout_constraintTop_toBottomOf="@id/repo_type" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_clone_remote"
+        android:id="@+id/clone_remote"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -69,11 +69,11 @@
         android:minWidth="100dp"
         android:text="@string/clone_remote_repo"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/btn_create_local"
+        app:layout_constraintBottom_toTopOf="@id/create_local"
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_create_local"
+        android:id="@+id/create_local"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="128dp"
@@ -81,7 +81,7 @@
         android:maxWidth="300dp"
         android:text="@string/create_local_repo"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/btn_clone_remote"
-        app:layout_constraintEnd_toEndOf="@id/btn_clone_remote" />
+        app:layout_constraintStart_toStartOf="@id/clone_remote"
+        app:layout_constraintEnd_toEndOf="@id/clone_remote" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_repo_location.xml b/app/src/main/res/layout/fragment_repo_location.xml
index 47be8cbc2..68bc62ed2 100644
--- a/app/src/main/res/layout/fragment_repo_location.xml
+++ b/app/src/main/res/layout/fragment_repo_location.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_app_icon"
+        android:id="@+id/app_icon"
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:layout_marginStart="32dp"
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_app_name"
+        android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
@@ -27,12 +27,12 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         android:textColor="@color/color_control_normal"
         android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/iv_app_icon"
-        app:layout_constraintTop_toTopOf="@+id/iv_app_icon"
-        app:layout_constraintBottom_toBottomOf="@id/iv_app_icon"/>
+        app:layout_constraintStart_toEndOf="@id/app_icon"
+        app:layout_constraintTop_toTopOf="@+id/app_icon"
+        app:layout_constraintBottom_toBottomOf="@id/app_icon"/>
 
     <TextView
-        android:id="@+id/tv_repo_location"
+        android:id="@+id/repo_location"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
@@ -40,11 +40,11 @@
         android:textStyle="bold"
         android:textColor="@color/color_control_normal"
         android:textAppearance="@style/TextAppearance.AppCompat.Display1"
-        app:layout_constraintStart_toStartOf="@id/iv_app_icon"
-        app:layout_constraintTop_toBottomOf="@id/iv_app_icon" />
+        app:layout_constraintStart_toStartOf="@id/app_icon"
+        app:layout_constraintTop_toBottomOf="@id/app_icon" />
 
     <TextView
-        android:id="@+id/tv_repo_location_text"
+        android:id="@+id/repo_location_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
@@ -53,12 +53,12 @@
         android:textStyle="bold"
         android:textColor="@color/color_control_normal"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintStart_toStartOf="@id/tv_repo_location"
+        app:layout_constraintStart_toStartOf="@id/repo_location"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_repo_location" />
+        app:layout_constraintTop_toBottomOf="@id/repo_location" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_hidden"
+        android:id="@+id/hidden"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -67,11 +67,11 @@
         android:minWidth="100dp"
         android:text="@string/location_hidden"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/btn_sdcard"
+        app:layout_constraintBottom_toTopOf="@id/sdcard"
         app:layout_constraintStart_toStartOf="parent" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_sdcard"
+        android:id="@+id/sdcard"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="128dp"
@@ -79,7 +79,7 @@
         android:maxWidth="300dp"
         android:text="@string/location_sdcard"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/btn_hidden"
-        app:layout_constraintEnd_toEndOf="@id/btn_hidden" />
+        app:layout_constraintStart_toStartOf="@id/hidden"
+        app:layout_constraintEnd_toEndOf="@id/hidden" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
index c18eabc6c..2424cea2e 100644
--- a/app/src/main/res/layout/fragment_welcome.xml
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -7,7 +7,7 @@
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_app_icon"
+        android:id="@+id/app_icon"
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:src="@mipmap/ic_launcher"
@@ -19,7 +19,7 @@
         app:layout_constraintEnd_toEndOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_app_name"
+        android:id="@+id/app_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
@@ -29,13 +29,13 @@
         android:textColor="@color/color_control_normal"
         android:textStyle="bold"
         android:transitionName="transition_first_run_app_name"
-        app:layout_constraintTop_toBottomOf="@+id/iv_app_icon"
+        app:layout_constraintTop_toBottomOf="@+id/app_icon"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_go"
+        android:id="@+id/lets_go"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -44,7 +44,7 @@
         android:maxWidth="300dp"
         android:text="@string/let_s_go"
         android:layout_marginTop="48dp"
-        app:layout_constraintTop_toBottomOf="@id/tv_app_name"
+        app:layout_constraintTop_toBottomOf="@id/app_name"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />