diff --git a/src/ol/control/attribution.js b/src/ol/control/attributioncontrol.js
similarity index 100%
rename from src/ol/control/attribution.js
rename to src/ol/control/attributioncontrol.js
diff --git a/src/ol/control/dragbox.js b/src/ol/control/dragboxcontrol.js
similarity index 100%
rename from src/ol/control/dragbox.js
rename to src/ol/control/dragboxcontrol.js
diff --git a/src/ol/control/mouseposition.js b/src/ol/control/mousepositioncontrol.js
similarity index 100%
rename from src/ol/control/mouseposition.js
rename to src/ol/control/mousepositioncontrol.js
diff --git a/src/ol/control/zoom.js b/src/ol/control/zoomcontrol.js
similarity index 100%
rename from src/ol/control/zoom.js
rename to src/ol/control/zoomcontrol.js
diff --git a/src/ol/interaction/dblclickzoom.js b/src/ol/interaction/dblclickzoominteraction.js
similarity index 100%
rename from src/ol/interaction/dblclickzoom.js
rename to src/ol/interaction/dblclickzoominteraction.js
diff --git a/src/ol/interaction/drag.js b/src/ol/interaction/draginteraction.js
similarity index 100%
rename from src/ol/interaction/drag.js
rename to src/ol/interaction/draginteraction.js
diff --git a/src/ol/interaction/dragpan.js b/src/ol/interaction/dragpaninteraction.js
similarity index 100%
rename from src/ol/interaction/dragpan.js
rename to src/ol/interaction/dragpaninteraction.js
diff --git a/src/ol/interaction/dragrotateandzoom.js b/src/ol/interaction/dragrotateandzoominteraction.js
similarity index 100%
rename from src/ol/interaction/dragrotateandzoom.js
rename to src/ol/interaction/dragrotateandzoominteraction.js
diff --git a/src/ol/interaction/dragrotate.js b/src/ol/interaction/dragrotateinteraction.js
similarity index 100%
rename from src/ol/interaction/dragrotate.js
rename to src/ol/interaction/dragrotateinteraction.js
diff --git a/src/ol/interaction/dragzoom.js b/src/ol/interaction/dragzoominteraction.js
similarity index 100%
rename from src/ol/interaction/dragzoom.js
rename to src/ol/interaction/dragzoominteraction.js
diff --git a/src/ol/interaction/keyboard.js b/src/ol/interaction/keyboardinteraction.js
similarity index 100%
rename from src/ol/interaction/keyboard.js
rename to src/ol/interaction/keyboardinteraction.js
diff --git a/src/ol/interaction/keyboardpan.js b/src/ol/interaction/keyboardpaninteraction.js
similarity index 100%
rename from src/ol/interaction/keyboardpan.js
rename to src/ol/interaction/keyboardpaninteraction.js
diff --git a/src/ol/interaction/keyboardzoom.js b/src/ol/interaction/keyboardzoominteraction.js
similarity index 100%
rename from src/ol/interaction/keyboardzoom.js
rename to src/ol/interaction/keyboardzoominteraction.js
diff --git a/src/ol/interaction/mousewheelzoom.js b/src/ol/interaction/mousewheelzoominteraction.js
similarity index 100%
rename from src/ol/interaction/mousewheelzoom.js
rename to src/ol/interaction/mousewheelzoominteraction.js
diff --git a/src/ol/renderer/dom/layer.js b/src/ol/renderer/dom/domlayerrenderer.js
similarity index 100%
rename from src/ol/renderer/dom/layer.js
rename to src/ol/renderer/dom/domlayerrenderer.js
diff --git a/src/ol/renderer/dom/map.js b/src/ol/renderer/dom/dommaprenderer.js
similarity index 100%
rename from src/ol/renderer/dom/map.js
rename to src/ol/renderer/dom/dommaprenderer.js
diff --git a/src/ol/renderer/dom/dom.js b/src/ol/renderer/dom/domrenderer.js
similarity index 100%
rename from src/ol/renderer/dom/dom.js
rename to src/ol/renderer/dom/domrenderer.js
diff --git a/src/ol/renderer/dom/tilelayer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
similarity index 100%
rename from src/ol/renderer/dom/tilelayer.js
rename to src/ol/renderer/dom/domtilelayerrenderer.js
diff --git a/src/ol/renderer/layer.js b/src/ol/renderer/layerrenderer.js
similarity index 100%
rename from src/ol/renderer/layer.js
rename to src/ol/renderer/layerrenderer.js
diff --git a/src/ol/renderer/map.js b/src/ol/renderer/maprenderer.js
similarity index 100%
rename from src/ol/renderer/map.js
rename to src/ol/renderer/maprenderer.js
diff --git a/src/ol/renderer/webgl/layer.js b/src/ol/renderer/webgl/webgllayerrenderer.js
similarity index 100%
rename from src/ol/renderer/webgl/layer.js
rename to src/ol/renderer/webgl/webgllayerrenderer.js
diff --git a/src/ol/renderer/webgl/map.js b/src/ol/renderer/webgl/webglmaprenderer.js
similarity index 100%
rename from src/ol/renderer/webgl/map.js
rename to src/ol/renderer/webgl/webglmaprenderer.js
diff --git a/src/ol/renderer/webgl/webgl.js b/src/ol/renderer/webgl/webglrenderer.js
similarity index 100%
rename from src/ol/renderer/webgl/webgl.js
rename to src/ol/renderer/webgl/webglrenderer.js
diff --git a/src/ol/renderer/webgl/tilelayer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
similarity index 100%
rename from src/ol/renderer/webgl/tilelayer.js
rename to src/ol/renderer/webgl/webgltilelayerrenderer.js
diff --git a/src/ol/source/bingmaps.js b/src/ol/source/bingmapssource.js
similarity index 100%
rename from src/ol/source/bingmaps.js
rename to src/ol/source/bingmapssource.js
diff --git a/src/ol/source/mapquest.js b/src/ol/source/mapquestsource.js
similarity index 100%
rename from src/ol/source/mapquest.js
rename to src/ol/source/mapquestsource.js
diff --git a/src/ol/source/openstreetmap.js b/src/ol/source/openstreetmapsource.js
similarity index 100%
rename from src/ol/source/openstreetmap.js
rename to src/ol/source/openstreetmapsource.js
diff --git a/src/ol/source/stamen.js b/src/ol/source/stamensource.js
similarity index 100%
rename from src/ol/source/stamen.js
rename to src/ol/source/stamensource.js
diff --git a/src/ol/source/tilejson.js b/src/ol/source/tilejsonsource.js
similarity index 100%
rename from src/ol/source/tilejson.js
rename to src/ol/source/tilejsonsource.js
diff --git a/src/ol/source/xyz.js b/src/ol/source/xyzsource.js
similarity index 100%
rename from src/ol/source/xyz.js
rename to src/ol/source/xyzsource.js
diff --git a/src/ol/tilegrid/xyz.js b/src/ol/tilegrid/xyztilegrid.js
similarity index 100%
rename from src/ol/tilegrid/xyz.js
rename to src/ol/tilegrid/xyztilegrid.js