diff --git a/src/ol/Tile.js b/src/ol/Tile.js
index a132a9c55b..a0a22c97a3 100644
--- a/src/ol/Tile.js
+++ b/src/ol/Tile.js
@@ -28,7 +28,7 @@ import EventType from './events/EventType.js';
  * should be requested for the passed tile coordinate.
  *
  * @typedef {function(module:ol/tilecoord~TileCoord, number,
- *           module:ol/proj/Projection~Projection): (string|undefined)} Type
+ *           module:ol/proj/Projection~Projection): (string|undefined)} UrlFunction
  * @api
  */
 
diff --git a/src/ol/source/TileUTFGrid.js b/src/ol/source/TileUTFGrid.js
index 1626db6fee..9c6559731c 100644
--- a/src/ol/source/TileUTFGrid.js
+++ b/src/ol/source/TileUTFGrid.js
@@ -273,7 +273,7 @@ const UTFGrid = function(options) {
 
   /**
    * @private
-   * @type {!module:ol/tileurlfunction~Type}
+   * @type {!module:ol/Tile~UrlFunction}
    */
   this.tileUrlFunction_ = nullTileUrlFunction;
 
diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js
index 97f7fc068d..70f0904957 100644
--- a/src/ol/source/UrlTile.js
+++ b/src/ol/source/UrlTile.js
@@ -41,7 +41,7 @@ const UrlTile = function(options) {
 
   /**
    * @protected
-   * @type {module:ol/tileurlfunction~Type}
+   * @type {module:ol/Tile~UrlFunction}
    */
   this.tileUrlFunction = this.fixedTileUrlFunction ?
     this.fixedTileUrlFunction.bind(this) : nullTileUrlFunction;
@@ -73,7 +73,7 @@ inherits(UrlTile, TileSource);
 
 
 /**
- * @type {module:ol/tileurlfunction~Type|undefined}
+ * @type {module:ol/Tile~UrlFunction|undefined}
  * @protected
  */
 UrlTile.prototype.fixedTileUrlFunction;
@@ -90,7 +90,7 @@ UrlTile.prototype.getTileLoadFunction = function() {
 
 /**
  * Return the tile URL function of the source.
- * @return {module:ol/tileurlfunction~Type} TileUrlFunction
+ * @return {module:ol/Tile~UrlFunction} TileUrlFunction
  * @api
  */
 UrlTile.prototype.getTileUrlFunction = function() {
@@ -149,7 +149,7 @@ UrlTile.prototype.setTileLoadFunction = function(tileLoadFunction) {
 
 /**
  * Set the tile URL function of the source.
- * @param {module:ol/tileurlfunction~Type} tileUrlFunction Tile URL function.
+ * @param {module:ol/Tile~UrlFunction} tileUrlFunction Tile URL function.
  * @param {string=} opt_key Optional new tile key for the source.
  * @api
  */
diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js
index 162b860e02..ba4cd19bba 100644
--- a/src/ol/source/WMTS.js
+++ b/src/ol/source/WMTS.js
@@ -104,7 +104,7 @@ const WMTS = function(options) {
 
   /**
    * @param {string} template Template.
-   * @return {module:ol/tileurlfunction~Type} Tile URL function.
+   * @return {module:ol/Tile~UrlFunction} Tile URL function.
    * @private
    */
   this.createFromWMTSTemplate_ = function(template) {
diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js
index a3663deade..81137404b4 100644
--- a/src/ol/source/Zoomify.js
+++ b/src/ol/source/Zoomify.js
@@ -161,7 +161,7 @@ const Zoomify = function(opt_options) {
 
   /**
    * @param {string} template Template.
-   * @return {module:ol/tileurlfunction~Type} Tile URL function.
+   * @return {module:ol/Tile~UrlFunction} Tile URL function.
    */
   function createFromTemplate(template) {
 
diff --git a/src/ol/tilecoord.js b/src/ol/tilecoord.js
index db357d0c3b..b420ee0a49 100644
--- a/src/ol/tilecoord.js
+++ b/src/ol/tilecoord.js
@@ -97,7 +97,7 @@ export function quadKey(tileCoord) {
 
 /**
  * @param {module:ol/tilecoord~TileCoord} tileCoord Tile coordinate.
- * @param {!module:ol/tilegrid~TileGrid} tileGrid Tile grid.
+ * @param {!module:ol/tilegrid/TileGrid~TileGrid} tileGrid Tile grid.
  * @return {boolean} Tile coordinate is within extent and zoom level range.
  */
 export function withinExtentAndZ(tileCoord, tileGrid) {
diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js
index 92d6536607..cfd35d96e5 100644
--- a/src/ol/tileurlfunction.js
+++ b/src/ol/tileurlfunction.js
@@ -9,7 +9,7 @@ import {hash as tileCoordHash} from './tilecoord.js';
 /**
  * @param {string} template Template.
  * @param {module:ol/tilegrid/TileGrid~TileGrid} tileGrid Tile grid.
- * @return {module:ol/tileurlfunction~Type} Tile URL function.
+ * @return {module:ol/Tile~UrlFunction} Tile URL function.
  */
 export function createFromTemplate(template, tileGrid) {
   const zRegEx = /\{z\}/g;
@@ -49,7 +49,7 @@ export function createFromTemplate(template, tileGrid) {
 /**
  * @param {Array.<string>} templates Templates.
  * @param {module:ol/tilegrid/TileGrid~TileGrid} tileGrid Tile grid.
- * @return {module:ol/tileurlfunction~Type} Tile URL function.
+ * @return {module:ol/Tile~UrlFunction} Tile URL function.
  */
 export function createFromTemplates(templates, tileGrid) {
   const len = templates.length;
@@ -62,8 +62,8 @@ export function createFromTemplates(templates, tileGrid) {
 
 
 /**
- * @param {Array.<module:ol/tileurlfunction~Type>} tileUrlFunctions Tile URL Functions.
- * @return {module:ol/tileurlfunction~Type} Tile URL function.
+ * @param {Array.<module:ol/Tile~UrlFunction>} tileUrlFunctions Tile URL Functions.
+ * @return {module:ol/Tile~UrlFunction} Tile URL function.
  */
 export function createFromTileUrlFunctions(tileUrlFunctions) {
   if (tileUrlFunctions.length === 1) {
diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js
index d23d00afcf..63c73331f6 100644
--- a/src/ol/typedefs.js
+++ b/src/ol/typedefs.js
@@ -377,7 +377,7 @@ ol.SourceTileOptions;
  *            tileGrid: (ol.tilegrid.TileGrid|undefined),
  *            tileLoadFunction: module:ol/Tile~LoadFunction,
  *            tilePixelRatio: (number|undefined),
- *            tileUrlFunction: (module:ol/tileurlfunction~Type|undefined),
+ *            tileUrlFunction: (module:ol/Tile~UrlFunction|undefined),
  *            url: (string|undefined),
  *            urls: (Array.<string>|undefined),
  *            wrapX: (boolean|undefined),