diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/base.js
similarity index 100%
rename from src/ol/layer/layerbase.js
rename to src/ol/layer/base.js
diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/group.js
similarity index 100%
rename from src/ol/layer/layergroup.js
rename to src/ol/layer/group.js
diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmap.js
similarity index 100%
rename from src/ol/layer/heatmaplayer.js
rename to src/ol/layer/heatmap.js
diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/image.js
similarity index 100%
rename from src/ol/layer/imagelayer.js
rename to src/ol/layer/image.js
diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tile.js
similarity index 100%
rename from src/ol/layer/tilelayer.js
rename to src/ol/layer/tile.js
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vector.js
similarity index 100%
rename from src/ol/layer/vectorlayer.js
rename to src/ol/layer/vector.js
diff --git a/src/ol/layer/vectortilelayer.js b/src/ol/layer/vectortile.js
similarity index 100%
rename from src/ol/layer/vectortilelayer.js
rename to src/ol/layer/vectortile.js
diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/group.test.js
similarity index 99%
rename from test/spec/ol/layer/layergroup.test.js
rename to test/spec/ol/layer/group.test.js
index 9c568e9e16..6fec9270d8 100644
--- a/test/spec/ol/layer/layergroup.test.js
+++ b/test/spec/ol/layer/group.test.js
@@ -1,4 +1,4 @@
-goog.provide('ol.test.layer.LayerGroup');
+goog.provide('ol.test.layer.Group');
 
 describe('ol.layer.Group', function() {
 
diff --git a/test/spec/ol/layer/heatmaplayer.test.js b/test/spec/ol/layer/heatmap.test.js
similarity index 100%
rename from test/spec/ol/layer/heatmaplayer.test.js
rename to test/spec/ol/layer/heatmap.test.js
diff --git a/test/spec/ol/layer/tilelayer.test.js b/test/spec/ol/layer/tile.test.js
similarity index 100%
rename from test/spec/ol/layer/tilelayer.test.js
rename to test/spec/ol/layer/tile.test.js
diff --git a/test/spec/ol/layer/vectorlayer.test.js b/test/spec/ol/layer/vector.test.js
similarity index 100%
rename from test/spec/ol/layer/vectorlayer.test.js
rename to test/spec/ol/layer/vector.test.js
diff --git a/test/spec/ol/layer/vectortilelayer.test.js b/test/spec/ol/layer/vectortile.test.js
similarity index 100%
rename from test/spec/ol/layer/vectortilelayer.test.js
rename to test/spec/ol/layer/vectortile.test.js