diff --git a/platform/android/core-files.txt b/platform/android/core-files.txt
index 573627636..4005aba1e 100644
--- a/platform/android/core-files.txt
+++ b/platform/android/core-files.txt
@@ -95,8 +95,8 @@ platform/android/src/style/layers/hillshade_layer.cpp
 platform/android/src/style/layers/hillshade_layer.hpp
 platform/android/src/style/layers/layer.cpp
 platform/android/src/style/layers/layer.hpp
-platform/android/src/style/layers/layers.cpp
-platform/android/src/style/layers/layers.hpp
+platform/android/src/style/layers/layer_manager.cpp
+platform/android/src/style/layers/layer_manager.hpp
 platform/android/src/style/layers/line_layer.cpp
 platform/android/src/style/layers/line_layer.hpp
 platform/android/src/style/layers/raster_layer.cpp
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp
index 4e9cc2af0..8c1e45f7d 100755
--- a/platform/android/src/jni.cpp
+++ b/platform/android/src/jni.cpp
@@ -43,7 +43,7 @@
 #include "offline/offline_region_error.hpp"
 #include "offline/offline_region_status.hpp"
 #include "style/transition_options.hpp"
-#include "style/layers/layers.hpp"
+#include "style/layers/layer_manager.hpp"
 #include "style/sources/source.hpp"
 #include "style/light.hpp"
 #include "snapshotter/map_snapshotter.hpp"
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 08f1efa46..704331d8e 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -18,7 +18,7 @@
 #include "geojson/geometry.hpp"
 #include "geometry/lat_lng.hpp"
 #include "geometry/projected_meters.hpp"
-#include "style/layers/layers.hpp"
+#include "style/layers/layer_manager.hpp"
 #include "style/sources/source.hpp"
 #include "geometry/lat_lng_bounds.hpp"
 #include "map/camera_position.hpp"
diff --git a/platform/android/src/style/layers/layers.cpp b/platform/android/src/style/layers/layer_manager.cpp
similarity index 99%
rename from platform/android/src/style/layers/layers.cpp
rename to platform/android/src/style/layers/layer_manager.cpp
index 30421d31d..ed553bc8e 100644
--- a/platform/android/src/style/layers/layers.cpp
+++ b/platform/android/src/style/layers/layer_manager.cpp
@@ -1,4 +1,4 @@
-#include "layers.hpp"
+#include "layer_manager.hpp"
 
 #include <mbgl/style/layer.hpp>
 #include <mbgl/style/layer_impl.hpp>
diff --git a/platform/android/src/style/layers/layers.hpp b/platform/android/src/style/layers/layer_manager.hpp
similarity index 100%
rename from platform/android/src/style/layers/layers.hpp
rename to platform/android/src/style/layers/layer_manager.hpp