diff --git a/src/ol/animation.js b/src/ol/animation.js
index b1a15fa966..17207baea0 100644
--- a/src/ol/animation.js
+++ b/src/ol/animation.js
@@ -8,7 +8,7 @@ goog.require('ol.easing');
 
 
 /**
- * @param {ol.animation.BounceOptions} options Bounce options.
+ * @param {olx.animation.BounceOptions} options Bounce options.
  * @return {ol.PreRenderFunction} Pre-render function.
  * @todo stability experimental
  */
@@ -43,7 +43,7 @@ ol.animation.bounce = function(options) {
 
 
 /**
- * @param {ol.animation.PanOptions} options Pan options.
+ * @param {olx.animation.PanOptions} options Pan options.
  * @return {ol.PreRenderFunction} Pre-render function.
  * @todo stability experimental
  */
@@ -82,7 +82,7 @@ ol.animation.pan = function(options) {
 
 
 /**
- * @param {ol.animation.RotateOptions} options Rotate options.
+ * @param {olx.animation.RotateOptions} options Rotate options.
  * @return {ol.PreRenderFunction} Pre-render function.
  * @todo stability experimental
  */
@@ -119,7 +119,7 @@ ol.animation.rotate = function(options) {
 
 
 /**
- * @param {ol.animation.ZoomOptions} options Zoom options.
+ * @param {olx.animation.ZoomOptions} options Zoom options.
  * @return {ol.PreRenderFunction} Pre-render function.
  * @todo stability experimental
  */
diff --git a/src/ol/attribution.js b/src/ol/attribution.js
index 361572bcc7..560e52facf 100644
--- a/src/ol/attribution.js
+++ b/src/ol/attribution.js
@@ -20,7 +20,7 @@ goog.require('ol.TileRange');
  *     ..
  *
  * @constructor
- * @param {ol.AttributionOptions} options Attribution options.
+ * @param {olx.AttributionOptions} options Attribution options.
  * @todo stability experimental
  */
 ol.Attribution = function(options) {
diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js
index f5d2ed225f..b8e6e63b58 100644
--- a/src/ol/control/attributioncontrol.js
+++ b/src/ol/control/attributioncontrol.js
@@ -21,7 +21,7 @@ goog.require('ol.css');
  * be changed by using a css selector for `.ol-attribution`.
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.AttributionOptions=} opt_options Attribution options.
+ * @param {olx.control.AttributionOptions=} opt_options Attribution options.
  * @todo stability experimental
  */
 ol.control.Attribution = function(opt_options) {
diff --git a/src/ol/control/control.js b/src/ol/control/control.js
index b57a732e38..d7b96d18d0 100644
--- a/src/ol/control/control.js
+++ b/src/ol/control/control.js
@@ -15,7 +15,7 @@ goog.require('ol.Object');
  * @constructor
  * @extends {ol.Object}
  * @implements {oli.control.Control}
- * @param {ol.control.ControlOptions} options Control options.
+ * @param {olx.control.ControlOptions} options Control options.
  * @todo stability experimental
  */
 ol.control.Control = function(options) {
diff --git a/src/ol/control/controldefaults.js b/src/ol/control/controldefaults.js
index 0546ee1229..da53820325 100644
--- a/src/ol/control/controldefaults.js
+++ b/src/ol/control/controldefaults.js
@@ -7,7 +7,7 @@ goog.require('ol.control.Zoom');
 
 
 /**
- * @param {ol.control.DefaultsOptions=} opt_options Defaults options.
+ * @param {olx.control.DefaultsOptions=} opt_options Defaults options.
  * @return {ol.Collection} Controls.
  * @todo stability experimental
  */
diff --git a/src/ol/control/dragboxcontrol.js b/src/ol/control/dragboxcontrol.js
index 4529d77767..4106b2833f 100644
--- a/src/ol/control/dragboxcontrol.js
+++ b/src/ol/control/dragboxcontrol.js
@@ -26,7 +26,7 @@ ol.control.DragBoxOptions;
 /**
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.DragBoxOptions} options Drag box options.
+ * @param {olx.control.DragBoxOptions} options Drag box options.
  * @todo stability experimental
  */
 ol.control.DragBox = function(options) {
diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js
index 12f9823f4d..b7a5dac4fd 100644
--- a/src/ol/control/fullscreencontrol.js
+++ b/src/ol/control/fullscreencontrol.js
@@ -22,7 +22,7 @@ goog.require('ol.css');
  *
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.FullScreenOptions=} opt_options Options.
+ * @param {olx.control.FullScreenOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.control.FullScreen = function(opt_options) {
diff --git a/src/ol/control/logocontrol.js b/src/ol/control/logocontrol.js
index 8843e10d7e..e1ebaa359a 100644
--- a/src/ol/control/logocontrol.js
+++ b/src/ol/control/logocontrol.js
@@ -17,7 +17,7 @@ goog.require('ol.css');
  * be styled by using a css selector for `.ol-logo`.
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.LogoOptions=} opt_options Logo options.
+ * @param {olx.control.LogoOptions=} opt_options Logo options.
  * @todo stability experimental
  */
 ol.control.Logo = function(opt_options) {
diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mousepositioncontrol.js
index 3697e9f7b6..7381867f59 100644
--- a/src/ol/control/mousepositioncontrol.js
+++ b/src/ol/control/mousepositioncontrol.js
@@ -36,7 +36,7 @@ ol.control.MousePositionProperty = {
  *
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.MousePositionOptions=} opt_options Mouse position options.
+ * @param {olx.control.MousePositionOptions=} opt_options Mouse position options.
  * @todo stability experimental
  * @todo observable projection {ol.proj.Projection} the projection to report
  *       mouse position in
diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scalelinecontrol.js
index ccaabb707d..5c18bac16c 100644
--- a/src/ol/control/scalelinecontrol.js
+++ b/src/ol/control/scalelinecontrol.js
@@ -49,7 +49,7 @@ ol.control.ScaleLineUnits = {
  *
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.ScaleLineOptions=} opt_options Scale line options.
+ * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
  * @todo stability experimental
  * @todo observable units {ol.control.ScaleLineUnits} the units to use in the
  *       scale line
diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoomcontrol.js
index 72f278353b..f31b6aaa66 100644
--- a/src/ol/control/zoomcontrol.js
+++ b/src/ol/control/zoomcontrol.js
@@ -19,7 +19,7 @@ goog.require('ol.easing');
  * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.ZoomOptions=} opt_options Zoom options.
+ * @param {olx.control.ZoomOptions=} opt_options Zoom options.
  * @todo stability experimental
  */
 ol.control.Zoom = function(opt_options) {
diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslidercontrol.js
index 52b9e1f2d4..c2cf84481e 100644
--- a/src/ol/control/zoomslidercontrol.js
+++ b/src/ol/control/zoomslidercontrol.js
@@ -37,7 +37,7 @@ ol.control.ZOOMSLIDER_ANIMATION_DURATION = 200;
  *
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.ZoomSliderOptions=} opt_options Zoom slider options.
+ * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
  * @todo stability experimental
  */
 ol.control.ZoomSlider = function(opt_options) {
diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextentcontrol.js
index f926db5a0d..71fdae3a99 100644
--- a/src/ol/control/zoomtoextentcontrol.js
+++ b/src/ol/control/zoomtoextentcontrol.js
@@ -17,7 +17,7 @@ goog.require('ol.css');
  * css selector `.ol-zoom-extent`.
  * @constructor
  * @extends {ol.control.Control}
- * @param {ol.control.ZoomToExtentOptions=} opt_options Options.
+ * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.control.ZoomToExtent = function(opt_options) {
diff --git a/src/ol/deviceorientation.js b/src/ol/deviceorientation.js
index 87c51ec8d1..000494963b 100644
--- a/src/ol/deviceorientation.js
+++ b/src/ol/deviceorientation.js
@@ -67,7 +67,7 @@ ol.DeviceOrientationProperty = {
  *
  * @constructor
  * @extends {ol.Object}
- * @param {ol.DeviceOrientationOptions=} opt_options Options.
+ * @param {olx.DeviceOrientationOptions=} opt_options Options.
  * @todo stability experimental
  * @todo observable alpha {number} readonly the euler angle in radians of the
  *       device from the standard X axis
diff --git a/src/ol/geolocation.js b/src/ol/geolocation.js
index 884cac198d..ffb7a11638 100644
--- a/src/ol/geolocation.js
+++ b/src/ol/geolocation.js
@@ -45,7 +45,7 @@ ol.GeolocationProperty = {
  *
  * @constructor
  * @extends {ol.Object}
- * @param {ol.GeolocationOptions=} opt_options Options.
+ * @param {olx.GeolocationOptions=} opt_options Options.
  * @todo stability experimental
  * @todo observable accuracy {number} readonly the accuracy of the position
  *       measurement
diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoominteraction.js
index 1b106052b1..ac4f7c9668 100644
--- a/src/ol/interaction/doubleclickzoominteraction.js
+++ b/src/ol/interaction/doubleclickzoominteraction.js
@@ -14,7 +14,7 @@ goog.require('ol.interaction.Interaction');
  *
  * @constructor
  * @extends {ol.interaction.Interaction}
- * @param {ol.interaction.DoubleClickZoomOptions=} opt_options Options.
+ * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.DoubleClickZoom = function(opt_options) {
diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpaninteraction.js
index d1d668d551..d98a801639 100644
--- a/src/ol/interaction/dragpaninteraction.js
+++ b/src/ol/interaction/dragpaninteraction.js
@@ -18,7 +18,7 @@ goog.require('ol.interaction.Drag');
  * Allows the user to pan the map by clickng and dragging.
  * @constructor
  * @extends {ol.interaction.Drag}
- * @param {ol.interaction.DragPanOptions=} opt_options Options.
+ * @param {olx.interaction.DragPanOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.DragPan = function(opt_options) {
diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoominteraction.js
index c479deefbb..b2588a2af3 100644
--- a/src/ol/interaction/dragrotateandzoominteraction.js
+++ b/src/ol/interaction/dragrotateandzoominteraction.js
@@ -26,7 +26,7 @@ ol.interaction.DRAGROTATEANDZOOM_ANIMATION_DURATION = 400;
  * This interaction is not included in the default interactions.
  * @constructor
  * @extends {ol.interaction.Drag}
- * @param {ol.interaction.DragRotateAndZoomOptions=} opt_options Options.
+ * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.DragRotateAndZoom = function(opt_options) {
diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotateinteraction.js
index b43aaed167..06a85e3eb9 100644
--- a/src/ol/interaction/dragrotateinteraction.js
+++ b/src/ol/interaction/dragrotateinteraction.js
@@ -21,7 +21,7 @@ ol.interaction.DRAGROTATE_ANIMATION_DURATION = 250;
  * it to when the alt and shift keys are held down.
  * @constructor
  * @extends {ol.interaction.Drag}
- * @param {ol.interaction.DragRotateOptions=} opt_options Options.
+ * @param {olx.interaction.DragRotateOptions=} opt_options Options.
  */
 ol.interaction.DragRotate = function(opt_options) {
 
diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoominteraction.js
index 5a44365def..2cc9ed0e99 100644
--- a/src/ol/interaction/dragzoominteraction.js
+++ b/src/ol/interaction/dragzoominteraction.js
@@ -34,7 +34,7 @@ ol.SHIFT_DRAG_ZOOM_HYSTERESIS_PIXELS_SQUARED =
  * it to when the shift key is held down.
  * @constructor
  * @extends {ol.interaction.Drag}
- * @param {ol.interaction.DragZoomOptions=} opt_options Options.
+ * @param {olx.interaction.DragZoomOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.DragZoom = function(opt_options) {
diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js
index 217adb30d7..6157a21131 100644
--- a/src/ol/interaction/drawinteraction.js
+++ b/src/ol/interaction/drawinteraction.js
@@ -23,7 +23,7 @@ goog.require('ol.source.Vector');
 
 /**
  * Interaction that allows drawing geometries.
- * @param {ol.interaction.DrawOptions} options Options.
+ * @param {olx.interaction.DrawOptions} options Options.
  * @constructor
  * @extends {ol.interaction.Interaction}
  */
diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/interactiondefaults.js
index b6e39c8752..32b4e5569c 100644
--- a/src/ol/interaction/interactiondefaults.js
+++ b/src/ol/interaction/interactiondefaults.js
@@ -23,7 +23,7 @@ goog.require('ol.interaction.TouchZoom');
  * {@link ol.interaction} instances and insert them into an
  * {@link ol.Collection} in the order you want before creating your ol.Map
  * instance.
- * @param {ol.interaction.DefaultsOptions=} opt_options Defaults options.
+ * @param {olx.interaction.DefaultsOptions=} opt_options Defaults options.
  * @return {ol.Collection} A collection of interactions to be used with
  * the ol.Map constructor's interactions option.
  * @todo stability experimental
diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpaninteraction.js
index ae3b15b8ef..f38e0c004a 100644
--- a/src/ol/interaction/keyboardpaninteraction.js
+++ b/src/ol/interaction/keyboardpaninteraction.js
@@ -24,7 +24,7 @@ ol.interaction.KEYBOARD_PAN_DURATION = 100;
  * Allows the user to pan the map using keyboard arrows.
  * @constructor
  * @extends {ol.interaction.Interaction}
- * @param {ol.interaction.KeyboardPanOptions=} opt_options Options.
+ * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.KeyboardPan = function(opt_options) {
diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoominteraction.js
index 6fa1bd4ad0..e43dab79ea 100644
--- a/src/ol/interaction/keyboardzoominteraction.js
+++ b/src/ol/interaction/keyboardzoominteraction.js
@@ -13,7 +13,7 @@ goog.require('ol.interaction.Interaction');
 /**
  * Allows the user to zoom the map using keyboard + and -.
  * @constructor
- * @param {ol.interaction.KeyboardZoomOptions=} opt_options Options.
+ * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
  * @extends {ol.interaction.Interaction}
  * @todo stability experimental
  */
diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js
index fdef1b88e7..901589751e 100644
--- a/src/ol/interaction/modifyinteraction.js
+++ b/src/ol/interaction/modifyinteraction.js
@@ -38,7 +38,7 @@ ol.interaction.SegmentDataType;
 /**
  * @constructor
  * @extends {ol.interaction.Drag}
- * @param {ol.interaction.ModifyOptions=} opt_options Options.
+ * @param {olx.interaction.ModifyOptions=} opt_options Options.
  */
 ol.interaction.Modify = function(opt_options) {
   goog.base(this);
diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoominteraction.js
index 29999fb194..fb1c229ceb 100644
--- a/src/ol/interaction/mousewheelzoominteraction.js
+++ b/src/ol/interaction/mousewheelzoominteraction.js
@@ -27,7 +27,7 @@ ol.interaction.MOUSEWHEELZOOM_TIMEOUT_DURATION = 80;
  * Allows the user to zoom the map by scrolling the mouse wheel.
  * @constructor
  * @extends {ol.interaction.Interaction}
- * @param {ol.interaction.MouseWheelZoomOptions=} opt_options Options.
+ * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.MouseWheelZoom = function(opt_options) {
diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js
index 6442cd9d5b..96cec1ad9d 100644
--- a/src/ol/interaction/selectinteraction.js
+++ b/src/ol/interaction/selectinteraction.js
@@ -15,7 +15,7 @@ goog.require('ol.layer.Vector');
  * Allows the user to select features on the map.
  * @constructor
  * @extends {ol.interaction.Interaction}
- * @param {ol.interaction.SelectOptions=} opt_options Options.
+ * @param {olx.interaction.SelectOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.Select = function(opt_options) {
diff --git a/src/ol/interaction/touchpaninteraction.js b/src/ol/interaction/touchpaninteraction.js
index 41f494a7b2..3f2efb7cb6 100644
--- a/src/ol/interaction/touchpaninteraction.js
+++ b/src/ol/interaction/touchpaninteraction.js
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
  * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
- * @param {ol.interaction.TouchPanOptions=} opt_options Options.
+ * @param {olx.interaction.TouchPanOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.TouchPan = function(opt_options) {
diff --git a/src/ol/interaction/touchrotateinteraction.js b/src/ol/interaction/touchrotateinteraction.js
index 617c522daf..ddf3fcc0e7 100644
--- a/src/ol/interaction/touchrotateinteraction.js
+++ b/src/ol/interaction/touchrotateinteraction.js
@@ -21,7 +21,7 @@ ol.interaction.TOUCHROTATE_ANIMATION_DURATION = 250;
  * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
- * @param {ol.interaction.TouchRotateOptions=} opt_options Options.
+ * @param {olx.interaction.TouchRotateOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.TouchRotate = function(opt_options) {
diff --git a/src/ol/interaction/touchzoominteraction.js b/src/ol/interaction/touchzoominteraction.js
index 17c2c9f3bc..b642852b82 100644
--- a/src/ol/interaction/touchzoominteraction.js
+++ b/src/ol/interaction/touchzoominteraction.js
@@ -15,7 +15,7 @@ goog.require('ol.interaction.Touch');
  * on a touch screen.
  * @constructor
  * @extends {ol.interaction.Touch}
- * @param {ol.interaction.TouchZoomOptions=} opt_options Options.
+ * @param {olx.interaction.TouchZoomOptions=} opt_options Options.
  * @todo stability experimental
  */
 ol.interaction.TouchZoom = function(opt_options) {
diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/imagelayer.js
index f3d6b49ac9..d75edf8ded 100644
--- a/src/ol/layer/imagelayer.js
+++ b/src/ol/layer/imagelayer.js
@@ -8,7 +8,7 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.LayerOptions} options Layer options.
+ * @param {olx.layer.LayerOptions} options Layer options.
  * @todo stability experimental
  */
 ol.layer.Image = function(options) {
diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js
index b095c51584..a83bfb9183 100644
--- a/src/ol/layer/layer.js
+++ b/src/ol/layer/layer.js
@@ -12,7 +12,7 @@ goog.require('ol.source.Source');
 /**
  * @constructor
  * @extends {ol.layer.Base}
- * @param {ol.layer.LayerOptions} options Layer options.
+ * @param {olx.layer.LayerOptions} options Layer options.
  * @todo stability experimental
  * @todo observable brightness {number} the brightness of the layer
  * @todo observable contrast {number} the contrast of the layer
@@ -25,7 +25,7 @@ goog.require('ol.source.Source');
  */
 ol.layer.Layer = function(options) {
 
-  var baseOptions = /** @type {ol.layer.LayerOptions} */
+  var baseOptions = /** @type {olx.layer.LayerOptions} */
       (goog.object.clone(options));
   delete baseOptions.source;
 
diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js
index 5c1a1d24db..389f3afef7 100644
--- a/src/ol/layer/layerbase.js
+++ b/src/ol/layer/layerbase.js
@@ -43,7 +43,7 @@ ol.layer.LayerState;
 /**
  * @constructor
  * @extends {ol.Object}
- * @param {ol.layer.BaseOptions} options Layer options.
+ * @param {olx.layer.BaseOptions} options Layer options.
  */
 ol.layer.Base = function(options) {
 
diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js
index 9fd4b6c5b0..50649459f0 100644
--- a/src/ol/layer/layergroup.js
+++ b/src/ol/layer/layergroup.js
@@ -26,7 +26,7 @@ ol.layer.GroupProperty = {
 /**
  * @constructor
  * @extends {ol.layer.Base}
- * @param {ol.layer.GroupOptions=} opt_options Layer options.
+ * @param {olx.layer.GroupOptions=} opt_options Layer options.
  * @todo stability experimental
  * @todo observable layers {ol.Collection} collection of layers that are part
  *       of this group
@@ -34,7 +34,7 @@ ol.layer.GroupProperty = {
 ol.layer.Group = function(opt_options) {
 
   var options = goog.isDef(opt_options) ? opt_options : {};
-  var baseOptions = /** @type {ol.layer.GroupOptions} */
+  var baseOptions = /** @type {olx.layer.GroupOptions} */
       (goog.object.clone(options));
   delete baseOptions.layers;
 
diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js
index 2bbbde2764..f8ba630d95 100644
--- a/src/ol/layer/tilelayer.js
+++ b/src/ol/layer/tilelayer.js
@@ -16,7 +16,7 @@ ol.layer.TileProperty = {
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.TileOptions} options Tile layer options.
+ * @param {olx.layer.TileOptions} options Tile layer options.
  * @todo stability experimental
  * @todo observable preload {number} the level to preload tiles up to
  */
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js
index 11feb64ecd..11a4853b39 100644
--- a/src/ol/layer/vectorlayer.js
+++ b/src/ol/layer/vectorlayer.js
@@ -15,12 +15,12 @@ goog.require('ol.style.Style');
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.VectorLayerOptions} options Vector layer options.
+ * @param {olx.layer.VectorLayerOptions} options Vector layer options.
  * @todo stability experimental
  */
 ol.layer.Vector = function(options) {
 
-  var baseOptions = /** @type {ol.layer.VectorLayerOptions} */
+  var baseOptions = /** @type {olx.layer.VectorLayerOptions} */
       (goog.object.clone(options));
 
   /**
@@ -45,7 +45,7 @@ ol.layer.Vector = function(options) {
    */
   this.temporary_ = false;
 
-  goog.base(this, /** @type {ol.layer.LayerOptions} */ (baseOptions));
+  goog.base(this, /** @type {olx.layer.LayerOptions} */ (baseOptions));
 };
 goog.inherits(ol.layer.Vector, ol.layer.Layer);
 
diff --git a/src/ol/map.js b/src/ol/map.js
index c6d2f2fcf8..69fd635db6 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -141,7 +141,7 @@ ol.MapProperty = {
  *
  * @constructor
  * @extends {ol.Object}
- * @param {ol.MapOptions} options Map options.
+ * @param {olx.MapOptions} options Map options.
  * @todo stability experimental
  * @todo observable layergroup {ol.layer.LayerGroup} a layer group containing
  *       the layers in this map.
@@ -563,7 +563,7 @@ ol.Map.prototype.getOverlays = function() {
 /**
  * Get feature information for a pixel on the map.
  *
- * @param {ol.GetFeatureInfoOptions} options Options.
+ * @param {olx.GetFeatureInfoOptions} options Options.
  * @todo stability experimental
  */
 ol.Map.prototype.getFeatureInfo = function(options) {
@@ -577,7 +577,7 @@ ol.Map.prototype.getFeatureInfo = function(options) {
 /**
  * Get features for a pixel on the map.
  *
- * @param {ol.GetFeaturesOptions} options Options.
+ * @param {olx.GetFeaturesOptions} options Options.
  * @todo stability experimental
  */
 ol.Map.prototype.getFeatures = function(options) {
@@ -1241,7 +1241,7 @@ ol.MapOptionsInternal;
 
 
 /**
- * @param {ol.MapOptions} options Map options.
+ * @param {olx.MapOptions} options Map options.
  * @return {ol.MapOptionsInternal} Internal map options.
  */
 ol.Map.createOptionsInternal = function(options) {
diff --git a/src/ol/overlay.js b/src/ol/overlay.js
index 38233f7953..bd81f321c7 100644
--- a/src/ol/overlay.js
+++ b/src/ol/overlay.js
@@ -55,7 +55,7 @@ ol.OverlayPositioning = {
  *
  * @constructor
  * @extends {ol.Object}
- * @param {ol.OverlayOptions} options Overlay options.
+ * @param {olx.OverlayOptions} options Overlay options.
  * @todo stability experimental
  * @todo observable element {Element} the Element containing the overlay
  * @todo observable map {ol.Map} the map that the overlay is part of
diff --git a/src/ol/parser/gpxparser.js b/src/ol/parser/gpxparser.js
index ff32db5382..a193396976 100644
--- a/src/ol/parser/gpxparser.js
+++ b/src/ol/parser/gpxparser.js
@@ -21,12 +21,12 @@ goog.require('ol.parser.XML');
  * @implements {ol.parser.DomFeatureParser}
  * @implements {ol.parser.StringFeatureParser}
  * @implements {ol.parser.ObjectFeatureParser}
- * @param {ol.parser.GPXOptions=} opt_options Optional configuration object.
+ * @param {olx.parser.GPXOptions=} opt_options Optional configuration object.
  * @extends {ol.parser.XML}
  * @todo stability experimental
  */
 ol.parser.GPX = function(opt_options) {
-  var options = /** @type {ol.parser.GPXOptions} */
+  var options = /** @type {olx.parser.GPXOptions} */
       (goog.isDef(opt_options) ? opt_options : {});
   this.extractAttributes = goog.isDef(options.extractAttributes) ?
       options.extractAttributes : true;
@@ -269,7 +269,7 @@ ol.parser.GPX.prototype.readFeaturesFromObject = function(obj) {
 
 
 /**
- * @param {ol.parser.GPXWriteOptions} obj Object structure to write out
+ * @param {olx.parser.GPXWriteOptions} obj Object structure to write out
  *     as GPX.
  * @return {string} An string representing the GPX document.
  */
diff --git a/src/ol/parser/kmlparser.js b/src/ol/parser/kmlparser.js
index fcd6d8aefd..c1cdfc9037 100644
--- a/src/ol/parser/kmlparser.js
+++ b/src/ol/parser/kmlparser.js
@@ -40,12 +40,12 @@ goog.require('ol.style.Stroke');
  * @implements {ol.parser.StringFeatureParser}
  * @implements {ol.parser.AsyncObjectFeatureParser}
  * @implements {ol.parser.AsyncStringFeatureParser}
- * @param {ol.parser.KMLOptions=} opt_options Optional configuration object.
+ * @param {olx.parser.KMLOptions=} opt_options Optional configuration object.
  * @extends {ol.parser.XML}
  * @todo stability experimental
  */
 ol.parser.KML = function(opt_options) {
-  var options = /** @type {ol.parser.KMLOptions} */
+  var options = /** @type {olx.parser.KMLOptions} */
       (goog.isDef(opt_options) ? opt_options : {});
   this.extractAttributes = goog.isDef(options.extractAttributes) ?
       options.extractAttributes : true;
diff --git a/src/ol/parser/ogc/filterparser_v1.js b/src/ol/parser/ogc/filterparser_v1.js
index 3d3ff44d55..2c60548f42 100644
--- a/src/ol/parser/ogc/filterparser_v1.js
+++ b/src/ol/parser/ogc/filterparser_v1.js
@@ -649,6 +649,6 @@ ol.parser.ogc.Filter_v1.prototype.setSrsName = function(srsName) {
   this.srsName = srsName;
   if (goog.isDefAndNotNull(this.gmlParser_)) {
     this.gmlParser_.applyWriteOptions({},
-        /** @type {ol.parser.GMLWriteOptions} */ ({srsName: srsName}));
+        /** @type {olx.parser.GMLWriteOptions} */ ({srsName: srsName}));
   }
 };
diff --git a/src/ol/parser/ogc/gmlparser.js b/src/ol/parser/ogc/gmlparser.js
index e690cbae58..28c36e0f1a 100644
--- a/src/ol/parser/ogc/gmlparser.js
+++ b/src/ol/parser/ogc/gmlparser.js
@@ -22,12 +22,12 @@ goog.require('ol.proj');
 /**
  * @constructor
  * @implements {ol.parser.StringFeatureParser}
- * @param {ol.parser.GMLOptions=} opt_options
+ * @param {olx.parser.GMLOptions=} opt_options
  *     Optional configuration object.
  * @extends {ol.parser.XML}
  */
 ol.parser.ogc.GML = function(opt_options) {
-  var options = /** @type {ol.parser.GMLOptions} */
+  var options = /** @type {olx.parser.GMLOptions} */
       (goog.isDef(opt_options) ? opt_options : {});
   this.extractAttributes = goog.isDef(options.extractAttributes) ?
       options.extractAttributes : true;
@@ -491,7 +491,7 @@ ol.parser.ogc.GML.prototype.writeGeometry = function(geometry) {
 
 /**
  * @param {string|Document|Element|Object} data Data to read.
- * @param {ol.parser.GMLReadOptions=} opt_options Read options.
+ * @param {olx.parser.GMLReadOptions=} opt_options Read options.
  * @return {ol.parser.ReadFeaturesResult} An object representing the document.
  */
 ol.parser.ogc.GML.prototype.read = function(data, opt_options) {
@@ -630,7 +630,7 @@ ol.parser.ogc.GML.prototype.readFeaturesFromString = function(str) {
  * Applies the writeOptions passed into the write function.
  * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
  * GML.
- * @param {ol.parser.GMLWriteOptions=} opt_options Write options.
+ * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
  */
 ol.parser.ogc.GML.prototype.applyWriteOptions = function(obj, opt_options) {
   // srsName handling: opt_options -> this.writeOptions -> obj.metadata
diff --git a/src/ol/parser/ogc/gmlparser_v2.js b/src/ol/parser/ogc/gmlparser_v2.js
index 37bdd9d191..a6aaa73c52 100644
--- a/src/ol/parser/ogc/gmlparser_v2.js
+++ b/src/ol/parser/ogc/gmlparser_v2.js
@@ -11,7 +11,7 @@ goog.require('ol.parser.ogc.GML');
  * version 2.1.2
  *
  * @constructor
- * @param {ol.parser.GMLOptions=} opt_options Optional configuration object.
+ * @param {olx.parser.GMLOptions=} opt_options Optional configuration object.
  * @extends {ol.parser.ogc.GML}
  * @todo stability experimental
  */
@@ -127,7 +127,7 @@ goog.inherits(ol.parser.ogc.GML_v2, ol.parser.ogc.GML);
 /**
  * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
  * GML.
- * @param {ol.parser.GMLWriteOptions=} opt_options Write options.
+ * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
  * @return {string} A string representing the GML document.
  * @todo stability experimental
  */
diff --git a/src/ol/parser/ogc/gmlparser_v3.js b/src/ol/parser/ogc/gmlparser_v3.js
index 2a9bb45406..b22f755e3e 100644
--- a/src/ol/parser/ogc/gmlparser_v3.js
+++ b/src/ol/parser/ogc/gmlparser_v3.js
@@ -13,7 +13,7 @@ goog.require('ol.parser.ogc.GML');
  * version 3.1.1
  *
  * @constructor
- * @param {ol.parser.GMLOptions=} opt_options Optional configuration object.
+ * @param {olx.parser.GMLOptions=} opt_options Optional configuration object.
  * @extends {ol.parser.ogc.GML}
  * @todo stability experimental
  */
@@ -425,7 +425,7 @@ goog.inherits(ol.parser.ogc.GML_v3, ol.parser.ogc.GML);
 /**
  * @param {ol.parser.ReadFeaturesResult} obj Object structure to write out as
  *     XML.
- * @param {ol.parser.GMLWriteOptions=} opt_options Write options.
+ * @param {olx.parser.GMLWriteOptions=} opt_options Write options.
  * @return {string} An string representing the XML document.
  * @todo stability experimental
  */
diff --git a/src/ol/parser/ogc/sldparser_v1.js b/src/ol/parser/ogc/sldparser_v1.js
index a1516d8c5a..f952d4878f 100644
--- a/src/ol/parser/ogc/sldparser_v1.js
+++ b/src/ol/parser/ogc/sldparser_v1.js
@@ -89,7 +89,7 @@ ol.parser.ogc.SLD_v1 = function() {
       delete config.fill;
       config.zIndex = this.featureTypeCounter;
       rule.symbolizers.push(
-          new ol.style.Text(/** @type {ol.style.TextOptions} */(config))
+          new ol.style.Text(/** @type {olx.style.TextOptions} */(config))
       );
     },
     'Label': function(node, symbolizer) {
@@ -197,7 +197,7 @@ ol.parser.ogc.SLD_v1 = function() {
       if (goog.isDef(config.externalGraphic)) {
         config.width = config.height = config.size;
         symbolizer = new ol.style.Icon(
-            /** @type {ol.style.IconOptions} */(config));
+            /** @type {olx.style.IconOptions} */(config));
       } else {
         symbolizer = new ol.style.Shape(config);
       }
@@ -689,7 +689,7 @@ ol.parser.ogc.SLD_v1.prototype.getScaleDenominatorFromResolution_ =
 
 /**
  * @param {string|Document|Element} data Data to read.
- * @param {ol.parser.SLDReadOptions=} opt_options Read options.
+ * @param {olx.parser.SLDReadOptions=} opt_options Read options.
  * @return {Object} An object representing the document.
  */
 ol.parser.ogc.SLD_v1.prototype.read = function(data, opt_options) {
@@ -713,7 +713,7 @@ ol.parser.ogc.SLD_v1.prototype.read = function(data, opt_options) {
 
 /**
  * @param {Object} style The style to write out.
- * @param {ol.parser.SLDWriteOptions=} opt_options Write options.
+ * @param {olx.parser.SLDWriteOptions=} opt_options Write options.
  * @return {string} The serialized SLD.
  */
 ol.parser.ogc.SLD_v1.prototype.write = function(style, opt_options) {
diff --git a/src/ol/parser/ogc/wfsparser_v1.js b/src/ol/parser/ogc/wfsparser_v1.js
index acc0449c8b..15e431d683 100644
--- a/src/ol/parser/ogc/wfsparser_v1.js
+++ b/src/ol/parser/ogc/wfsparser_v1.js
@@ -28,7 +28,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
   this.writers = {};
   this.writers[this.defaultNamespaceURI] = {
     /**
-     * @param {ol.parser.WFSWriteGetFeatureOptions} options Options.
+     * @param {olx.parser.WFSWriteGetFeatureOptions} options Options.
      * @return {{node: Node,
      *           options: ol.parser.WFSWriteGetFeatureOptions}} Object.
      * @this {ol.parser.XML}
@@ -338,7 +338,7 @@ ol.parser.ogc.WFS_v1.prototype.read = function(data) {
 
 
 /**
- * @param {ol.parser.WFSWriteGetFeatureOptions} options Options.
+ * @param {olx.parser.WFSWriteGetFeatureOptions} options Options.
  * @return {string} A serialized WFS GetFeature query.
  */
 ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) {
@@ -352,7 +352,7 @@ ol.parser.ogc.WFS_v1.prototype.writeGetFeature = function(options) {
  * @param {Array.<ol.Feature>} inserts The features to insert.
  * @param {Array.<ol.Feature>} updates The features to update.
  * @param {Array.<ol.Feature>} deletes The features to delete.
- * @param {ol.parser.WFSWriteTransactionOptions} options Write options.
+ * @param {olx.parser.WFSWriteTransactionOptions} options Write options.
  * @return {string} A serialized WFS transaction.
  */
 ol.parser.ogc.WFS_v1.prototype.writeTransaction =
diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js
index c6268dd3ec..1a686a9282 100644
--- a/src/ol/proj/proj.js
+++ b/src/ol/proj/proj.js
@@ -58,7 +58,7 @@ ol.METERS_PER_UNIT[ol.proj.Units.METERS] = 1;
 
 /**
  * @constructor
- * @param {ol.ProjectionOptions} options Projection options.
+ * @param {olx.ProjectionOptions} options Projection options.
  * @todo stability experimental
  */
 ol.proj.Projection = function(options) {
@@ -198,14 +198,14 @@ ol.proj.Projection.prototype.setDefaultTileGrid = function(tileGrid) {
  * @constructor
  * @extends {ol.proj.Projection}
  * @param {Proj4js.Proj} proj4jsProj Proj4js projection.
- * @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
+ * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
  * @private
  */
 ol.Proj4jsProjection_ = function(proj4jsProj, options) {
 
   var units = /** @type {ol.proj.Units} */ (proj4jsProj.units);
 
-  var config = /** @type {ol.ProjectionOptions} */ ({
+  var config = /** @type {olx.ProjectionOptions} */ ({
     units: units,
     axisOrientation: proj4jsProj.axis
   });
@@ -491,7 +491,7 @@ ol.proj.get = function(projectionLike) {
 
 
 /**
- * @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
+ * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
  * @private
  * @return {ol.Proj4jsProjection_} Proj4js projection.
  */
@@ -504,7 +504,7 @@ ol.proj.getProj4jsProjectionFromCode_ = function(options) {
     var srsCode = proj4jsProj.srsCode;
     proj4jsProjection = proj4jsProjections[srsCode];
     if (!goog.isDef(proj4jsProjection)) {
-      var config = /** @type {ol.Proj4jsProjectionOptions} */
+      var config = /** @type {olx.Proj4jsProjectionOptions} */
           (goog.object.clone(options));
       config.code = srsCode;
       proj4jsProjection = new ol.Proj4jsProjection_(proj4jsProj, config);
@@ -709,7 +709,7 @@ ol.proj.transformWithProjections =
 
 
 /**
- * @param {ol.Proj4jsProjectionOptions} options Proj4js projection options.
+ * @param {olx.Proj4jsProjectionOptions} options Proj4js projection options.
  * @return {ol.proj.Projection} Proj4js projection.
  * @todo stability experimental
  */
diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js
index 81820341cb..975c471d9f 100644
--- a/src/ol/source/bingmapssource.js
+++ b/src/ol/source/bingmapssource.js
@@ -18,7 +18,7 @@ goog.require('ol.tilegrid.XYZ');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.BingMapsOptions} options Bing Maps options.
+ * @param {olx.source.BingMapsOptions} options Bing Maps options.
  * @todo stability experimental
  */
 ol.source.BingMaps = function(options) {
diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js
index 32c7a1905f..f0e58f115a 100644
--- a/src/ol/source/debugtilesource.js
+++ b/src/ol/source/debugtilesource.js
@@ -85,7 +85,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
 /**
  * @constructor
  * @extends {ol.source.Tile}
- * @param {ol.source.TileDebugOptions} options Debug tile options.
+ * @param {olx.source.TileDebugOptions} options Debug tile options.
  * @todo stability experimental
  */
 ol.source.TileDebug = function(options) {
diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js
index 31b9c1d384..323b749068 100644
--- a/src/ol/source/imagesource.js
+++ b/src/ol/source/imagesource.js
@@ -30,7 +30,7 @@ ol.source.ImageOptions;
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.ImageOptions} options Single image source options.
+ * @param {olx.source.ImageOptions} options Single image source options.
  * @todo stability experimental
  */
 ol.source.Image = function(options) {
diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js
index 8a3cae06ca..43ce4f62bd 100644
--- a/src/ol/source/imagestaticsource.js
+++ b/src/ol/source/imagestaticsource.js
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.ImageStaticOptions} options Options.
+ * @param {olx.source.ImageStaticOptions} options Options.
  * @todo stability experimental
  */
 ol.source.ImageStatic = function(options) {
diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js
index 4dc4226704..6f7d6ddd2a 100644
--- a/src/ol/source/imagewmssource.js
+++ b/src/ol/source/imagewmssource.js
@@ -15,7 +15,7 @@ goog.require('ol.source.wms');
  * @constructor
  * @extends {ol.source.Image}
  * @implements {ol.source.FeatureInfoSource}
- * @param {ol.source.ImageWMSOptions} options Options.
+ * @param {olx.source.ImageWMSOptions} options Options.
  * @todo stability experimental
  */
 ol.source.ImageWMS = function(options) {
@@ -42,11 +42,11 @@ ol.source.ImageWMS = function(options) {
 
   /**
    * @private
-   * @type {ol.source.WMSGetFeatureInfoOptions}
+   * @type {olx.source.WMSGetFeatureInfoOptions}
    */
   this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
       options.getFeatureInfoOptions :
-      /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
+      /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
 
   /**
    * @private
diff --git a/src/ol/source/mapguidesource.js b/src/ol/source/mapguidesource.js
index 974c69b1bc..a8ddc8484b 100644
--- a/src/ol/source/mapguidesource.js
+++ b/src/ol/source/mapguidesource.js
@@ -11,7 +11,7 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.MapGuideOptions} options Options.
+ * @param {olx.source.MapGuideOptions} options Options.
  */
 ol.source.MapGuide = function(options) {
 
diff --git a/src/ol/source/mapquestsource.js b/src/ol/source/mapquestsource.js
index 126072087a..68e11dc08a 100644
--- a/src/ol/source/mapquestsource.js
+++ b/src/ol/source/mapquestsource.js
@@ -10,7 +10,7 @@ goog.require('ol.source.XYZ');
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
+ * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
  * @todo stability experimental
  */
 ol.source.MapQuestOSM = function(opt_options) {
@@ -43,7 +43,7 @@ goog.inherits(ol.source.MapQuestOSM, ol.source.XYZ);
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.MapQuestOptions=} opt_options MapQuest options.
+ * @param {olx.source.MapQuestOptions=} opt_options MapQuest options.
  * @todo stability experimental
  */
 ol.source.MapQuestOpenAerial = function(opt_options) {
diff --git a/src/ol/source/osmsource.js b/src/ol/source/osmsource.js
index 92e13ec6b8..63d57086d9 100644
--- a/src/ol/source/osmsource.js
+++ b/src/ol/source/osmsource.js
@@ -8,7 +8,7 @@ goog.require('ol.source.XYZ');
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.OSMOptions=} opt_options Open Street Map options.
+ * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
  * @todo stability experimental
  */
 ol.source.OSM = function(opt_options) {
diff --git a/src/ol/source/source.js b/src/ol/source/source.js
index 3f5a46d2d1..759c7db73f 100644
--- a/src/ol/source/source.js
+++ b/src/ol/source/source.js
@@ -33,7 +33,7 @@ ol.source.SourceOptions;
 /**
  * @constructor
  * @extends {goog.events.EventTarget}
- * @param {ol.source.SourceOptions} options Source options.
+ * @param {olx.source.SourceOptions} options Source options.
  * @todo stability experimental
  */
 ol.source.Source = function(options) {
diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamensource.js
index 34509ac611..6a269206f7 100644
--- a/src/ol/source/stamensource.js
+++ b/src/ol/source/stamensource.js
@@ -80,7 +80,7 @@ ol.source.StamenProviderConfig = {
 /**
  * @constructor
  * @extends {ol.source.XYZ}
- * @param {ol.source.StamenOptions} options Stamen options.
+ * @param {olx.source.StamenOptions} options Stamen options.
  * @todo stability experimental
  */
 ol.source.Stamen = function(options) {
diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js
index dd9da53a21..532cb0689a 100644
--- a/src/ol/source/tileimagesource.js
+++ b/src/ol/source/tileimagesource.js
@@ -34,7 +34,7 @@ ol.source.TileImageOptions;
 /**
  * @constructor
  * @extends {ol.source.Tile}
- * @param {ol.source.TileImageOptions} options Image tile options.
+ * @param {olx.source.TileImageOptions} options Image tile options.
  * @todo stability experimental
  */
 ol.source.TileImage = function(options) {
diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js
index 81e57f6098..2f3768d1d3 100644
--- a/src/ol/source/tilejsonsource.js
+++ b/src/ol/source/tilejsonsource.js
@@ -40,7 +40,7 @@ goog.exportSymbol('grid', grid);
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.TileJSONOptions} options TileJSON options.
+ * @param {olx.source.TileJSONOptions} options TileJSON options.
  * @todo stability experimental
  */
 ol.source.TileJSON = function(options) {
diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js
index e40c93d937..960603a9ed 100644
--- a/src/ol/source/tilesource.js
+++ b/src/ol/source/tilesource.js
@@ -27,7 +27,7 @@ ol.source.TileOptions;
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.TileOptions} options Tile source options.
+ * @param {olx.source.TileOptions} options Tile source options.
  * @todo stability experimental
  */
 ol.source.Tile = function(options) {
diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js
index 77cba28dc4..d3bbd7c8ce 100644
--- a/src/ol/source/tilewmssource.js
+++ b/src/ol/source/tilewmssource.js
@@ -19,7 +19,7 @@ goog.require('ol.source.wms');
  * @constructor
  * @extends {ol.source.TileImage}
  * @implements {ol.source.FeatureInfoSource}
- * @param {ol.source.TileWMSOptions} options Tile WMS options.
+ * @param {olx.source.TileWMSOptions} options Tile WMS options.
  * @todo stability experimental
  */
 ol.source.TileWMS = function(options) {
@@ -107,11 +107,11 @@ ol.source.TileWMS = function(options) {
 
   /**
    * @private
-   * @type {ol.source.WMSGetFeatureInfoOptions}
+   * @type {olx.source.WMSGetFeatureInfoOptions}
    */
   this.getFeatureInfoOptions_ = goog.isDef(options.getFeatureInfoOptions) ?
       options.getFeatureInfoOptions :
-      /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({});
+      /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({});
 
 };
 goog.inherits(ol.source.TileWMS, ol.source.TileImage);
diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js
index 7e25a17b55..c4a9e3ff4d 100644
--- a/src/ol/source/vectorsource.js
+++ b/src/ol/source/vectorsource.js
@@ -32,7 +32,7 @@ ol.source.VectorLoadState = {
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.VectorOptions=} opt_options Vector source options.
+ * @param {olx.source.VectorOptions=} opt_options Vector source options.
  * @todo stability experimental
  */
 ol.source.Vector = function(opt_options) {
diff --git a/src/ol/source/wmssource.js b/src/ol/source/wmssource.js
index eebba21c2d..5799ebaf69 100644
--- a/src/ol/source/wmssource.js
+++ b/src/ol/source/wmssource.js
@@ -74,7 +74,7 @@ ol.source.wms.getUrl =
 /**
  * @param {string} url URL as provided by the url function.
  * @param {ol.Pixel} pixel Pixel.
- * @param {ol.source.WMSGetFeatureInfoOptions} options Options as defined in the
+ * @param {olx.source.WMSGetFeatureInfoOptions} options Options as defined in the
  *     source.
  * @param {function(string)} success Callback function for successful queries.
  * @param {function()=} opt_error Optional callback function for unsuccessful
@@ -86,9 +86,9 @@ ol.source.wms.getFeatureInfo =
   // closure
   url = url.replace('REQUEST=GetMap', 'REQUEST=GetFeatureInfo')
       .replace(ol.source.wms.regExes.layers, 'LAYERS=$1&QUERY_LAYERS=$1');
-  options = /** @type {ol.source.WMSGetFeatureInfoOptions} */
+  options = /** @type {olx.source.WMSGetFeatureInfoOptions} */
       (goog.isDef(options) ? goog.object.clone(options) : {});
-  var localOptions = /** @type {ol.source.WMSGetFeatureInfoOptions} */ ({
+  var localOptions = /** @type {olx.source.WMSGetFeatureInfoOptions} */ ({
     method: ol.source.WMSGetFeatureInfoMethod.IFRAME,
     params: {}
   });
diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js
index 7136aaa3d2..15e2aae7bb 100644
--- a/src/ol/source/wmtssource.js
+++ b/src/ol/source/wmtssource.js
@@ -28,7 +28,7 @@ ol.source.WMTSRequestEncoding = {
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.WMTSOptions} options WMTS options.
+ * @param {olx.source.WMTSOptions} options WMTS options.
  * @todo stability experimental
  */
 ol.source.WMTS = function(options) {
@@ -237,7 +237,7 @@ ol.source.WMTS.prototype.updateDimensions = function(dimensions) {
 /**
  * @param {Object} wmtsCap An object representing the capabilities document.
  * @param {string} layer The layer identifier.
- * @return {ol.source.WMTSOptions} WMTS source options object.
+ * @return {olx.source.WMTSOptions} WMTS source options object.
  * @todo stability experimental
  */
 ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {
diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js
index baf5b67b3a..b41ff92de5 100644
--- a/src/ol/source/xyzsource.js
+++ b/src/ol/source/xyzsource.js
@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.XYZ');
 /**
  * @constructor
  * @extends {ol.source.TileImage}
- * @param {ol.source.XYZOptions} options XYZ options.
+ * @param {olx.source.XYZOptions} options XYZ options.
  * @todo stability experimental
  */
 ol.source.XYZ = function(options) {
diff --git a/src/ol/style/fillsymbolizer.js b/src/ol/style/fillsymbolizer.js
index 53f428dff3..fca7d3ce9d 100644
--- a/src/ol/style/fillsymbolizer.js
+++ b/src/ol/style/fillsymbolizer.js
@@ -14,7 +14,7 @@ goog.require('ol.style.Symbolizer');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.FillOptions=} opt_options Polygon options.
+ * @param {olx.style.FillOptions=} opt_options Polygon options.
  * @todo stability experimental
  */
 ol.style.Fill = function(opt_options) {
diff --git a/src/ol/style/iconliteral.js b/src/ol/style/iconliteral.js
index 81ee54f326..2613c22c32 100644
--- a/src/ol/style/iconliteral.js
+++ b/src/ol/style/iconliteral.js
@@ -21,7 +21,7 @@ ol.style.IconLiteralOptions;
 /**
  * @constructor
  * @extends {ol.style.PointLiteral}
- * @param {ol.style.IconLiteralOptions} options Icon literal options.
+ * @param {olx.style.IconLiteralOptions} options Icon literal options.
  */
 ol.style.IconLiteral = function(options) {
 
diff --git a/src/ol/style/iconsymbolizer.js b/src/ol/style/iconsymbolizer.js
index b63cd09d05..12e3ab69d7 100644
--- a/src/ol/style/iconsymbolizer.js
+++ b/src/ol/style/iconsymbolizer.js
@@ -14,7 +14,7 @@ goog.require('ol.style.Point');
 /**
  * @constructor
  * @extends {ol.style.Point}
- * @param {ol.style.IconOptions} options Icon options.
+ * @param {olx.style.IconOptions} options Icon options.
  * @todo stability experimental
  */
 ol.style.Icon = function(options) {
diff --git a/src/ol/style/lineliteral.js b/src/ol/style/lineliteral.js
index c13198c630..f9724394d9 100644
--- a/src/ol/style/lineliteral.js
+++ b/src/ol/style/lineliteral.js
@@ -17,7 +17,7 @@ ol.style.LineLiteralOptions;
 /**
  * @constructor
  * @extends {ol.style.Literal}
- * @param {ol.style.LineLiteralOptions} options Line literal options.
+ * @param {olx.style.LineLiteralOptions} options Line literal options.
  */
 ol.style.LineLiteral = function(options) {
   goog.base(this);
diff --git a/src/ol/style/polygonliteral.js b/src/ol/style/polygonliteral.js
index e16c482860..d463b3ec81 100644
--- a/src/ol/style/polygonliteral.js
+++ b/src/ol/style/polygonliteral.js
@@ -19,7 +19,7 @@ ol.style.PolygonLiteralOptions;
 /**
  * @constructor
  * @extends {ol.style.Literal}
- * @param {ol.style.PolygonLiteralOptions} options Polygon literal options.
+ * @param {olx.style.PolygonLiteralOptions} options Polygon literal options.
  */
 ol.style.PolygonLiteral = function(options) {
   goog.base(this);
diff --git a/src/ol/style/rule.js b/src/ol/style/rule.js
index d8234de95b..5fa062f285 100644
--- a/src/ol/style/rule.js
+++ b/src/ol/style/rule.js
@@ -11,7 +11,7 @@ goog.require('ol.style.Symbolizer');
 
 /**
  * @constructor
- * @param {ol.style.RuleOptions} options Rule options.
+ * @param {olx.style.RuleOptions} options Rule options.
  * @todo stability experimental
  */
 ol.style.Rule = function(options) {
diff --git a/src/ol/style/shapeliteral.js b/src/ol/style/shapeliteral.js
index 9879f89946..aabe6c3d96 100644
--- a/src/ol/style/shapeliteral.js
+++ b/src/ol/style/shapeliteral.js
@@ -31,7 +31,7 @@ ol.style.ShapeLiteralOptions;
 /**
  * @constructor
  * @extends {ol.style.PointLiteral}
- * @param {ol.style.ShapeLiteralOptions} options Shape literal options.
+ * @param {olx.style.ShapeLiteralOptions} options Shape literal options.
  */
 ol.style.ShapeLiteral = function(options) {
 
diff --git a/src/ol/style/shapesymbolizer.js b/src/ol/style/shapesymbolizer.js
index f1121fcf0b..ed2845d81a 100644
--- a/src/ol/style/shapesymbolizer.js
+++ b/src/ol/style/shapesymbolizer.js
@@ -17,7 +17,7 @@ goog.require('ol.style.Stroke');
 /**
  * @constructor
  * @extends {ol.style.Point}
- * @param {ol.style.ShapeOptions} options Shape options.
+ * @param {olx.style.ShapeOptions} options Shape options.
  * @todo stability experimental
  */
 ol.style.Shape = function(options) {
diff --git a/src/ol/style/strokesymbolizer.js b/src/ol/style/strokesymbolizer.js
index 9839efb213..9f4e41c6ca 100644
--- a/src/ol/style/strokesymbolizer.js
+++ b/src/ol/style/strokesymbolizer.js
@@ -16,7 +16,7 @@ goog.require('ol.style.Symbolizer');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.StrokeOptions=} opt_options Stroke options.
+ * @param {olx.style.StrokeOptions=} opt_options Stroke options.
  * @todo stability experimental
  */
 ol.style.Stroke = function(opt_options) {
diff --git a/src/ol/style/style.js b/src/ol/style/style.js
index e9bfee8657..4e15db8cf0 100644
--- a/src/ol/style/style.js
+++ b/src/ol/style/style.js
@@ -21,7 +21,7 @@ goog.require('ol.style.TextLiteral');
 
 /**
  * @constructor
- * @param {ol.style.StyleOptions} options Style options.
+ * @param {olx.style.StyleOptions} options Style options.
  * @todo stability experimental
  */
 ol.style.Style = function(options) {
diff --git a/src/ol/style/textliteral.js b/src/ol/style/textliteral.js
index 9f6026c080..e94d0a0f71 100644
--- a/src/ol/style/textliteral.js
+++ b/src/ol/style/textliteral.js
@@ -23,7 +23,7 @@ ol.style.TextLiteralOptions;
 /**
  * @constructor
  * @extends {ol.style.Literal}
- * @param {ol.style.TextLiteralOptions} options Text literal options.
+ * @param {olx.style.TextLiteralOptions} options Text literal options.
  */
 ol.style.TextLiteral = function(options) {
 
diff --git a/src/ol/style/textsymbolizer.js b/src/ol/style/textsymbolizer.js
index 7b2e8e92cd..d2dc3a679d 100644
--- a/src/ol/style/textsymbolizer.js
+++ b/src/ol/style/textsymbolizer.js
@@ -13,7 +13,7 @@ goog.require('ol.style.TextLiteral');
 /**
  * @constructor
  * @extends {ol.style.Symbolizer}
- * @param {ol.style.TextOptions} options Text options.
+ * @param {olx.style.TextOptions} options Text options.
  */
 ol.style.Text = function(options) {
 
diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js
index e079159cd2..08ee4e4614 100644
--- a/src/ol/tilegrid/tilegrid.js
+++ b/src/ol/tilegrid/tilegrid.js
@@ -27,7 +27,7 @@ ol.DEFAULT_MAX_ZOOM = 42;
 
 /**
  * @constructor
- * @param {ol.tilegrid.TileGridOptions} options Tile grid options.
+ * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
  * @todo stability experimental
  */
 ol.tilegrid.TileGrid = function(options) {
diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js
index 108840ecd4..3393aced51 100644
--- a/src/ol/tilegrid/wmtstilegrid.js
+++ b/src/ol/tilegrid/wmtstilegrid.js
@@ -10,7 +10,7 @@ goog.require('ol.tilegrid.TileGrid');
 /**
  * @constructor
  * @extends {ol.tilegrid.TileGrid}
- * @param {ol.tilegrid.WMTSOptions} options WMTS options.
+ * @param {olx.tilegrid.WMTSOptions} options WMTS options.
  * @todo stability experimental
  */
 ol.tilegrid.WMTS = function(options) {
diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js
index aba7b4cc16..6325d3602b 100644
--- a/src/ol/tilegrid/xyztilegrid.js
+++ b/src/ol/tilegrid/xyztilegrid.js
@@ -12,7 +12,7 @@ goog.require('ol.tilegrid.TileGrid');
 /**
  * @constructor
  * @extends {ol.tilegrid.TileGrid}
- * @param {ol.tilegrid.XYZOptions} options XYZ options.
+ * @param {olx.tilegrid.XYZOptions} options XYZ options.
  * @todo stability experimental
  */
 ol.tilegrid.XYZ = function(options) {
diff --git a/src/ol/view2d.js b/src/ol/view2d.js
index e4716f5726..e2c07f90b4 100644
--- a/src/ol/view2d.js
+++ b/src/ol/view2d.js
@@ -84,7 +84,7 @@ ol.View2DProperty = {
  * @implements {ol.IView2D}
  * @implements {ol.IView3D}
  * @extends {ol.View}
- * @param {ol.View2DOptions=} opt_options View2D options.
+ * @param {olx.View2DOptions=} opt_options View2D options.
  * @todo stability experimental
  * @todo observable center {ol.Coordinate} the center of the view
  * @todo observable projection {ol.proj.Projection} the projection of the view
@@ -501,7 +501,7 @@ ol.View2D.prototype.setZoom = function(zoom) {
 
 
 /**
- * @param {ol.View2DOptions} options View2D options.
+ * @param {olx.View2DOptions} options View2D options.
  * @private
  * @return {ol.CenterConstraintType}
  */
@@ -516,7 +516,7 @@ ol.View2D.createCenterConstraint_ = function(options) {
 
 /**
  * @private
- * @param {ol.View2DOptions} options View2D options.
+ * @param {olx.View2DOptions} options View2D options.
  * @return {{constraint: ol.ResolutionConstraintType, maxResolution: number,
  *     minResolution: number}}
  */
@@ -563,7 +563,7 @@ ol.View2D.createResolutionConstraint_ = function(options) {
 
 /**
  * @private
- * @param {ol.View2DOptions} options View2D options.
+ * @param {olx.View2DOptions} options View2D options.
  * @return {ol.RotationConstraintType} Rotation constraint.
  */
 ol.View2D.createRotationConstraint_ = function(options) {