diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/PassSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/PassSettingsController.java
index d232b07b..6e953bd3 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/PassSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/PassSettingsController.java
@@ -56,7 +56,7 @@ public class PassSettingsController extends Controller implements View.OnClickLi
 
         navigationItem.title = string(R.string.settings_screen_pass);
 
-        view = inflateRes(R.layout.settings_pass);
+        view = inflateRes(R.layout.controller_pass);
         container = (LinearLayout) view.findViewById(R.id.container);
         crossfadeView = (CrossfadeView) view.findViewById(R.id.crossfade);
         errors = (TextView) view.findViewById(R.id.errors);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
index ca430d06..74e485e4 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java
@@ -68,7 +68,7 @@ public class PostRepliesController extends Controller {
     public void onCreate() {
         super.onCreate();
 
-        view = inflateRes(R.layout.post_replies_container);
+        view = inflateRes(R.layout.layout_post_replies_container);
 
         // Clicking outside the popup view
         view.setOnClickListener(new View.OnClickListener() {
@@ -125,9 +125,9 @@ public class PostRepliesController extends Controller {
     private void displayData(final PostPopupHelper.RepliesData data) {
         View dataView;
         if (ChanSettings.repliesButtonsBottom.get()) {
-            dataView = inflateRes(R.layout.post_replies_bottombuttons);
+            dataView = inflateRes(R.layout.layout_post_replies_bottombuttons);
         } else {
-            dataView = inflateRes(R.layout.post_replies);
+            dataView = inflateRes(R.layout.layout_post_replies);
         }
 
         listView = (ListView) dataView.findViewById(R.id.post_list);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java
index 884c6a90..0bfa3d83 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/ThemeSettingsController.java
@@ -120,7 +120,7 @@ public class ThemeSettingsController extends Controller implements View.OnClickL
         super.onCreate();
 
         navigationItem.setTitle(R.string.settings_screen_theme);
-        view = inflateRes(R.layout.settings_theme);
+        view = inflateRes(R.layout.controller_theme);
 
         themeHelper = ThemeHelper.getInstance();
 
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java
index 3398f629..c0f6de8b 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java
@@ -53,7 +53,7 @@ public class WatchSettingsController extends SettingsController implements Compo
 
         navigationItem.title = string(R.string.settings_screen_watch);
 
-        view = inflateRes(R.layout.settings_watch);
+        view = inflateRes(R.layout.controller_watch);
         content = (LinearLayout) view.findViewById(R.id.scrollview_content);
         crossfadeView = (CrossfadeView) view.findViewById(R.id.crossfade);
 
diff --git a/Clover/app/src/main/res/layout/settings_pass.xml b/Clover/app/src/main/res/layout/controller_pass.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/settings_pass.xml
rename to Clover/app/src/main/res/layout/controller_pass.xml
diff --git a/Clover/app/src/main/res/layout/settings_theme.xml b/Clover/app/src/main/res/layout/controller_theme.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/settings_theme.xml
rename to Clover/app/src/main/res/layout/controller_theme.xml
diff --git a/Clover/app/src/main/res/layout/settings_watch.xml b/Clover/app/src/main/res/layout/controller_watch.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/settings_watch.xml
rename to Clover/app/src/main/res/layout/controller_watch.xml
diff --git a/Clover/app/src/main/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/layout_post_replies.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/post_replies.xml
rename to Clover/app/src/main/res/layout/layout_post_replies.xml
diff --git a/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml b/Clover/app/src/main/res/layout/layout_post_replies_bottombuttons.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/post_replies_bottombuttons.xml
rename to Clover/app/src/main/res/layout/layout_post_replies_bottombuttons.xml
diff --git a/Clover/app/src/main/res/layout/post_replies_container.xml b/Clover/app/src/main/res/layout/layout_post_replies_container.xml
similarity index 100%
rename from Clover/app/src/main/res/layout/post_replies_container.xml
rename to Clover/app/src/main/res/layout/layout_post_replies_container.xml