diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/imagelayer.js
similarity index 100%
rename from src/ol/renderer/canvas/canvasimagelayerrenderer.js
rename to src/ol/renderer/canvas/imagelayer.js
diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/layer.js
similarity index 100%
rename from src/ol/renderer/canvas/canvaslayerrenderer.js
rename to src/ol/renderer/canvas/layer.js
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/map.js
similarity index 100%
rename from src/ol/renderer/canvas/canvasmaprenderer.js
rename to src/ol/renderer/canvas/map.js
diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/tilelayer.js
similarity index 100%
rename from src/ol/renderer/canvas/canvastilelayerrenderer.js
rename to src/ol/renderer/canvas/tilelayer.js
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/vectorlayer.js
similarity index 100%
rename from src/ol/renderer/canvas/canvasvectorlayerrenderer.js
rename to src/ol/renderer/canvas/vectorlayer.js
diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/vectortilelayer.js
similarity index 100%
rename from src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
rename to src/ol/renderer/canvas/vectortilelayer.js
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/imagelayer.js
similarity index 100%
rename from src/ol/renderer/dom/domimagelayerrenderer.js
rename to src/ol/renderer/dom/imagelayer.js
diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/layer.js
similarity index 100%
rename from src/ol/renderer/dom/domlayerrenderer.js
rename to src/ol/renderer/dom/layer.js
diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/map.js
similarity index 100%
rename from src/ol/renderer/dom/dommaprenderer.js
rename to src/ol/renderer/dom/map.js
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/tilelayer.js
similarity index 100%
rename from src/ol/renderer/dom/domtilelayerrenderer.js
rename to src/ol/renderer/dom/tilelayer.js
diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/vectorlayer.js
similarity index 100%
rename from src/ol/renderer/dom/domvectorlayerrenderer.js
rename to src/ol/renderer/dom/vectorlayer.js
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layer.js
similarity index 100%
rename from src/ol/renderer/layerrenderer.js
rename to src/ol/renderer/layer.js
diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/map.js
similarity index 100%
rename from src/ol/renderer/maprenderer.js
rename to src/ol/renderer/map.js
diff --git a/src/ol/render/vector.js b/src/ol/renderer/vector.js
similarity index 100%
rename from src/ol/render/vector.js
rename to src/ol/renderer/vector.js
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/imagelayer.js
similarity index 100%
rename from src/ol/renderer/webgl/webglimagelayerrenderer.js
rename to src/ol/renderer/webgl/imagelayer.js
diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/layer.js
similarity index 100%
rename from src/ol/renderer/webgl/webgllayerrenderer.js
rename to src/ol/renderer/webgl/layer.js
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/map.js
similarity index 100%
rename from src/ol/renderer/webgl/webglmaprenderer.js
rename to src/ol/renderer/webgl/map.js
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/tilelayer.js
similarity index 100%
rename from src/ol/renderer/webgl/webgltilelayerrenderer.js
rename to src/ol/renderer/webgl/tilelayer.js
diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/vectorlayer.js
similarity index 100%
rename from src/ol/renderer/webgl/webglvectorlayerrenderer.js
rename to src/ol/renderer/webgl/vectorlayer.js
diff --git a/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js b/test/spec/ol/renderer/canvas/layer.test.js
similarity index 100%
rename from test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js
rename to test/spec/ol/renderer/canvas/layer.test.js
diff --git a/test/spec/ol/renderer/canvas/canvasmaprenderer.test.js b/test/spec/ol/renderer/canvas/map.test.js
similarity index 100%
rename from test/spec/ol/renderer/canvas/canvasmaprenderer.test.js
rename to test/spec/ol/renderer/canvas/map.test.js
diff --git a/test/spec/ol/renderer/canvas/canvasreplay.test.js b/test/spec/ol/renderer/canvas/replay.test.js
similarity index 100%
rename from test/spec/ol/renderer/canvas/canvasreplay.test.js
rename to test/spec/ol/renderer/canvas/replay.test.js
diff --git a/test/spec/ol/renderer/canvas/canvasvectorlayerrenderer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js
similarity index 100%
rename from test/spec/ol/renderer/canvas/canvasvectorlayerrenderer.test.js
rename to test/spec/ol/renderer/canvas/vectorlayer.test.js
diff --git a/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js
similarity index 100%
rename from test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js
rename to test/spec/ol/renderer/canvas/vectortilelayer.test.js
diff --git a/test/spec/ol/renderer/layerrenderer.test.js b/test/spec/ol/renderer/layer.test.js
similarity index 100%
rename from test/spec/ol/renderer/layerrenderer.test.js
rename to test/spec/ol/renderer/layer.test.js
diff --git a/test/spec/ol/renderer/maprenderer.test.js b/test/spec/ol/renderer/map.test.js
similarity index 100%
rename from test/spec/ol/renderer/maprenderer.test.js
rename to test/spec/ol/renderer/map.test.js
diff --git a/test/spec/ol/render/vector.test.js b/test/spec/ol/renderer/vector.test.js
similarity index 100%
rename from test/spec/ol/render/vector.test.js
rename to test/spec/ol/renderer/vector.test.js
diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js
similarity index 100%
rename from test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js
rename to test/spec/ol/renderer/webgl/imagelayer.test.js