diff --git a/examples/geolocation-orientation.js b/examples/geolocation-orientation.js
index 093c4e08a8..28022f05a5 100644
--- a/examples/geolocation-orientation.js
+++ b/examples/geolocation-orientation.js
@@ -134,7 +134,7 @@ map.beforeRender(function(map, frameState) {
     previousM = m;
     // interpolate position along positions LineString
     var c = positions.getCoordinateAtM(m, true);
-    var view = frameState.view2DState;
+    var view = frameState.viewState;
     if (c) {
       view.center = getCenterWithHeading(c, -c[2], view.resolution);
       view.rotation = -c[2];
diff --git a/externs/olx.js b/externs/olx.js
index 94445fa18d..e011aa4bfd 100644
--- a/externs/olx.js
+++ b/externs/olx.js
@@ -5089,7 +5089,7 @@ olx.View2D.fitGeometryOptions.prototype.minResolution;
  *     tileQueue: ol.TileQueue,
  *     time: number,
  *     usedTiles: Object.<string, Object.<string, ol.TileRange>>,
- *     view2DState: olx.View2DState,
+ *     viewState: olx.ViewState,
  *     viewHints: Array.<number>,
  *     wantedTiles: Object.<string, Object.<string, boolean>>}}
  * @todo api
@@ -5105,8 +5105,8 @@ olx.FrameState.prototype.pixelRatio;
 olx.FrameState.prototype.time;
 
 
-/** @type {olx.View2DState} */
-olx.FrameState.prototype.view2DState;
+/** @type {olx.ViewState} */
+olx.FrameState.prototype.viewState;
 
 
 /**
@@ -5116,16 +5116,16 @@ olx.FrameState.prototype.view2DState;
  *     rotation: number}}
  * @todo api
  */
-olx.View2DState;
+olx.ViewState;
 
 
 /** @type {ol.Coordinate} */
-olx.View2DState.prototype.center;
+olx.ViewState.prototype.center;
 
 
 /** @type {number} */
-olx.View2DState.prototype.resolution;
+olx.ViewState.prototype.resolution;
 
 
 /** @type {number} */
-olx.View2DState.prototype.rotation;
+olx.ViewState.prototype.rotation;
diff --git a/src/ol/animation.js b/src/ol/animation.js
index eb0a6ef3aa..35fc212fdc 100644
--- a/src/ol/animation.js
+++ b/src/ol/animation.js
@@ -29,9 +29,9 @@ ol.animation.bounce = function(options) {
           return true;
         } else if (frameState.time < start + duration) {
           var delta = easing((frameState.time - start) / duration);
-          var deltaResolution = resolution - frameState.view2DState.resolution;
+          var deltaResolution = resolution - frameState.viewState.resolution;
           frameState.animate = true;
-          frameState.view2DState.resolution += delta * deltaResolution;
+          frameState.viewState.resolution += delta * deltaResolution;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {
@@ -66,11 +66,11 @@ ol.animation.pan = function(options) {
           return true;
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
-          var deltaX = sourceX - frameState.view2DState.center[0];
-          var deltaY = sourceY - frameState.view2DState.center[1];
+          var deltaX = sourceX - frameState.viewState.center[0];
+          var deltaY = sourceY - frameState.viewState.center[1];
           frameState.animate = true;
-          frameState.view2DState.center[0] += delta * deltaX;
-          frameState.view2DState.center[1] += delta * deltaY;
+          frameState.viewState.center[0] += delta * deltaX;
+          frameState.viewState.center[1] += delta * deltaY;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {
@@ -107,11 +107,11 @@ ol.animation.rotate = function(options) {
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
           var deltaRotation =
-              (sourceRotation - frameState.view2DState.rotation) * delta;
+              (sourceRotation - frameState.viewState.rotation) * delta;
           frameState.animate = true;
-          frameState.view2DState.rotation += deltaRotation;
+          frameState.viewState.rotation += deltaRotation;
           if (!goog.isNull(anchor)) {
-            var center = frameState.view2DState.center;
+            var center = frameState.viewState.center;
             ol.coordinate.sub(center, anchor);
             ol.coordinate.rotate(center, deltaRotation);
             ol.coordinate.add(center, anchor);
@@ -149,9 +149,9 @@ ol.animation.zoom = function(options) {
         } else if (frameState.time < start + duration) {
           var delta = 1 - easing((frameState.time - start) / duration);
           var deltaResolution =
-              sourceResolution - frameState.view2DState.resolution;
+              sourceResolution - frameState.viewState.resolution;
           frameState.animate = true;
-          frameState.view2DState.resolution += delta * deltaResolution;
+          frameState.viewState.resolution += delta * deltaResolution;
           frameState.viewHints[ol.ViewHint.ANIMATING] += 1;
           return true;
         } else {
diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js
index d852adaeaf..3f0bf1c7b9 100644
--- a/src/ol/control/mousepositioncontrol.js
+++ b/src/ol/control/mousepositioncontrol.js
@@ -109,8 +109,8 @@ ol.control.MousePosition.prototype.handleMapPostrender = function(mapEvent) {
   if (goog.isNull(frameState)) {
     this.mapProjection_ = null;
   } else {
-    if (this.mapProjection_ != frameState.view2DState.projection) {
-      this.mapProjection_ = frameState.view2DState.projection;
+    if (this.mapProjection_ != frameState.viewState.projection) {
+      this.mapProjection_ = frameState.viewState.projection;
       this.transform_ = null;
     }
   }
diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotatecontrol.js
index 284e2414eb..53b378c682 100644
--- a/src/ol/control/rotatecontrol.js
+++ b/src/ol/control/rotatecontrol.js
@@ -145,7 +145,7 @@ ol.control.Rotate.prototype.handleMapPostrender = function(mapEvent) {
   if (goog.isNull(frameState)) {
     return;
   }
-  var rotation = frameState.view2DState.rotation;
+  var rotation = frameState.viewState.rotation;
   var transform = 'rotate(' + rotation * 360 / (Math.PI * 2) + 'deg)';
   if (this.autoHide_) {
     this.element.style.opacity = (rotation === 0) ? 0 : 1;
diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js
index b1189aa834..d1af80a7c6 100644
--- a/src/ol/control/scalelinecontrol.js
+++ b/src/ol/control/scalelinecontrol.js
@@ -77,9 +77,9 @@ ol.control.ScaleLine = function(opt_options) {
 
   /**
    * @private
-   * @type {?olx.View2DState}
+   * @type {?olx.ViewState}
    */
-  this.view2DState_ = null;
+  this.viewState_ = null;
 
   /**
    * @private
@@ -156,9 +156,9 @@ goog.exportProperty(
 ol.control.ScaleLine.prototype.handleMapPostrender = function(mapEvent) {
   var frameState = mapEvent.frameState;
   if (goog.isNull(frameState)) {
-    this.view2DState_ = null;
+    this.viewState_ = null;
   } else {
-    this.view2DState_ = frameState.view2DState;
+    this.viewState_ = frameState.viewState;
   }
   this.updateElement_();
 };
@@ -190,9 +190,9 @@ goog.exportProperty(
  * @private
  */
 ol.control.ScaleLine.prototype.updateElement_ = function() {
-  var view2DState = this.view2DState_;
+  var viewState = this.viewState_;
 
-  if (goog.isNull(view2DState)) {
+  if (goog.isNull(viewState)) {
     if (this.renderedVisible_) {
       goog.style.setElementShown(this.element_, false);
       this.renderedVisible_ = false;
@@ -200,10 +200,10 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
     return;
   }
 
-  var center = view2DState.center;
-  var projection = view2DState.projection;
+  var center = viewState.center;
+  var projection = viewState.projection;
   var pointResolution =
-      projection.getPointResolution(view2DState.resolution, center);
+      projection.getPointResolution(viewState.resolution, center);
   var projectionUnits = projection.getUnits();
 
   var cosLatitude;
diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js
index 475adfa7ce..9979568a29 100644
--- a/src/ol/control/zoomslidercontrol.js
+++ b/src/ol/control/zoomslidercontrol.js
@@ -158,11 +158,11 @@ ol.control.ZoomSlider.prototype.handleMapPostrender = function(mapEvent) {
     return;
   }
   goog.asserts.assert(
-      goog.isDefAndNotNull(mapEvent.frameState.view2DState));
+      goog.isDefAndNotNull(mapEvent.frameState.viewState));
   if (!this.sliderInitialized_) {
     this.initSlider_();
   }
-  var res = mapEvent.frameState.view2DState.resolution;
+  var res = mapEvent.frameState.viewState.resolution;
   if (res !== this.currentResolution_) {
     this.currentResolution_ = res;
     this.positionThumbForResolution_(res);
diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js
index b9db01bb52..f0f7e4a76e 100644
--- a/src/ol/featureoverlay.js
+++ b/src/ol/featureoverlay.js
@@ -176,7 +176,7 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) {
   goog.asserts.assert(goog.isDef(replayGroup));
   var frameState = event.frameState;
   var pixelRatio = frameState.pixelRatio;
-  var resolution = frameState.view2DState.resolution;
+  var resolution = frameState.viewState.resolution;
   var i, ii, styles;
   this.features_.forEach(function(feature) {
     styles = styleFunction(feature, resolution);
diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js
index 6bad93754f..e3e53a1014 100644
--- a/src/ol/interaction/dragpaninteraction.js
+++ b/src/ol/interaction/dragpaninteraction.js
@@ -75,11 +75,11 @@ ol.interaction.DragPan.prototype.handlePointerDrag = function(mapBrowserEvent) {
     var deltaY = centroid[1] - this.lastCentroid[1];
     var map = mapBrowserEvent.map;
     var view2D = map.getView();
-    var view2DState = view2D.getState();
+    var viewState = view2D.getState();
     var center = [deltaX, deltaY];
-    ol.coordinate.scale(center, view2DState.resolution);
-    ol.coordinate.rotate(center, view2DState.rotation);
-    ol.coordinate.add(center, view2DState.center);
+    ol.coordinate.scale(center, viewState.resolution);
+    ol.coordinate.rotate(center, viewState.rotation);
+    ol.coordinate.add(center, viewState.center);
     center = view2D.constrainCenter(center);
     map.render();
     view2D.setCenter(center);
@@ -136,7 +136,7 @@ ol.interaction.DragPan.prototype.handlePointerDown =
     map.render();
     if (!goog.isNull(this.kineticPreRenderFn_) &&
         map.removePreRenderFunction(this.kineticPreRenderFn_)) {
-      view2D.setCenter(mapBrowserEvent.frameState.view2DState.center);
+      view2D.setCenter(mapBrowserEvent.frameState.viewState.center);
       this.kineticPreRenderFn_ = null;
     }
     if (this.kinetic_) {
diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js
index a0556e425d..b63dfcd249 100644
--- a/src/ol/interaction/dragrotateandzoominteraction.js
+++ b/src/ol/interaction/dragrotateandzoominteraction.js
@@ -81,16 +81,16 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerDrag =
   var theta = Math.atan2(delta.y, delta.x);
   var magnitude = delta.magnitude();
   var view = map.getView();
-  var view2DState = view.getState();
+  var viewState = view.getState();
   map.render();
   if (goog.isDef(this.lastAngle_)) {
     var angleDelta = theta - this.lastAngle_;
     ol.interaction.Interaction.rotateWithoutConstraints(
-        map, view, view2DState.rotation - angleDelta);
+        map, view, viewState.rotation - angleDelta);
   }
   this.lastAngle_ = theta;
   if (goog.isDef(this.lastMagnitude_)) {
-    var resolution = this.lastMagnitude_ * (view2DState.resolution / magnitude);
+    var resolution = this.lastMagnitude_ * (viewState.resolution / magnitude);
     ol.interaction.Interaction.zoomWithoutConstraints(map, view, resolution);
   }
   if (goog.isDef(this.lastMagnitude_)) {
@@ -112,10 +112,10 @@ ol.interaction.DragRotateAndZoom.prototype.handlePointerUp =
   var map = mapBrowserEvent.map;
   var view = map.getView();
   view.setHint(ol.ViewHint.INTERACTING, -1);
-  var view2DState = view.getState();
+  var viewState = view.getState();
   var direction = this.lastScaleDelta_ - 1;
-  ol.interaction.Interaction.rotate(map, view, view2DState.rotation);
-  ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
+  ol.interaction.Interaction.rotate(map, view, viewState.rotation);
+  ol.interaction.Interaction.zoom(map, view, viewState.resolution,
       undefined, ol.DRAGROTATEANDZOOM_ANIMATION_DURATION,
       direction);
   this.lastScaleDelta_ = 0;
diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js
index ea6097aaf3..357a7f4fbe 100644
--- a/src/ol/interaction/dragrotateinteraction.js
+++ b/src/ol/interaction/dragrotateinteraction.js
@@ -63,10 +63,10 @@ ol.interaction.DragRotate.prototype.handlePointerDrag =
   if (goog.isDef(this.lastAngle_)) {
     var delta = theta - this.lastAngle_;
     var view = map.getView();
-    var view2DState = view.getState();
+    var viewState = view.getState();
     map.render();
     ol.interaction.Interaction.rotateWithoutConstraints(
-        map, view, view2DState.rotation - delta);
+        map, view, viewState.rotation - delta);
   }
   this.lastAngle_ = theta;
 };
@@ -84,8 +84,8 @@ ol.interaction.DragRotate.prototype.handlePointerUp =
   var map = mapBrowserEvent.map;
   var view = map.getView();
   view.setHint(ol.ViewHint.INTERACTING, -1);
-  var view2DState = view.getState();
-  ol.interaction.Interaction.rotate(map, view, view2DState.rotation,
+  var viewState = view.getState();
+  ol.interaction.Interaction.rotate(map, view, viewState.rotation,
       undefined, ol.DRAGROTATE_ANIMATION_DURATION);
   return false;
 };
diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js
index d09f249c51..e3463ccae0 100644
--- a/src/ol/interaction/keyboardpaninteraction.js
+++ b/src/ol/interaction/keyboardpaninteraction.js
@@ -71,8 +71,8 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
       var map = mapBrowserEvent.map;
       var view = map.getView();
       goog.asserts.assert(goog.isDef(view));
-      var view2DState = view.getState();
-      var mapUnitsDelta = view2DState.resolution * this.pixelDelta_;
+      var viewState = view.getState();
+      var mapUnitsDelta = viewState.resolution * this.pixelDelta_;
       var deltaX = 0, deltaY = 0;
       if (keyCode == goog.events.KeyCodes.DOWN) {
         deltaY = -mapUnitsDelta;
@@ -84,7 +84,7 @@ ol.interaction.KeyboardPan.prototype.handleMapBrowserEvent =
         deltaY = mapUnitsDelta;
       }
       var delta = [deltaX, deltaY];
-      ol.coordinate.rotate(delta, view2DState.rotation);
+      ol.coordinate.rotate(delta, viewState.rotation);
       ol.interaction.Interaction.pan(
           map, view, delta, ol.KEYBOARD_PAN_DURATION);
       mapBrowserEvent.preventDefault();
diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotateinteraction.js
index 373e285841..88dc03d0a4 100644
--- a/src/ol/interaction/pinchrotateinteraction.js
+++ b/src/ol/interaction/pinchrotateinteraction.js
@@ -102,10 +102,10 @@ ol.interaction.PinchRotate.prototype.handlePointerDrag =
   // rotate
   if (this.rotating_) {
     var view = map.getView();
-    var view2DState = view.getState();
+    var viewState = view.getState();
     map.render();
     ol.interaction.Interaction.rotateWithoutConstraints(map, view,
-        view2DState.rotation + rotationDelta, this.anchor_);
+        viewState.rotation + rotationDelta, this.anchor_);
   }
 };
 
@@ -120,9 +120,9 @@ ol.interaction.PinchRotate.prototype.handlePointerUp =
     var view = map.getView();
     view.setHint(ol.ViewHint.INTERACTING, -1);
     if (this.rotating_) {
-      var view2DState = view.getState();
+      var viewState = view.getState();
       ol.interaction.Interaction.rotate(
-          map, view, view2DState.rotation, this.anchor_,
+          map, view, viewState.rotation, this.anchor_,
           ol.ROTATE_ANIMATION_DURATION);
     }
     return false;
diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoominteraction.js
index f3318c1341..5ae963214e 100644
--- a/src/ol/interaction/pinchzoominteraction.js
+++ b/src/ol/interaction/pinchzoominteraction.js
@@ -79,7 +79,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
 
   var map = mapBrowserEvent.map;
   var view = map.getView();
-  var view2DState = view.getState();
+  var viewState = view.getState();
 
   // scale anchor point.
   var viewportPosition = goog.style.getClientPosition(map.getViewport());
@@ -92,7 +92,7 @@ ol.interaction.PinchZoom.prototype.handlePointerDrag =
   // scale, bypass the resolution constraint
   map.render();
   ol.interaction.Interaction.zoomWithoutConstraints(
-      map, view, view2DState.resolution * scaleDelta, this.anchor_);
+      map, view, viewState.resolution * scaleDelta, this.anchor_);
 
 };
 
@@ -106,12 +106,12 @@ ol.interaction.PinchZoom.prototype.handlePointerUp =
     var map = mapBrowserEvent.map;
     var view = map.getView();
     view.setHint(ol.ViewHint.INTERACTING, -1);
-    var view2DState = view.getState();
+    var viewState = view.getState();
     // Zoom to final resolution, with an animation, and provide a
     // direction not to zoom out/in if user was pinching in/out.
     // Direction is > 0 if pinching out, and < 0 if pinching in.
     var direction = this.lastScaleDelta_ - 1;
-    ol.interaction.Interaction.zoom(map, view, view2DState.resolution,
+    ol.interaction.Interaction.zoom(map, view, viewState.resolution,
         this.anchor_, this.duration_, direction);
     return false;
   } else {
diff --git a/src/ol/map.js b/src/ol/map.js
index c1bea1d93d..836f9eb907 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -1164,7 +1164,7 @@ ol.Map.prototype.removeOverlay = function(overlay) {
  */
 ol.Map.prototype.renderFrame_ = function(time) {
 
-  var i, ii, view2DState;
+  var i, ii, viewState;
 
   /**
    * Check whether a size has non-zero width and height.  Note that this
@@ -1192,13 +1192,13 @@ ol.Map.prototype.renderFrame_ = function(time) {
     for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
       layerStates[goog.getUid(layerStatesArray[i].layer)] = layerStatesArray[i];
     }
-    view2DState = view.getState();
+    viewState = view.getState();
     frameState = /** @type {olx.FrameState} */ ({
       animate: false,
       attributions: {},
       coordinateToPixelMatrix: this.coordinateToPixelMatrix_,
       extent: null,
-      focus: goog.isNull(this.focus_) ? view2DState.center : this.focus_,
+      focus: goog.isNull(this.focus_) ? viewState.center : this.focus_,
       index: this.frameIndex_++,
       layerStates: layerStates,
       layerStatesArray: layerStatesArray,
@@ -1211,7 +1211,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
       tileQueue: this.tileQueue_,
       time: time,
       usedTiles: {},
-      view2DState: view2DState,
+      viewState: viewState,
       viewHints: viewHints,
       wantedTiles: {}
     });
@@ -1231,8 +1231,8 @@ ol.Map.prototype.renderFrame_ = function(time) {
   preRenderFunctions.length = n;
 
   if (!goog.isNull(frameState)) {
-    frameState.extent = ol.extent.getForView2DAndSize(view2DState.center,
-        view2DState.resolution, view2DState.rotation, frameState.size);
+    frameState.extent = ol.extent.getForView2DAndSize(viewState.center,
+        viewState.resolution, viewState.rotation, frameState.size);
   }
 
   this.frameState_ = frameState;
diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
index 26da9bb50e..706a64b3eb 100644
--- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js
@@ -50,8 +50,8 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtPixel =
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
   var extent = frameState.extent;
-  var resolution = frameState.view2DState.resolution;
-  var rotation = frameState.view2DState.rotation;
+  var resolution = frameState.viewState.resolution;
+  var rotation = frameState.viewState.rotation;
   var skippedFeatureUids = frameState.skippedFeatureUids_;
   return source.forEachFeatureAtPixel(
       extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -89,10 +89,10 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
   var pixelRatio = frameState.pixelRatio;
-  var view2DState = frameState.view2DState;
-  var viewCenter = view2DState.center;
-  var viewResolution = view2DState.resolution;
-  var viewRotation = view2DState.rotation;
+  var viewState = frameState.viewState;
+  var viewCenter = viewState.center;
+  var viewResolution = viewState.resolution;
+  var viewRotation = viewState.rotation;
 
   var image;
   var imageLayer = this.getLayer();
@@ -104,7 +104,7 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame =
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
     image = imageSource.getImage(
-        frameState.extent, viewResolution, pixelRatio, view2DState.projection);
+        frameState.extent, viewResolution, pixelRatio, viewState.projection);
     if (!goog.isNull(image)) {
       var imageState = image.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js
index 2732f5a1a0..92c59a934a 100644
--- a/src/ol/renderer/canvas/canvaslayerrenderer.js
+++ b/src/ol/renderer/canvas/canvaslayerrenderer.js
@@ -49,7 +49,7 @@ ol.renderer.canvas.Layer.prototype.composeFrame =
 
     // for performance reasons, context.setTransform is only used
     // when the view is rotated. see http://jsperf.com/canvas-transform
-    if (frameState.view2DState.rotation === 0) {
+    if (frameState.viewState.rotation === 0) {
       var dx = goog.vec.Mat4.getElement(imageTransform, 0, 3);
       var dy = goog.vec.Mat4.getElement(imageTransform, 1, 3);
       var dw = image.width * goog.vec.Mat4.getElement(imageTransform, 0, 0);
@@ -89,7 +89,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ =
         opt_transform : this.getTransform(frameState);
     var render = new ol.render.canvas.Immediate(
         context, frameState.pixelRatio, frameState.extent, transform,
-        frameState.view2DState.rotation);
+        frameState.viewState.rotation);
     var composeEvent = new ol.render.Event(type, layer, render, null,
         frameState, context, null);
     layer.dispatchEvent(composeEvent);
@@ -155,15 +155,15 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod;
  * @return {!goog.vec.Mat4.Number} Transform.
  */
 ol.renderer.canvas.Layer.prototype.getTransform = function(frameState) {
-  var view2DState = frameState.view2DState;
+  var viewState = frameState.viewState;
   var pixelRatio = frameState.pixelRatio;
   return ol.vec.Mat4.makeTransform2D(this.transform_,
       pixelRatio * frameState.size[0] / 2,
       pixelRatio * frameState.size[1] / 2,
-      pixelRatio / view2DState.resolution,
-      -pixelRatio / view2DState.resolution,
-      -view2DState.rotation,
-      -view2DState.center[0], -view2DState.center[1]);
+      pixelRatio / viewState.resolution,
+      -pixelRatio / viewState.resolution,
+      -viewState.rotation,
+      -viewState.center[0], -viewState.center[1]);
 };
 
 
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 7177e5c824..a68643fcb1 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -101,16 +101,16 @@ ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ =
   if (map.hasListener(type)) {
     var extent = frameState.extent;
     var pixelRatio = frameState.pixelRatio;
-    var view2DState = frameState.view2DState;
-    var resolution = view2DState.resolution;
-    var rotation = view2DState.rotation;
+    var viewState = frameState.viewState;
+    var resolution = viewState.resolution;
+    var rotation = viewState.rotation;
     ol.vec.Mat4.makeTransform2D(this.transform_,
         this.canvas_.width / 2,
         this.canvas_.height / 2,
-        pixelRatio / view2DState.resolution,
-        -pixelRatio / view2DState.resolution,
-        -view2DState.rotation,
-        -view2DState.center[0], -view2DState.center[1]);
+        pixelRatio / viewState.resolution,
+        -pixelRatio / viewState.resolution,
+        -viewState.rotation,
+        -viewState.center[0], -viewState.center[1]);
     var vectorContext = new ol.render.canvas.Immediate(context, pixelRatio,
         extent, this.transform_, rotation);
     var replayGroup = new ol.render.canvas.ReplayGroup(
@@ -177,7 +177,7 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
   this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState);
 
   var layerStatesArray = frameState.layerStatesArray;
-  var viewResolution = frameState.view2DState.resolution;
+  var viewResolution = frameState.viewState.resolution;
   var i, ii, layer, layerRenderer, layerState;
   for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
     layerState = layerStatesArray[i];
diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index 921d2fda46..c6852bfe94 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -170,8 +170,8 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
   //
 
   var pixelRatio = frameState.pixelRatio;
-  var view2DState = frameState.view2DState;
-  var projection = view2DState.projection;
+  var viewState = frameState.viewState;
+  var projection = viewState.projection;
 
   var tileLayer = this.getLayer();
   goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
@@ -179,18 +179,18 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
   goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
   var tileGrid = tileSource.getTileGridForProjection(projection);
   var tileGutter = tileSource.getGutter();
-  var z = tileGrid.getZForResolution(view2DState.resolution);
+  var z = tileGrid.getZForResolution(viewState.resolution);
   var tilePixelSize =
       tileSource.getTilePixelSize(z, frameState.pixelRatio, projection);
   var tilePixelRatio = tilePixelSize / tileGrid.getTileSize(z);
   var tileResolution = tileGrid.getResolution(z);
   var tilePixelResolution = tileResolution / tilePixelRatio;
-  var center = view2DState.center;
+  var center = viewState.center;
   var extent;
-  if (tileResolution == view2DState.resolution) {
+  if (tileResolution == viewState.resolution) {
     center = this.snapCenterToPixel(center, tileResolution, frameState.size);
     extent = ol.extent.getForView2DAndSize(
-        center, tileResolution, view2DState.rotation, frameState.size);
+        center, tileResolution, viewState.rotation, frameState.size);
   } else {
     extent = frameState.extent;
   }
@@ -400,9 +400,9 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame =
   ol.vec.Mat4.makeTransform2D(this.imageTransform_,
       pixelRatio * frameState.size[0] / 2,
       pixelRatio * frameState.size[1] / 2,
-      pixelRatio * tilePixelResolution / view2DState.resolution,
-      pixelRatio * tilePixelResolution / view2DState.resolution,
-      view2DState.rotation,
+      pixelRatio * tilePixelResolution / viewState.resolution,
+      pixelRatio * tilePixelResolution / viewState.resolution,
+      viewState.rotation,
       (origin[0] - center[0]) / tilePixelResolution,
       (center[1] - origin[1]) / tilePixelResolution);
 
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 19970bdc7f..9160be7192 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -97,7 +97,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame =
     replayContext.globalAlpha = layerState.opacity;
     replayGroup.replay(
         replayContext, frameState.extent, frameState.pixelRatio, transform,
-        frameState.view2DState.rotation, frameState.skippedFeatureUids_);
+        frameState.viewState.rotation, frameState.skippedFeatureUids_);
 
     if (replayContext != context) {
       this.dispatchRenderEvent(replayContext, frameState, transform);
@@ -119,8 +119,8 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
     return undefined;
   } else {
     var extent = frameState.extent;
-    var resolution = frameState.view2DState.resolution;
-    var rotation = frameState.view2DState.rotation;
+    var resolution = frameState.viewState.resolution;
+    var rotation = frameState.viewState.rotation;
     var layer = this.getLayer();
     return this.replayGroup_.forEachGeometryAtPixel(extent, resolution,
         rotation, coordinate, frameState.skippedFeatureUids_,
@@ -170,9 +170,9 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
   }
 
   var frameStateExtent = frameState.extent;
-  var view2DState = frameState.view2DState;
-  var projection = view2DState.projection;
-  var resolution = view2DState.resolution;
+  var viewState = frameState.viewState;
+  var projection = viewState.projection;
+  var resolution = viewState.resolution;
   var pixelRatio = frameState.pixelRatio;
   var vectorLayerRevision = vectorLayer.getRevision();
   var vectorLayerRenderOrder = vectorLayer.getRenderOrder();
diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js
index 7cacb017e2..dca23f358e 100644
--- a/src/ol/renderer/dom/domimagelayerrenderer.js
+++ b/src/ol/renderer/dom/domimagelayerrenderer.js
@@ -55,8 +55,8 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
   var extent = frameState.extent;
-  var resolution = frameState.view2DState.resolution;
-  var rotation = frameState.view2DState.rotation;
+  var resolution = frameState.viewState.resolution;
+  var rotation = frameState.viewState.rotation;
   var skippedFeatureUids = frameState.skippedFeatureUids_;
   return source.forEachFeatureAtPixel(
       extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -76,10 +76,10 @@ ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtPixel =
 ol.renderer.dom.ImageLayer.prototype.prepareFrame =
     function(frameState, layerState) {
 
-  var view2DState = frameState.view2DState;
-  var viewCenter = view2DState.center;
-  var viewResolution = view2DState.resolution;
-  var viewRotation = view2DState.rotation;
+  var viewState = frameState.viewState;
+  var viewCenter = viewState.center;
+  var viewResolution = viewState.resolution;
+  var viewRotation = viewState.rotation;
 
   var image = this.image_;
   var imageLayer = this.getLayer();
@@ -91,7 +91,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame =
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
     var image_ = imageSource.getImage(frameState.extent, viewResolution,
-        frameState.pixelRatio, view2DState.projection);
+        frameState.pixelRatio, viewState.projection);
     if (!goog.isNull(image_)) {
       var imageState = image_.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index f76952cbb7..367f24b1bc 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -90,8 +90,8 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
   }
 
   var pixelRatio = frameState.pixelRatio;
-  var view2DState = frameState.view2DState;
-  var projection = view2DState.projection;
+  var viewState = frameState.viewState;
+  var projection = viewState.projection;
 
   var tileLayer = this.getLayer();
   goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
@@ -99,14 +99,14 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
   goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
   var tileGrid = tileSource.getTileGridForProjection(projection);
   var tileGutter = tileSource.getGutter();
-  var z = tileGrid.getZForResolution(view2DState.resolution);
+  var z = tileGrid.getZForResolution(viewState.resolution);
   var tileResolution = tileGrid.getResolution(z);
-  var center = view2DState.center;
+  var center = viewState.center;
   var extent;
-  if (tileResolution == view2DState.resolution) {
+  if (tileResolution == viewState.resolution) {
     center = this.snapCenterToPixel(center, tileResolution, frameState.size);
     extent = ol.extent.getForView2DAndSize(
-        center, tileResolution, view2DState.rotation, frameState.size);
+        center, tileResolution, viewState.rotation, frameState.size);
   } else {
     extent = frameState.extent;
   }
@@ -217,9 +217,9 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame =
     origin = tileLayerZ.getOrigin();
     ol.vec.Mat4.makeTransform2D(transform,
         frameState.size[0] / 2, frameState.size[1] / 2,
-        resolution / view2DState.resolution,
-        resolution / view2DState.resolution,
-        view2DState.rotation,
+        resolution / viewState.resolution,
+        resolution / viewState.resolution,
+        viewState.rotation,
         (origin[0] - center[0]) / resolution,
         (center[1] - origin[1]) / resolution);
     tileLayerZ.setTransform(transform);
diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js
index d8cd7cf3a8..2cd9c5fe4b 100644
--- a/src/ol/renderer/maprenderer.js
+++ b/src/ol/renderer/maprenderer.js
@@ -64,14 +64,14 @@ goog.inherits(ol.renderer.Map, goog.Disposable);
  * @protected
  */
 ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
-  var view2DState = frameState.view2DState;
+  var viewState = frameState.viewState;
   var coordinateToPixelMatrix = frameState.coordinateToPixelMatrix;
   goog.asserts.assert(!goog.isNull(coordinateToPixelMatrix));
   ol.vec.Mat4.makeTransform2D(coordinateToPixelMatrix,
       frameState.size[0] / 2, frameState.size[1] / 2,
-      1 / view2DState.resolution, -1 / view2DState.resolution,
-      -view2DState.rotation,
-      -view2DState.center[0], -view2DState.center[1]);
+      1 / viewState.resolution, -1 / viewState.resolution,
+      -viewState.rotation,
+      -viewState.center[0], -viewState.center[1]);
   var inverted = goog.vec.Mat4.invert(
       coordinateToPixelMatrix, frameState.pixelToCoordinateMatrix);
   goog.asserts.assert(inverted);
@@ -118,9 +118,9 @@ ol.renderer.Map.prototype.forEachFeatureAtPixel =
         layerFilter, thisArg2) {
   var result;
   var extent = frameState.extent;
-  var view2DState = frameState.view2DState;
-  var viewResolution = view2DState.resolution;
-  var viewRotation = view2DState.rotation;
+  var viewState = frameState.viewState;
+  var viewResolution = viewState.resolution;
+  var viewRotation = viewState.rotation;
   if (!goog.isNull(this.replayGroup)) {
     /** @type {Object.<string, boolean>} */
     var features = {};
diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js
index cdbdba2c11..b9187754ed 100644
--- a/src/ol/renderer/webgl/webglimagelayerrenderer.js
+++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js
@@ -81,8 +81,8 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtPixel =
   var source = layer.getSource();
   goog.asserts.assertInstanceof(source, ol.source.Image);
   var extent = frameState.extent;
-  var resolution = frameState.view2DState.resolution;
-  var rotation = frameState.view2DState.rotation;
+  var resolution = frameState.viewState.resolution;
+  var rotation = frameState.viewState.rotation;
   var skippedFeatureUids = frameState.skippedFeatureUids_;
   return source.forEachFeatureAtPixel(
       extent, resolution, rotation, coordinate, skippedFeatureUids,
@@ -105,10 +105,10 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
 
   var gl = this.getWebGLMapRenderer().getGL();
 
-  var view2DState = frameState.view2DState;
-  var viewCenter = view2DState.center;
-  var viewResolution = view2DState.resolution;
-  var viewRotation = view2DState.rotation;
+  var viewState = frameState.viewState;
+  var viewCenter = viewState.center;
+  var viewResolution = viewState.resolution;
+  var viewRotation = viewState.rotation;
 
   var image = this.image_;
   var texture = this.texture;
@@ -121,7 +121,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame =
 
   if (!hints[ol.ViewHint.ANIMATING] && !hints[ol.ViewHint.INTERACTING]) {
     var image_ = imageSource.getImage(frameState.extent, viewResolution,
-        frameState.pixelRatio, view2DState.projection);
+        frameState.pixelRatio, viewState.projection);
     if (!goog.isNull(image_)) {
       var imageState = image_.getState();
       if (imageState == ol.ImageState.IDLE) {
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index ecb2c222fe..ee19053f1a 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -448,7 +448,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) {
   /** @type {Array.<ol.layer.LayerState>} */
   var layerStatesToDraw = [];
   var layerStatesArray = frameState.layerStatesArray;
-  var viewResolution = frameState.view2DState.resolution;
+  var viewResolution = frameState.viewState.resolution;
   var i, ii, layerState;
   for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
     layerState = layerStatesArray[i];
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index de21054637..f31412e686 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -114,15 +114,15 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
   var context = mapRenderer.getContext();
   var gl = mapRenderer.getGL();
 
-  var view2DState = frameState.view2DState;
-  var projection = view2DState.projection;
+  var viewState = frameState.viewState;
+  var projection = viewState.projection;
 
   var tileLayer = this.getLayer();
   goog.asserts.assertInstanceof(tileLayer, ol.layer.Tile);
   var tileSource = tileLayer.getSource();
   goog.asserts.assertInstanceof(tileSource, ol.source.Tile);
   var tileGrid = tileSource.getTileGridForProjection(projection);
-  var z = tileGrid.getZForResolution(view2DState.resolution);
+  var z = tileGrid.getZForResolution(viewState.resolution);
   var tileResolution = tileGrid.getResolution(z);
 
   var tilePixelSize =
@@ -131,12 +131,12 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
   var tilePixelResolution = tileResolution / pixelRatio;
   var tileGutter = tileSource.getGutter();
 
-  var center = view2DState.center;
+  var center = viewState.center;
   var extent;
-  if (tileResolution == view2DState.resolution) {
+  if (tileResolution == viewState.resolution) {
     center = this.snapCenterToPixel(center, tileResolution, frameState.size);
     extent = ol.extent.getForView2DAndSize(
-        center, tileResolution, view2DState.rotation, frameState.size);
+        center, tileResolution, viewState.rotation, frameState.size);
   } else {
     extent = frameState.extent;
   }
@@ -310,13 +310,13 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame =
       (center[1] - framebufferExtent[1]) /
           (framebufferExtent[3] - framebufferExtent[1]),
       0);
-  if (view2DState.rotation !== 0) {
-    goog.vec.Mat4.rotateZ(texCoordMatrix, view2DState.rotation);
+  if (viewState.rotation !== 0) {
+    goog.vec.Mat4.rotateZ(texCoordMatrix, viewState.rotation);
   }
   goog.vec.Mat4.scale(texCoordMatrix,
-      frameState.size[0] * view2DState.resolution /
+      frameState.size[0] * viewState.resolution /
           (framebufferExtent[2] - framebufferExtent[0]),
-      frameState.size[1] * view2DState.resolution /
+      frameState.size[1] * viewState.resolution /
           (framebufferExtent[3] - framebufferExtent[1]),
       1);
   goog.vec.Mat4.translate(texCoordMatrix,
diff --git a/src/ol/view2d.js b/src/ol/view2d.js
index 73700a81be..cb64f2558c 100644
--- a/src/ol/view2d.js
+++ b/src/ol/view2d.js
@@ -385,7 +385,7 @@ ol.View2D.prototype.getValueForResolutionFunction = function(opt_power) {
 
 
 /**
- * @return {olx.View2DState} View2D state.
+ * @return {olx.ViewState} View2D state.
  */
 ol.View2D.prototype.getState = function() {
   goog.asserts.assert(this.isDef());
@@ -393,7 +393,7 @@ ol.View2D.prototype.getState = function() {
   var projection = this.getProjection();
   var resolution = /** @type {number} */ (this.getResolution());
   var rotation = this.getRotation();
-  return /** @type {olx.View2DState} */ ({
+  return /** @type {olx.ViewState} */ ({
     center: center.slice(),
     projection: goog.isDef(projection) ? projection : null,
     resolution: resolution,