diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/immediate.js
similarity index 100%
rename from src/ol/render/canvas/canvasimmediate.js
rename to src/ol/render/canvas/immediate.js
diff --git a/src/ol/render/canvas/canvas.js b/src/ol/render/canvas/index.js
similarity index 100%
rename from src/ol/render/canvas/canvas.js
rename to src/ol/render/canvas/index.js
diff --git a/src/ol/render/canvas/canvas.jsdoc b/src/ol/render/canvas/index.jsdoc
similarity index 100%
rename from src/ol/render/canvas/canvas.jsdoc
rename to src/ol/render/canvas/index.jsdoc
diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/replay.js
similarity index 100%
rename from src/ol/render/canvas/canvasreplay.js
rename to src/ol/render/canvas/replay.js
diff --git a/src/ol/render/renderevent.js b/src/ol/render/event.js
similarity index 100%
rename from src/ol/render/renderevent.js
rename to src/ol/render/event.js
diff --git a/src/ol/render/renderfeature.js b/src/ol/render/feature.js
similarity index 100%
rename from src/ol/render/renderfeature.js
rename to src/ol/render/feature.js
diff --git a/src/ol/render/ireplay.js b/src/ol/render/ireplaygroup.js
similarity index 100%
rename from src/ol/render/ireplay.js
rename to src/ol/render/ireplaygroup.js
diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/imagereplay.js
similarity index 100%
rename from src/ol/render/webgl/webglreplay.js
rename to src/ol/render/webgl/imagereplay.js
diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/immediate.js
similarity index 100%
rename from src/ol/render/webgl/webglimmediate.js
rename to src/ol/render/webgl/immediate.js
diff --git a/test/spec/ol/render/canvasimmediate.test.js b/test/spec/ol/render/canvas/immediate.test.js
similarity index 100%
rename from test/spec/ol/render/canvasimmediate.test.js
rename to test/spec/ol/render/canvas/immediate.test.js
diff --git a/test/spec/ol/render/canvas.test.js b/test/spec/ol/render/canvas/index.test.js
similarity index 100%
rename from test/spec/ol/render/canvas.test.js
rename to test/spec/ol/render/canvas/index.test.js
diff --git a/test/spec/ol/render/renderfeature.test.js b/test/spec/ol/render/feature.test.js
similarity index 100%
rename from test/spec/ol/render/renderfeature.test.js
rename to test/spec/ol/render/feature.test.js
diff --git a/test/spec/ol/render/webglreplay.test.js b/test/spec/ol/render/webgl/replay.test.js
similarity index 100%
rename from test/spec/ol/render/webglreplay.test.js
rename to test/spec/ol/render/webgl/replay.test.js