diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2310cd4ea..272855071 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layoutManager="android.support.v7.widget.GridLayoutManager"
-            app:spanCount="@integer/columns"/>
+            app:spanCount="@integer/directory_columns"/>
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_album_picker.xml b/app/src/main/res/layout/dialog_album_picker.xml
index 419ee1c42..079c72fa4 100644
--- a/app/src/main/res/layout/dialog_album_picker.xml
+++ b/app/src/main/res/layout/dialog_album_picker.xml
@@ -6,4 +6,4 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layoutManager="android.support.v7.widget.GridLayoutManager"
-    app:spanCount="@integer/columns"/>
+    app:spanCount="@integer/directory_columns"/>
diff --git a/app/src/main/res/values-w480dp/integers.xml b/app/src/main/res/values-w480dp/integers.xml
index 317b8ad6e..d3281dba5 100644
--- a/app/src/main/res/values-w480dp/integers.xml
+++ b/app/src/main/res/values-w480dp/integers.xml
@@ -1,3 +1,3 @@
 <resources>
-    <integer name="columns">3</integer>
+    <integer name="directory_columns">3</integer>
 </resources>
diff --git a/app/src/main/res/values-w600dp/integers.xml b/app/src/main/res/values-w600dp/integers.xml
index 64ff1f622..d7fae348a 100644
--- a/app/src/main/res/values-w600dp/integers.xml
+++ b/app/src/main/res/values-w600dp/integers.xml
@@ -1,3 +1,3 @@
 <resources>
-    <integer name="columns">4</integer>
+    <integer name="directory_columns">4</integer>
 </resources>
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
index c1976443b..a39cb3fa1 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -1,3 +1,3 @@
 <resources>
-    <integer name="columns">2</integer>
+    <integer name="directory_columns">2</integer>
 </resources>