diff --git a/src/ol/control/Control.js b/src/ol/control/Control.js
index 9a5597a22f..2d7d5926a6 100644
--- a/src/ol/control/Control.js
+++ b/src/ol/control/Control.js
@@ -39,14 +39,14 @@ import {listen, unlistenByKey} from '../events.js';
  *
  * The main advantage of having this as a control rather than a simple separate
  * DOM element is that preventing propagation is handled for you. Controls
- * will also be `ol.Object`s in a `ol.Collection`, so you can use their
+ * will also be `module:ol/Object~BaseObject`s in a `ol.Collection`, so you can use their
  * methods.
  *
  * You can also extend this base for your own control class. See
  * examples/custom-controls for an example of how to do this.
  *
  * @constructor
- * @extends {ol.Object}
+ * @extends {module:ol/Object~BaseObject}
  * @implements {oli.control.Control}
  * @param {module:ol/control/Control~Options} options Control options.
  * @api
diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js
index 3d0ea760c3..ac9eaae772 100644
--- a/src/ol/control/OverviewMap.js
+++ b/src/ol/control/OverviewMap.js
@@ -270,7 +270,7 @@ OverviewMap.prototype.setMap = function(map) {
 
 /**
  * Handle map property changes.  This only deals with changes to the map's view.
- * @param {ol.Object.Event} event The propertychange event.
+ * @param {module:ol/Object~BaseObject.Event} event The propertychange event.
  * @private
  */
 OverviewMap.prototype.handleMapPropertyChange_ = function(event) {
diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js
index cdcb3f0b02..d7027d8acf 100644
--- a/src/ol/geom/Geometry.js
+++ b/src/ol/geom/Geometry.js
@@ -21,7 +21,7 @@ import {create as createTransform, compose as composeTransform} from '../transfo
  *
  * @constructor
  * @abstract
- * @extends {ol.Object}
+ * @extends {module:ol/Object~BaseObject}
  * @api
  */
 const Geometry = function() {
diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js
index 7f1ef3f412..c2593eaf90 100644
--- a/src/ol/layer/Base.js
+++ b/src/ol/layer/Base.js
@@ -12,12 +12,12 @@ import {assign} from '../obj.js';
  * Abstract base class; normally only used for creating subclasses and not
  * instantiated in apps.
  * Note that with `ol.layer.Base` and all its subclasses, any property set in
- * the options is set as a {@link ol.Object} property on the layer object, so
+ * the options is set as a {@link module:ol/Object~BaseObject} property on the layer object, so
  * is observable, and has get/set accessors.
  *
  * @constructor
  * @abstract
- * @extends {ol.Object}
+ * @extends {module:ol/Object~BaseObject}
  * @param {olx.layer.BaseOptions} options Layer options.
  * @api
  */
diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js
index ec8474503e..17e2a48dd2 100644
--- a/src/ol/layer/Heatmap.js
+++ b/src/ol/layer/Heatmap.js
@@ -34,7 +34,7 @@ const DEFAULT_GRADIENT = ['#00f', '#0ff', '#0f0', '#ff0', '#f00'];
 /**
  * @classdesc
  * Layer for rendering vector data as a heatmap.
- * Note that any property set in the options is set as a {@link ol.Object}
+ * Note that any property set in the options is set as a {@link module:ol/Object~BaseObject}
  * property on the layer object; for example, setting `title: 'My Title'` in the
  * options means that `title` is observable, and has get/set accessors.
  *
diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js
index 782a5c3639..ae762793ff 100644
--- a/src/ol/layer/Image.js
+++ b/src/ol/layer/Image.js
@@ -9,7 +9,7 @@ import Layer from '../layer/Layer.js';
  * @classdesc
  * Server-rendered images that are available for arbitrary extents and
  * resolutions.
- * Note that any property set in the options is set as a {@link ol.Object}
+ * Note that any property set in the options is set as a {@link module:ol/Object~BaseObject}
  * property on the layer object; for example, setting `title: 'My Title'` in the
  * options means that `title` is observable, and has get/set accessors.
  *
diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js
index f0e0d11f66..0ca438faf2 100644
--- a/src/ol/layer/Tile.js
+++ b/src/ol/layer/Tile.js
@@ -11,7 +11,7 @@ import {assign} from '../obj.js';
  * @classdesc
  * For layer sources that provide pre-rendered, tiled images in grids that are
  * organized by zoom levels for specific resolutions.
- * Note that any property set in the options is set as a {@link ol.Object}
+ * Note that any property set in the options is set as a {@link module:ol/Object~BaseObject}
  * property on the layer object; for example, setting `title: 'My Title'` in the
  * options means that `title` is observable, and has get/set accessors.
  *
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index bd7a66de7e..842303e128 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -21,7 +21,7 @@ const Property = {
 /**
  * @classdesc
  * Vector data that is rendered client-side.
- * Note that any property set in the options is set as a {@link ol.Object}
+ * Note that any property set in the options is set as a {@link module:ol/Object~BaseObject}
  * property on the layer object; for example, setting `title: 'My Title'` in the
  * options means that `title` is observable, and has get/set accessors.
  *
diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js
index 9cf9d95f09..91cec5a911 100644
--- a/src/ol/layer/VectorTile.js
+++ b/src/ol/layer/VectorTile.js
@@ -12,7 +12,7 @@ import {assign} from '../obj.js';
 /**
  * @classdesc
  * Layer for vector tile data that is rendered client-side.
- * Note that any property set in the options is set as a {@link ol.Object}
+ * Note that any property set in the options is set as a {@link module:ol/Object~BaseObject}
  * property on the layer object; for example, setting `title: 'My Title'` in the
  * options means that `title` is observable, and has get/set accessors.
  *
diff --git a/src/ol/source/Source.js b/src/ol/source/Source.js
index 43e07bb0ea..d644c0f11d 100644
--- a/src/ol/source/Source.js
+++ b/src/ol/source/Source.js
@@ -18,7 +18,7 @@ import SourceState from '../source/State.js';
  *
  * @constructor
  * @abstract
- * @extends {ol.Object}
+ * @extends {module:ol/Object~BaseObject}
  * @param {ol.SourceSourceOptions} options Source options.
  * @api
  */