diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js
index bc3ee50d9c..30b39fe980 100644
--- a/src/ol/layer/tilelayer.js
+++ b/src/ol/layer/tilelayer.js
@@ -1,7 +1,7 @@
 goog.provide('ol.layer.TileLayer');
 
 goog.require('ol.layer.Layer');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 
 
 /**
@@ -42,10 +42,10 @@ goog.exportProperty(
 
 
 /**
- * @return {ol.source.TileSource} Source.
+ * @return {ol.source.Tile} Source.
  */
 ol.layer.TileLayer.prototype.getTileSource = function() {
-  return /** @type {ol.source.TileSource} */ (this.getSource());
+  return /** @type {ol.source.Tile} */ (this.getSource());
 };
 
 
diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js
index 94605f5c3d..c33e0770ea 100644
--- a/src/ol/renderer/layerrenderer.js
+++ b/src/ol/renderer/layerrenderer.js
@@ -10,7 +10,7 @@ goog.require('ol.TileState');
 goog.require('ol.layer.Layer');
 goog.require('ol.layer.LayerState');
 goog.require('ol.source.Source');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 
 
 
@@ -121,7 +121,7 @@ ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() {
 
 /**
  * @param {ol.FrameState} frameState Frame state.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @protected
  */
 ol.renderer.Layer.prototype.scheduleExpireCache =
@@ -169,7 +169,7 @@ ol.renderer.Layer.prototype.updateLogos = function(frameState, source) {
 
 /**
  * @param {Object.<string, Object.<string, ol.TileRange>>} usedTiles Used tiles.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {number} z Z.
  * @param {ol.TileRange} tileRange Tile range.
  * @protected
@@ -195,7 +195,7 @@ ol.renderer.Layer.prototype.updateUsedTiles =
 /**
  * @param {function(ol.Tile): boolean} isLoadedFunction Function to
  *     determine if the tile is loaded.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {ol.Projection} projection Projection.
  * @protected
  * @return {function(number, number, number): ol.Tile} Returns a tile if it is
@@ -241,7 +241,7 @@ ol.renderer.Layer.prototype.snapCenterToPixel =
  *   discarded by the tile queue
  * - enqueues missing tiles
  * @param {ol.FrameState} frameState Frame state.
- * @param {ol.source.TileSource} tileSource Tile source.
+ * @param {ol.source.Tile} tileSource Tile source.
  * @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
  * @param {ol.Projection} projection Projection.
  * @param {ol.Extent} extent Extent.
diff --git a/src/ol/source/debugtilesource.js b/src/ol/source/debugtilesource.js
index ad6e0e0e9b..47354b994c 100644
--- a/src/ol/source/debugtilesource.js
+++ b/src/ol/source/debugtilesource.js
@@ -7,7 +7,7 @@ goog.require('ol.Tile');
 goog.require('ol.TileCache');
 goog.require('ol.TileCoord');
 goog.require('ol.TileState');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');
 
 
@@ -83,7 +83,7 @@ ol.DebugTile_.prototype.getImage = function(opt_context) {
 
 /**
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
  * @param {ol.source.DebugTileSourceOptions} options Debug tile options.
  */
 ol.source.DebugTileSource = function(options) {
@@ -102,7 +102,7 @@ ol.source.DebugTileSource = function(options) {
   this.tileCache_ = new ol.TileCache();
 
 };
-goog.inherits(ol.source.DebugTileSource, ol.source.TileSource);
+goog.inherits(ol.source.DebugTileSource, ol.source.Tile);
 
 
 /**
diff --git a/src/ol/source/imagetilesource.js b/src/ol/source/imagetilesource.js
index d20b478166..6b3904ef20 100644
--- a/src/ol/source/imagetilesource.js
+++ b/src/ol/source/imagetilesource.js
@@ -11,7 +11,7 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileState');
 goog.require('ol.TileUrlFunction');
 goog.require('ol.TileUrlFunctionType');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');
 
 
@@ -31,7 +31,7 @@ ol.source.ImageTileOptions;
 
 /**
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
  * @param {ol.source.ImageTileOptions} options Image tile options.
  */
 ol.source.ImageTileSource = function(options) {
@@ -67,7 +67,7 @@ ol.source.ImageTileSource = function(options) {
   this.tileCache_ = new ol.TileCache();
 
 };
-goog.inherits(ol.source.ImageTileSource, ol.source.TileSource);
+goog.inherits(ol.source.ImageTileSource, ol.source.Tile);
 
 
 /**
diff --git a/src/ol/source/tilesource.exports b/src/ol/source/tilesource.exports
index c8077e23d9..fe7587ebea 100644
--- a/src/ol/source/tilesource.exports
+++ b/src/ol/source/tilesource.exports
@@ -1,2 +1,2 @@
-@exportSymbol ol.source.TileSource
-@exportProperty ol.source.TileSource.prototype.getTileGrid
+@exportSymbol ol.source.Tile
+@exportProperty ol.source.Tile.prototype.getTileGrid
diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js
index c3ab1863d1..2f05579f65 100644
--- a/src/ol/source/tilesource.js
+++ b/src/ol/source/tilesource.js
@@ -1,5 +1,5 @@
-goog.provide('ol.source.TileSource');
-goog.provide('ol.source.TileSourceOptions');
+goog.provide('ol.source.Tile');
+goog.provide('ol.source.TileOptions');
 
 goog.require('goog.functions');
 goog.require('ol.Attribution');
@@ -19,16 +19,16 @@ goog.require('ol.tilegrid.TileGrid');
  *            projection: ol.ProjectionLike,
  *            tileGrid: (ol.tilegrid.TileGrid|undefined)}}
  */
-ol.source.TileSourceOptions;
+ol.source.TileOptions;
 
 
 
 /**
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.TileSourceOptions} options Tile source options.
+ * @param {ol.source.TileOptions} options Tile source options.
  */
-ol.source.TileSource = function(options) {
+ol.source.Tile = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -50,19 +50,19 @@ ol.source.TileSource = function(options) {
   this.tileGrid = goog.isDef(options.tileGrid) ? options.tileGrid : null;
 
 };
-goog.inherits(ol.source.TileSource, ol.source.Source);
+goog.inherits(ol.source.Tile, ol.source.Source);
 
 
 /**
  * @return {boolean} Can expire cache.
  */
-ol.source.TileSource.prototype.canExpireCache = goog.functions.FALSE;
+ol.source.Tile.prototype.canExpireCache = goog.functions.FALSE;
 
 
 /**
  * @param {Object.<string, ol.TileRange>} usedTiles Used tiles.
  */
-ol.source.TileSource.prototype.expireCache = goog.abstractMethod;
+ol.source.Tile.prototype.expireCache = goog.abstractMethod;
 
 
 /**
@@ -78,7 +78,7 @@ ol.source.TileSource.prototype.expireCache = goog.abstractMethod;
  * @param {ol.TileRange} tileRange Tile range.
  * @return {boolean} The tile range is fully covered with loaded tiles.
  */
-ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ,
+ol.source.Tile.prototype.findLoadedTiles = function(loadedTilesByZ,
     getTileIfLoaded, z, tileRange) {
   // FIXME this could be more efficient about filling partial holes
   var fullyCovered = true;
@@ -107,7 +107,7 @@ ol.source.TileSource.prototype.findLoadedTiles = function(loadedTilesByZ,
 /**
  * @return {boolean} Opaque.
  */
-ol.source.TileSource.prototype.getOpaque = function() {
+ol.source.Tile.prototype.getOpaque = function() {
   return this.opaque_;
 };
 
@@ -115,7 +115,7 @@ ol.source.TileSource.prototype.getOpaque = function() {
 /**
  * @inheritDoc
  */
-ol.source.TileSource.prototype.getResolutions = function() {
+ol.source.Tile.prototype.getResolutions = function() {
   return this.tileGrid.getResolutions();
 };
 
@@ -127,13 +127,13 @@ ol.source.TileSource.prototype.getResolutions = function() {
  * @param {ol.Projection=} opt_projection Projection.
  * @return {!ol.Tile} Tile.
  */
-ol.source.TileSource.prototype.getTile = goog.abstractMethod;
+ol.source.Tile.prototype.getTile = goog.abstractMethod;
 
 
 /**
  * @return {ol.tilegrid.TileGrid} Tile grid.
  */
-ol.source.TileSource.prototype.getTileGrid = function() {
+ol.source.Tile.prototype.getTileGrid = function() {
   return this.tileGrid;
 };
 
@@ -144,4 +144,4 @@ ol.source.TileSource.prototype.getTileGrid = function() {
  * @param {number} x Tile coordinate x.
  * @param {number} y Tile coordinate y.
  */
-ol.source.TileSource.prototype.useTile = goog.nullFunction;
+ol.source.Tile.prototype.useTile = goog.nullFunction;
diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tilesource.test.js
index 2aaac416e4..c080faa249 100644
--- a/test/spec/ol/source/tilesource.test.js
+++ b/test/spec/ol/source/tilesource.test.js
@@ -1,14 +1,14 @@
 goog.provide('ol.test.source.TileSource');
 
-describe('ol.source.TileSource', function() {
+describe('ol.source.Tile', function() {
 
   describe('constructor', function() {
     it('returns a tile source', function() {
-      var source = new ol.source.TileSource({
+      var source = new ol.source.Tile({
         projection: ol.proj.get('EPSG:4326')
       });
       expect(source).to.be.a(ol.source.Source);
-      expect(source).to.be.a(ol.source.TileSource);
+      expect(source).to.be.a(ol.source.Tile);
     });
   });
 
@@ -188,7 +188,7 @@ describe('ol.source.TileSource', function() {
  * 256x256 tiles.
  *
  * @constructor
- * @extends {ol.source.TileSource}
+ * @extends {ol.source.Tile}
  * @param {Object.<string, boolean>} loaded Lookup of already loaded tiles.
  */
 ol.test.source.MockTileSource = function(loaded) {
@@ -213,7 +213,7 @@ ol.test.source.MockTileSource = function(loaded) {
   this.loaded_ = loaded;
 
 };
-goog.inherits(ol.test.source.MockTileSource, ol.source.TileSource);
+goog.inherits(ol.test.source.MockTileSource, ol.source.Tile);
 
 
 /**
@@ -231,7 +231,7 @@ describe('ol.test.source.MockTileSource', function() {
   describe('constructor', function() {
     it('creates a tile source', function() {
       var source = new ol.test.source.MockTileSource({});
-      expect(source).to.be.a(ol.source.TileSource);
+      expect(source).to.be.a(ol.source.Tile);
       expect(source).to.be.a(ol.test.source.MockTileSource);
     });
   });
@@ -270,5 +270,5 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileState');
 goog.require('ol.proj');
 goog.require('ol.source.Source');
-goog.require('ol.source.TileSource');
+goog.require('ol.source.Tile');
 goog.require('ol.tilegrid.TileGrid');