diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
index 7f5f477058..e2c9af4486 100644
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -67,7 +67,7 @@ ol.renderer.canvas.ImageLayer.prototype.getTransform = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.canvas.ImageLayer.prototype.renderFrame =
+ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   var view2DState = frameState.view2DState;
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 3b73d6957f..a032bf0245 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -120,7 +120,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
         viewResolution < layerState.minResolution) {
       continue;
     }
-    layerRenderer.renderFrame(frameState, layerState);
+    layerRenderer.prepareFrame(frameState, layerState);
 
     image = layerRenderer.getImage();
     if (!goog.isNull(image)) {
diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index 52d0c14213..a0ecf7ff55 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -105,7 +105,7 @@ ol.renderer.canvas.TileLayer.prototype.getTransform = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.canvas.TileLayer.prototype.renderFrame =
+ol.renderer.canvas.TileLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   //
@@ -137,12 +137,12 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
   //   or (3) the canvas tile range doesn't contain the required tile
   //   range. This canvas tile range invalidation thing is related to
   //   an optimization where we attempt to redraw as few pixels as
-  //   possible on each renderFrame call.
+  //   possible on each prepareFrame call.
   //
   // - If the canvas tile range has been invalidated we reset
   //   renderedCanvasTileRange_ and reset the renderedTiles_ array.
   //   The renderedTiles_ array is the structure used to determine
-  //   the canvas pixels that need not be redrawn from one renderFrame
+  //   the canvas pixels that need not be redrawn from one prepareFrame
   //   call to another. It records while tile has been rendered at
   //   which position in the canvas.
   //
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 5e39824950..33285bc7c4 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -340,7 +340,7 @@ ol.renderer.canvas.VectorLayer.prototype.handleLayerChange_ = function(event) {
 /**
  * @inheritDoc
  */
-ol.renderer.canvas.VectorLayer.prototype.renderFrame =
+ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   // TODO: consider bailing out here if rendered center and resolution
@@ -378,8 +378,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
   }
 
   if (goog.isNull(tileGrid)) {
-    // We should only get here when the first call to renderFrame happens during
-    // an animation. Try again in the next renderFrame call.
+    // We should only get here when the first call to prepareFrame happens
+    // during an animation. Try again in the next prepareFrame call.
     return;
   }
 
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js
index 8c8a3fa7c9..c215890ff2 100644
--- a/src/ol/renderer/dom/domimagelayerrenderer.js
+++ b/src/ol/renderer/dom/domimagelayerrenderer.js
@@ -55,7 +55,7 @@ ol.renderer.dom.ImageLayer.prototype.getImageLayer = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.dom.ImageLayer.prototype.renderFrame =
+ol.renderer.dom.ImageLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   var view2DState = frameState.view2DState;
diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js
index f05b9326de..c2322229dd 100644
--- a/src/ol/renderer/dom/dommaprenderer.js
+++ b/src/ol/renderer/dom/dommaprenderer.js
@@ -86,7 +86,7 @@ ol.renderer.dom.Map.prototype.renderFrame = function(frameState) {
     layerRenderer = this.getLayerRenderer(layer);
     layerState = frameState.layerStates[goog.getUid(layer)];
     if (layerState.sourceState == ol.source.State.READY) {
-      layerRenderer.renderFrame(frameState, layerState);
+      layerRenderer.prepareFrame(frameState, layerState);
     }
   }
 
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index 68733fbc16..bb37352bd8 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -77,7 +77,7 @@ ol.renderer.dom.TileLayer.prototype.getTileLayer = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.dom.TileLayer.prototype.renderFrame =
+ol.renderer.dom.TileLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   if (!layerState.visible) {
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index 36bf1863ea..6da52f6bfa 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -106,7 +106,7 @@ ol.renderer.Layer.prototype.handleImageChange = function(event) {
  * @param {ol.FrameState} frameState Frame state.
  * @param {ol.layer.LayerState} layerState Layer state.
  */
-ol.renderer.Layer.prototype.renderFrame = goog.abstractMethod;
+ol.renderer.Layer.prototype.prepareFrame = goog.abstractMethod;
 
 
 /**
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js
index 0249e1c336..01f7151f5e 100644
--- a/src/ol/renderer/webgl/webglimagelayerrenderer.js
+++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js
@@ -83,7 +83,7 @@ ol.renderer.webgl.ImageLayer.prototype.getImageLayer = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.ImageLayer.prototype.renderFrame =
+ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   var gl = this.getWebGLMapRenderer().getGL();
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index 87dd4f886f..19d975f852 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -406,7 +406,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
         layerState.sourceState == ol.source.State.READY &&
         viewResolution < layerState.maxResolution &&
         viewResolution >= layerState.minResolution) {
-      layerRenderer.renderFrame(frameState, layerState);
+      layerRenderer.prepareFrame(frameState, layerState);
     }
   }
 
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index cf73e018b8..0f252d7fbb 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -114,7 +114,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() {
 /**
  * @inheritDoc
  */
-ol.renderer.webgl.TileLayer.prototype.renderFrame =
+ol.renderer.webgl.TileLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   var mapRenderer = this.getWebGLMapRenderer();