diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java
index e5e1ed90..b87ba145 100644
--- a/app/src/main/java/com/termux/app/TermuxActivity.java
+++ b/app/src/main/java/com/termux/app/TermuxActivity.java
@@ -163,7 +163,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.termux_activity);
+        setContentView(R.layout.activity_termux);
 
         View content = findViewById(android.R.id.content);
         content.setOnApplyWindowInsetsListener((v, insets) -> {
diff --git a/app/src/main/java/com/termux/app/activities/SettingsActivity.java b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
index 7111a7b9..b30b1a57 100644
--- a/app/src/main/java/com/termux/app/activities/SettingsActivity.java
+++ b/app/src/main/java/com/termux/app/activities/SettingsActivity.java
@@ -13,7 +13,7 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.settings_activity);
+        setContentView(R.layout.activity_settings);
         if (savedInstanceState == null) {
             getSupportFragmentManager()
                 .beginTransaction()
diff --git a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
index 1216193a..9951b071 100644
--- a/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
+++ b/app/src/main/java/com/termux/app/terminal/TermuxSessionsListViewController.java
@@ -32,7 +32,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
     final StyleSpan italicSpan = new StyleSpan(Typeface.ITALIC);
 
     public TermuxSessionsListViewController(TermuxActivity activity, List<TerminalSession> sessionList) {
-        super(activity.getApplicationContext(), R.layout.terminal_sessions_list_item, sessionList);
+        super(activity.getApplicationContext(), R.layout.item_terminal_sessions_list, sessionList);
         this.mActivity = activity;
     }
 
@@ -43,7 +43,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
         View sessionRowView = convertView;
         if (sessionRowView == null) {
             LayoutInflater inflater = mActivity.getLayoutInflater();
-            sessionRowView = inflater.inflate(R.layout.terminal_sessions_list_item, parent, false);
+            sessionRowView = inflater.inflate(R.layout.item_terminal_sessions_list, parent, false);
         }
 
         TextView sessionTitleView = sessionRowView.findViewById(R.id.session_title);
@@ -58,7 +58,7 @@ public class TermuxSessionsListViewController extends ArrayAdapter<TerminalSessi
 
         if (isUsingBlackUI) {
             sessionTitleView.setBackground(
-                ContextCompat.getDrawable(mActivity, R.drawable.selected_session_background_black)
+                ContextCompat.getDrawable(mActivity, R.drawable.session_background_black_selected)
             );
         }
 
diff --git a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
index e53fbbcd..1e23220d 100644
--- a/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
+++ b/app/src/main/java/com/termux/app/terminal/io/TerminalToolbarViewPager.java
@@ -42,7 +42,7 @@ public class TerminalToolbarViewPager {
             LayoutInflater inflater = LayoutInflater.from(mActivity);
             View layout;
             if (position == 0) {
-                layout = inflater.inflate(R.layout.terminal_toolbar_extra_keys_view, collection, false);
+                layout = inflater.inflate(R.layout.view_terminal_toolbar_extra_keys, collection, false);
                 ExtraKeysView extraKeysView = (ExtraKeysView) layout;
                 mActivity.setExtraKeysView(extraKeysView);
                 extraKeysView.reload(mActivity.getProperties().getExtraKeysInfo());
@@ -53,7 +53,7 @@ public class TerminalToolbarViewPager {
                 }
 
             } else {
-                layout = inflater.inflate(R.layout.terminal_toolbar_text_input_view, collection, false);
+                layout = inflater.inflate(R.layout.view_terminal_toolbar_text_input, collection, false);
                 final EditText editText = layout.findViewById(R.id.terminal_toolbar_text_input);
 
                 if(mSavedTextInput != null) {
diff --git a/app/src/main/res/drawable/selected_session_background_black.xml b/app/src/main/res/drawable/session_background_black_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/selected_session_background_black.xml
rename to app/src/main/res/drawable/session_background_black_selected.xml
diff --git a/app/src/main/res/drawable/selected_session_background.xml b/app/src/main/res/drawable/session_background_selected.xml
similarity index 100%
rename from app/src/main/res/drawable/selected_session_background.xml
rename to app/src/main/res/drawable/session_background_selected.xml
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index b442a324..43fff035 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical">
 
     <include
-        layout="@layout/toolbar_layout"
+        layout="@layout/partial_toolbar"
         android:id="@+id/toolbar_layout"/>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/activity_settings.xml
similarity index 100%
rename from app/src/main/res/layout/settings_activity.xml
rename to app/src/main/res/layout/activity_settings.xml
diff --git a/app/src/main/res/layout/termux_activity.xml b/app/src/main/res/layout/activity_termux.xml
similarity index 100%
rename from app/src/main/res/layout/termux_activity.xml
rename to app/src/main/res/layout/activity_termux.xml
diff --git a/app/src/main/res/layout/terminal_sessions_list_item.xml b/app/src/main/res/layout/item_terminal_sessions_list.xml
similarity index 84%
rename from app/src/main/res/layout/terminal_sessions_list_item.xml
rename to app/src/main/res/layout/item_terminal_sessions_list.xml
index 61842a37..cbeb5b45 100644
--- a/app/src/main/res/layout/terminal_sessions_list_item.xml
+++ b/app/src/main/res/layout/item_terminal_sessions_list.xml
@@ -2,7 +2,7 @@
     android:id="@+id/session_title"
     android:layout_width="fill_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
-    android:background="@drawable/selected_session_background"
+    android:background="@drawable/session_background_selected"
     android:ellipsize="marquee"
     android:gravity="start|center_vertical"
     android:padding="6dip"
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/partial_toolbar.xml
similarity index 100%
rename from app/src/main/res/layout/toolbar_layout.xml
rename to app/src/main/res/layout/partial_toolbar.xml
diff --git a/app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml b/app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
similarity index 100%
rename from app/src/main/res/layout/terminal_toolbar_extra_keys_view.xml
rename to app/src/main/res/layout/view_terminal_toolbar_extra_keys.xml
diff --git a/app/src/main/res/layout/terminal_toolbar_text_input_view.xml b/app/src/main/res/layout/view_terminal_toolbar_text_input.xml
similarity index 100%
rename from app/src/main/res/layout/terminal_toolbar_text_input_view.xml
rename to app/src/main/res/layout/view_terminal_toolbar_text_input.xml