diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js
index ceb5588d04..f2294d2f60 100644
--- a/src/ol/source/bingmapssource.js
+++ b/src/ol/source/bingmapssource.js
@@ -9,14 +9,14 @@ goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.BingMapsOptions} options Bing Maps options.
  */
 ol.source.BingMaps = function(options) {
@@ -48,7 +48,7 @@ ol.source.BingMaps = function(options) {
   }, goog.bind(this.handleImageryMetadataResponse, this));
 
 };
-goog.inherits(ol.source.BingMaps, ol.source.ImageTileSource);
+goog.inherits(ol.source.BingMaps, ol.source.TileImage);
 
 
 /**
diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js
index 6b3904ef20..f26aa9f4b0 100644
--- a/src/ol/source/imagetilesource.js
+++ b/src/ol/source/imagetilesource.js
@@ -1,4 +1,4 @@
-goog.provide('ol.source.ImageTileSource');
+goog.provide('ol.source.TileImage');
 
 goog.require('goog.asserts');
 goog.require('ol.Attribution');
@@ -34,7 +34,7 @@ ol.source.ImageTileOptions;
  * @extends {ol.source.Tile}
  * @param {ol.source.ImageTileOptions} options Image tile options.
  */
-ol.source.ImageTileSource = function(options) {
+ol.source.TileImage = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -67,13 +67,13 @@ ol.source.ImageTileSource = function(options) {
   this.tileCache_ = new ol.TileCache();
 
 };
-goog.inherits(ol.source.ImageTileSource, ol.source.Tile);
+goog.inherits(ol.source.TileImage, ol.source.Tile);
 
 
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.canExpireCache = function() {
+ol.source.TileImage.prototype.canExpireCache = function() {
   return this.tileCache_.canExpireCache();
 };
 
@@ -81,7 +81,7 @@ ol.source.ImageTileSource.prototype.canExpireCache = function() {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) {
+ol.source.TileImage.prototype.expireCache = function(usedTiles) {
   this.tileCache_.expireCache(usedTiles);
 };
 
@@ -89,7 +89,7 @@ ol.source.ImageTileSource.prototype.expireCache = function(usedTiles) {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) {
+ol.source.TileImage.prototype.getTile = function(z, x, y, projection) {
   var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
   if (this.tileCache_.containsKey(tileCoordKey)) {
     return /** @type {!ol.Tile} */ (this.tileCache_.get(tileCoordKey));
@@ -111,7 +111,7 @@ ol.source.ImageTileSource.prototype.getTile = function(z, x, y, projection) {
 /**
  * @inheritDoc
  */
-ol.source.ImageTileSource.prototype.useTile = function(z, x, y) {
+ol.source.TileImage.prototype.useTile = function(z, x, y) {
   var tileCoordKey = ol.TileCoord.getKeyZXY(z, x, y);
   if (this.tileCache_.containsKey(tileCoordKey)) {
     this.tileCache_.get(tileCoordKey);
diff --git a/src/ol/source/tiledwmssource.js b/src/ol/source/tiledwmssource.js
index 6f3b1817cd..59aecaf7f9 100644
--- a/src/ol/source/tiledwmssource.js
+++ b/src/ol/source/tiledwmssource.js
@@ -9,14 +9,14 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.source.FeatureInfoSource');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.source.wms');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @implements {ol.source.FeatureInfoSource}
  * @param {ol.source.TiledWMSOptions} options Tiled WMS options.
  */
@@ -94,7 +94,7 @@ ol.source.TiledWMS = function(options) {
       options.getFeatureInfoOptions : {};
 
 };
-goog.inherits(ol.source.TiledWMS, ol.source.ImageTileSource);
+goog.inherits(ol.source.TiledWMS, ol.source.TileImage);
 
 
 /**
diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js
index 9d01f57acb..337791f970 100644
--- a/src/ol/source/tilejsonsource.js
+++ b/src/ol/source/tilejsonsource.js
@@ -15,7 +15,7 @@ goog.require('ol.TileRange');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
@@ -38,7 +38,7 @@ goog.exportSymbol('grid', grid);
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.TileJSONOptions} options TileJSON options.
  */
 ol.source.TileJSON = function(options) {
@@ -62,7 +62,7 @@ ol.source.TileJSON = function(options) {
   this.deferred_.addCallback(this.handleTileJSONResponse, this);
 
 };
-goog.inherits(ol.source.TileJSON, ol.source.ImageTileSource);
+goog.inherits(ol.source.TileJSON, ol.source.TileImage);
 
 
 /**
diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js
index 12132d7d45..8db43772df 100644
--- a/src/ol/source/wmtssource.js
+++ b/src/ol/source/wmtssource.js
@@ -11,7 +11,7 @@ goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
 goog.require('ol.extent');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.WMTS');
 
 
@@ -27,7 +27,7 @@ ol.source.WMTSRequestEncoding = {
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.WMTSOptions} options WMTS options.
  */
 ol.source.WMTS = function(options) {
@@ -170,7 +170,7 @@ ol.source.WMTS = function(options) {
   });
 
 };
-goog.inherits(ol.source.WMTS, ol.source.ImageTileSource);
+goog.inherits(ol.source.WMTS, ol.source.TileImage);
 
 
 /**
diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyzsource.js
index 5c8040e714..0711564798 100644
--- a/src/ol/source/xyzsource.js
+++ b/src/ol/source/xyzsource.js
@@ -6,7 +6,7 @@ goog.require('ol.Projection');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
 goog.require('ol.proj');
-goog.require('ol.source.ImageTileSource');
+goog.require('ol.source.TileImage');
 goog.require('ol.tilegrid.XYZ');
 
 
@@ -28,7 +28,7 @@ ol.source.XYZOptions;
 
 /**
  * @constructor
- * @extends {ol.source.ImageTileSource}
+ * @extends {ol.source.TileImage}
  * @param {ol.source.XYZOptions} options XYZ options.
  */
 ol.source.XYZ = function(options) {
@@ -72,4 +72,4 @@ ol.source.XYZ = function(options) {
   });
 
 };
-goog.inherits(ol.source.XYZ, ol.source.ImageTileSource);
+goog.inherits(ol.source.XYZ, ol.source.TileImage);
diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js
index 4ba3922ddf..d2d348a7e0 100644
--- a/src/ol/tileurlfunction.js
+++ b/src/ol/tileurlfunction.js
@@ -8,7 +8,7 @@ goog.require('ol.extent');
 
 
 /**
- * @typedef {function(this: ol.source.ImageTileSource, ol.TileCoord,
+ * @typedef {function(this: ol.source.TileImage, ol.TileCoord,
  *     ol.Projection): (string|undefined)}
  */
 ol.TileUrlFunctionType;
@@ -21,7 +21,7 @@ ol.TileUrlFunctionType;
 ol.TileUrlFunction.createFromTemplate = function(template) {
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -58,7 +58,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
   }
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -78,7 +78,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
 /**
  * @param {string} baseUrl Base URL (may have query data).
  * @param {Object.<string,*>} params to encode in the url.
- * @param {function(this: ol.source.ImageTileSource, string, Object.<string,*>,
+ * @param {function(this: ol.source.TileImage, string, Object.<string,*>,
  *     ol.Extent, ol.Size, ol.Projection)} paramsFunction params function.
  * @return {ol.TileUrlFunctionType} Tile URL function.
  */
@@ -87,7 +87,7 @@ ol.TileUrlFunction.createFromParamsFunction =
   var tmpExtent = ol.extent.createEmpty();
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.
@@ -110,7 +110,7 @@ ol.TileUrlFunction.createFromParamsFunction =
 
 
 /**
- * @this {ol.source.ImageTileSource}
+ * @this {ol.source.TileImage}
  * @param {ol.TileCoord} tileCoord Tile coordinate.
  * @param {ol.Projection} projection Projection.
  * @return {string|undefined} Tile URL.
@@ -131,7 +131,7 @@ ol.TileUrlFunction.withTileCoordTransform =
   var tmpTileCoord = new ol.TileCoord(0, 0, 0);
   return (
       /**
-       * @this {ol.source.ImageTileSource}
+       * @this {ol.source.TileImage}
        * @param {ol.TileCoord} tileCoord Tile Coordinate.
        * @param {ol.Projection} projection Projection.
        * @return {string|undefined} Tile URL.