diff --git a/examples/animation.js b/examples/animation.js
index 5b8d6d6d71..a3cf25739e 100644
--- a/examples/animation.js
+++ b/examples/animation.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.animation');
 goog.require('ol.easing');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
@@ -23,7 +23,7 @@ var view = new ol.View2D({
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: 4,
       source: new ol.source.OSM()
     })
diff --git a/examples/bind-input.js b/examples/bind-input.js
index cd64cb94f5..dcce625a99 100644
--- a/examples/bind-input.js
+++ b/examples/bind-input.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 goog.require('ol.webgl.SUPPORTED');
 
@@ -19,7 +19,7 @@ if (!ol.webgl.SUPPORTED) {
   info.style.display = '';
 }
 
-var layer = new ol.layer.TileLayer({
+var layer = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
 var map = new ol.Map({
diff --git a/examples/bing-maps.js b/examples/bing-maps.js
index 0f117af583..07f9893697 100644
--- a/examples/bing-maps.js
+++ b/examples/bing-maps.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
 
@@ -9,7 +9,7 @@ goog.require('ol.source.BingMaps');
 var styles = ['Road', 'Aerial', 'AerialWithLabels'];
 var layers = [];
 for (var i = 0; i < styles.length; ++i) {
-  layers.push(new ol.layer.TileLayer({
+  layers.push(new ol.layer.Tile({
     visible: false,
     preload: Infinity,
     source: new ol.source.BingMaps({
diff --git a/examples/brightness-contrast.js b/examples/brightness-contrast.js
index 69dec11a95..4a0129c952 100644
--- a/examples/brightness-contrast.js
+++ b/examples/brightness-contrast.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.webgl.SUPPORTED');
 
@@ -22,7 +22,7 @@ if (!ol.webgl.SUPPORTED) {
    */
   info.style.display = '';
 } else {
-  var layer = new ol.layer.TileLayer({
+  var layer = new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   });
 
diff --git a/examples/canvas-tiles.js b/examples/canvas-tiles.js
index 0a14f225f6..40182fd361 100644
--- a/examples/canvas-tiles.js
+++ b/examples/canvas-tiles.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 goog.require('ol.source.TileDebug');
@@ -10,10 +10,10 @@ goog.require('ol.tilegrid.XYZ');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileDebug({
         projection: 'EPSG:3857',
         tileGrid: new ol.tilegrid.XYZ({
diff --git a/examples/custom-controls.js b/examples/custom-controls.js
index a8348f4578..9672475afb 100644
--- a/examples/custom-controls.js
+++ b/examples/custom-controls.js
@@ -4,7 +4,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.Control');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -67,7 +67,7 @@ var map = new ol.Map({
     new app.RotateNorthControl()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/device-orientation.js b/examples/device-orientation.js
index 8e5b5b7f49..b464d2e958 100644
--- a/examples/device-orientation.js
+++ b/examples/device-orientation.js
@@ -3,12 +3,12 @@ goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/drag-rotate-and-zoom.js b/examples/drag-rotate-and-zoom.js
index bee87629eb..328b2a817d 100644
--- a/examples/drag-rotate-and-zoom.js
+++ b/examples/drag-rotate-and-zoom.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
@@ -12,7 +12,7 @@ var map = new ol.Map({
     new ol.interaction.DragRotateAndZoom()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     })
   ],
diff --git a/examples/epsg-4326.js b/examples/epsg-4326.js
index 530a00a0ff..9a88a4c3bc 100644
--- a/examples/epsg-4326.js
+++ b/examples/epsg-4326.js
@@ -4,12 +4,12 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.control.ScaleLineUnits');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.TileWMS({
       url: 'http://vmap0.tiles.osgeo.org/wms/vmap0',
       params: {
diff --git a/examples/export-map.js b/examples/export-map.js
index d5239521b7..cd3d87d9f3 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/full-screen-drag-rotate-and-zoom.js b/examples/full-screen-drag-rotate-and-zoom.js
index 74fd946b5f..5191a41be4 100644
--- a/examples/full-screen-drag-rotate-and-zoom.js
+++ b/examples/full-screen-drag-rotate-and-zoom.js
@@ -5,7 +5,7 @@ goog.require('ol.control');
 goog.require('ol.control.FullScreen');
 goog.require('ol.interaction');
 goog.require('ol.interaction.DragRotateAndZoom');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -17,7 +17,7 @@ var map = new ol.Map({
     new ol.interaction.DragRotateAndZoom()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Aerial'
diff --git a/examples/full-screen.js b/examples/full-screen.js
index 4d5c86259a..67868b34d1 100644
--- a/examples/full-screen.js
+++ b/examples/full-screen.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.FullScreen');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -17,7 +17,7 @@ var map = new ol.Map({
     new ol.control.FullScreen()
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Aerial'
diff --git a/examples/geolocation.js b/examples/geolocation.js
index e3b1263130..4987b38c2b 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -4,13 +4,13 @@ goog.require('ol.Overlay');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/getfeatureinfo.js b/examples/getfeatureinfo.js
index d310b5804e..28b289d9b4 100644
--- a/examples/getfeatureinfo.js
+++ b/examples/getfeatureinfo.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.source.TileWMS');
@@ -10,7 +10,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
 
-var wms = new ol.layer.TileLayer({
+var wms = new ol.layer.Tile({
   source: new ol.source.TileWMS({
     url: 'http://demo.opengeo.org/geoserver/wms',
     params: {'LAYERS': 'ne:ne'}
diff --git a/examples/gml.js b/examples/gml.js
index 575a07d653..d36b2fb8ad 100644
--- a/examples/gml.js
+++ b/examples/gml.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.ogc.GML_v3');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -10,7 +10,7 @@ goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 
diff --git a/examples/gpx.js b/examples/gpx.js
index 28e3c05c43..bf0dbcff35 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GPX');
 goog.require('ol.source.OSM');
 goog.require('ol.source.Vector');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.OSM()
 });
 
diff --git a/examples/hue-saturation.js b/examples/hue-saturation.js
index 5994978786..db601aa679 100644
--- a/examples/hue-saturation.js
+++ b/examples/hue-saturation.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
 goog.require('ol.webgl.SUPPORTED');
@@ -23,7 +23,7 @@ if (!ol.webgl.SUPPORTED) {
    */
   info.style.display = '';
 } else {
-  var layer = new ol.layer.TileLayer({
+  var layer = new ol.layer.Tile({
     source: new ol.source.BingMaps({
       key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
       style: 'Aerial'
diff --git a/examples/icon.js b/examples/icon.js
index 071dd10a16..479cde5dfb 100644
--- a/examples/icon.js
+++ b/examples/icon.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.Overlay');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.source.TileJSON');
@@ -11,7 +11,7 @@ goog.require('ol.style.Icon');
 goog.require('ol.style.Style');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.TileJSON({
     url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.jsonp'
   })
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index b568194241..c1bc43ce6e 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
 goog.require('ol.source.Stamen');
@@ -38,7 +38,7 @@ var vector = new ol.layer.Vector({
   style: style
 });
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.Stamen({
     layer: 'toner'
   })
diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js
index 530e4b32fc..b768552986 100644
--- a/examples/kml-timezones.js
+++ b/examples/kml-timezones.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
 goog.require('ol.source.Stamen');
@@ -60,7 +60,7 @@ var vector = new ol.layer.Vector({
   style: style
 });
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.Stamen({
     layer: 'toner'
   })
diff --git a/examples/kml.js b/examples/kml.js
index 1ce37d75d3..7e0fce8da3 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.KML');
 goog.require('ol.source.TileWMS');
 goog.require('ol.source.Vector');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.TileWMS({
     url: 'http://vmap0.tiles.osgeo.org/wms/vmap0',
     crossOrigin: null,
diff --git a/examples/layer-group.js b/examples/layer-group.js
index 11134d6b49..61861b4f01 100644
--- a/examples/layer-group.js
+++ b/examples/layer-group.js
@@ -3,25 +3,25 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.dom.Input');
 goog.require('ol.layer.Group');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.TileJSON');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     }), new ol.layer.Group({
       layers: [
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.TileJSON({
             url: 'http://api.tiles.mapbox.com/v3/' +
                 'mapbox.20110804-hoa-foodinsecurity-3month.jsonp',
             crossOrigin: 'anonymous'
           })
         }),
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.TileJSON({
             url: 'http://api.tiles.mapbox.com/v3/' +
                 'mapbox.world-borders-light.jsonp',
diff --git a/examples/localized-openstreetmap.js b/examples/localized-openstreetmap.js
index 21571eb09a..a640c42e41 100644
--- a/examples/localized-openstreetmap.js
+++ b/examples/localized-openstreetmap.js
@@ -2,13 +2,13 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM({
         attributions: [
           new ol.Attribution({
diff --git a/examples/mapquest.js b/examples/mapquest.js
index beeae978b0..9a0dd92920 100644
--- a/examples/mapquest.js
+++ b/examples/mapquest.js
@@ -1,14 +1,14 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOSM()
     })
   ],
diff --git a/examples/mobile-full-screen.js b/examples/mobile-full-screen.js
index e7b3a67102..01a7343b0d 100644
--- a/examples/mobile-full-screen.js
+++ b/examples/mobile-full-screen.js
@@ -2,7 +2,7 @@ goog.require('ol.Geolocation');
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
@@ -13,7 +13,7 @@ var view = new ol.View2D({
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
         style: 'Road'
diff --git a/examples/mouse-position.js b/examples/mouse-position.js
index 183bab47fd..998d37edd5 100644
--- a/examples/mouse-position.js
+++ b/examples/mouse-position.js
@@ -5,7 +5,7 @@ goog.require('ol.control');
 goog.require('ol.control.MousePosition');
 goog.require('ol.coordinate');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 
@@ -22,7 +22,7 @@ var mousePositionControl = new ol.control.MousePosition({
 var map = new ol.Map({
   controls: ol.control.defaults().extend([mousePositionControl]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/navigation-controls.js b/examples/navigation-controls.js
index a4ba76b347..4e88e5026d 100644
--- a/examples/navigation-controls.js
+++ b/examples/navigation-controls.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ZoomToExtent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -19,7 +19,7 @@ var map = new ol.Map({
     })
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/overlay.js b/examples/overlay.js
index bd052fc983..9036bb59f4 100644
--- a/examples/overlay.js
+++ b/examples/overlay.js
@@ -3,12 +3,12 @@ goog.require('ol.Overlay');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.coordinate');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
-var layer = new ol.layer.TileLayer({
+var layer = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 
diff --git a/examples/popup.js b/examples/popup.js
index bc002694c0..f2fde05aa0 100644
--- a/examples/popup.js
+++ b/examples/popup.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.Overlay');
 goog.require('ol.View2D');
 goog.require('ol.coordinate');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.TileJSON');
 
@@ -39,7 +39,7 @@ var overlay = new ol.Overlay({
  */
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/' +
             'mapbox.natural-earth-hypso-bathy.jsonp',
diff --git a/examples/preload.js b/examples/preload.js
index 7af4c57970..8f3b8b1725 100644
--- a/examples/preload.js
+++ b/examples/preload.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.BingMaps');
 
 
 var map1 = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: Infinity,
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
@@ -25,7 +25,7 @@ var map1 = new ol.Map({
 
 var map2 = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       preload: 0, // default value
       source: new ol.source.BingMaps({
         key: 'Ar33pRUvQOdESG8m_T15MUmNz__E1twPo42bFx9jvdDePhX0PNgAcEm44OVTS7tt',
diff --git a/examples/rotation.js b/examples/rotation.js
index 20e4e741cd..e274c098e3 100644
--- a/examples/rotation.js
+++ b/examples/rotation.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/scale-line.js b/examples/scale-line.js
index 4b543e19c7..c1437d7516 100644
--- a/examples/scale-line.js
+++ b/examples/scale-line.js
@@ -4,7 +4,7 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.dom.Input');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
@@ -15,7 +15,7 @@ var map = new ol.Map({
     scaleLineControl
   ]),
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/select-features.js b/examples/select-features.js
index 84d788986e..09166ff064 100644
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.interaction');
 goog.require('ol.interaction.Select');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.ogc.GML_v3');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -13,7 +13,7 @@ goog.require('ol.style.Rule');
 goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 
diff --git a/examples/semi-transparent-layer.js b/examples/semi-transparent-layer.js
index 0125113b0f..ece1ec4b69 100644
--- a/examples/semi-transparent-layer.js
+++ b/examples/semi-transparent-layer.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.TileJSON');
@@ -9,10 +9,10 @@ goog.require('ol.source.TileJSON');
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/mapbox.va-quake-aug.jsonp',
         crossOrigin: 'anonymous'
diff --git a/examples/side-by-side.js b/examples/side-by-side.js
index 8c9adb9cae..7e513999e1 100644
--- a/examples/side-by-side.js
+++ b/examples/side-by-side.js
@@ -1,14 +1,14 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.webgl.SUPPORTED');
 
 
 var domMap = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.MapQuestOpenAerial()
     })
   ],
diff --git a/examples/simple.js b/examples/simple.js
index b1335ef4a8..d11dfd2633 100644
--- a/examples/simple.js
+++ b/examples/simple.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/stamen.js b/examples/stamen.js
index 4a58cc6ce1..7734edba25 100644
--- a/examples/stamen.js
+++ b/examples/stamen.js
@@ -1,19 +1,19 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.Stamen');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.Stamen({
         layer: 'watercolor'
       })
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.Stamen({
         layer: 'terrain-labels'
       })
diff --git a/examples/teleport.js b/examples/teleport.js
index c6b942bd12..42c6542e88 100644
--- a/examples/teleport.js
+++ b/examples/teleport.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.OSM');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM()
     })
   ],
diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js
index 47fe7be271..c98b542d7b 100644
--- a/examples/ten-thousand-points.js
+++ b/examples/ten-thousand-points.js
@@ -5,7 +5,7 @@ goog.require('ol.control');
 goog.require('ol.control.MousePosition');
 goog.require('ol.geom2.LineStringCollection');
 goog.require('ol.geom2.PointCollection');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.VectorLayer2');
 goog.require('ol.source.OSM');
 goog.require('ol.source.VectorSource2');
@@ -56,7 +56,7 @@ if (!ol.webgl.SUPPORTED) {
       })
     ]),
     layers: [
-      new ol.layer.TileLayer({
+      new ol.layer.Tile({
         source: new ol.source.OSM()
       }),
       new ol.layer.VectorLayer2({
diff --git a/examples/tilejson.js b/examples/tilejson.js
index 1281457b11..80685d913d 100644
--- a/examples/tilejson.js
+++ b/examples/tilejson.js
@@ -1,13 +1,13 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.TileJSON');
 
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.TileJSON({
         url: 'http://api.tiles.mapbox.com/v3/mapbox.geography-class.jsonp',
         crossOrigin: 'anonymous'
diff --git a/examples/topojson.js b/examples/topojson.js
index aaf48265b7..babbce45ed 100644
--- a/examples/topojson.js
+++ b/examples/topojson.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.TopoJSON');
 goog.require('ol.source.TileJSON');
@@ -11,7 +11,7 @@ goog.require('ol.style.Stroke');
 goog.require('ol.style.Style');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.TileJSON({
     url: 'http://api.tiles.mapbox.com/v3/mapbox.world-dark.jsonp'
   })
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 84a6125544..e0c8c7a42a 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.expr');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.parser.GeoJSON');
 goog.require('ol.source.MapQuestOpenAerial');
@@ -14,7 +14,7 @@ goog.require('ol.style.Style');
 goog.require('ol.style.Text');
 
 
-var raster = new ol.layer.TileLayer({
+var raster = new ol.layer.Tile({
   source: new ol.source.MapQuestOpenAerial()
 });
 
diff --git a/examples/wms-custom-proj.js b/examples/wms-custom-proj.js
index f85fa221b9..d354f92e73 100644
--- a/examples/wms-custom-proj.js
+++ b/examples/wms-custom-proj.js
@@ -5,7 +5,7 @@ goog.require('ol.View2D');
 goog.require('ol.control');
 goog.require('ol.control.ScaleLine');
 goog.require('ol.control.ScaleLineUnits');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.TileWMS');
 
@@ -17,7 +17,7 @@ var projection = ol.proj.configureProj4jsProjection({
 
 var extent = [420000, 900000, 30000, 350000];
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
@@ -34,7 +34,7 @@ var layers = [
       extent: extent
     })
   }),
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.TileWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js
index 255f84d402..6b836a8426 100644
--- a/examples/wms-no-proj.js
+++ b/examples/wms-no-proj.js
@@ -5,13 +5,13 @@ goog.require('ol.ProjectionUnits');
 goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.SingleImageWMS');
 goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.TileWMS({
       attributions: [new ol.Attribution({
         html: '&copy; ' +
diff --git a/examples/wms-single-image.js b/examples/wms-single-image.js
index 1246016cd3..54b9fa696b 100644
--- a/examples/wms-single-image.js
+++ b/examples/wms-single-image.js
@@ -2,13 +2,13 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.SingleImageWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   }),
   new ol.layer.Image({
diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js
index 4f0e08ce35..70070656b2 100644
--- a/examples/wms-tiled.js
+++ b/examples/wms-tiled.js
@@ -1,16 +1,16 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 goog.require('ol.source.TileWMS');
 
 
 var layers = [
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.MapQuestOpenAerial()
   }),
-  new ol.layer.TileLayer({
+  new ol.layer.Tile({
     source: new ol.source.TileWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states', 'TILED': true},
diff --git a/examples/wmts-from-capabilities.js b/examples/wmts-from-capabilities.js
index 6755480375..a67b05c21f 100644
--- a/examples/wmts-from-capabilities.js
+++ b/examples/wmts-from-capabilities.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.parser.ogc.WMTSCapabilities');
 goog.require('ol.source.WMTS');
 
@@ -27,11 +27,11 @@ xhr.onload = function() {
     capabilities = parser.read(xhr.responseXML);
     map = new ol.Map({
       layers: [
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.WMTS(ol.source.WMTS.optionsFromCapabilities(
               capabilities, 'fmzk'))
         }),
-        new ol.layer.TileLayer({
+        new ol.layer.Tile({
           source: new ol.source.WMTS(ol.source.WMTS.optionsFromCapabilities(
               capabilities, 'beschriftung'))
         })
diff --git a/examples/wmts-ign.js b/examples/wmts-ign.js
index d54d2730bb..bd1dd80937 100644
--- a/examples/wmts-ign.js
+++ b/examples/wmts-ign.js
@@ -2,7 +2,7 @@ goog.require('ol.Attribution');
 goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.parser.ogc.WMTSCapabilities');
 goog.require('ol.source.WMTS');
 
@@ -70,7 +70,7 @@ xhr.onload = function() {
       sourceOptions.attributions = [attribution];
       sourceOptions.logo = layerLogos[i];
       source = new ol.source.WMTS(sourceOptions);
-      layer = new ol.layer.TileLayer({source: source});
+      layer = new ol.layer.Tile({source: source});
       map.addLayer(layer);
     }
 
diff --git a/examples/wmts.js b/examples/wmts.js
index fd2350313e..055240d471 100644
--- a/examples/wmts.js
+++ b/examples/wmts.js
@@ -2,7 +2,7 @@ goog.require('ol.Map');
 goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.proj');
 goog.require('ol.source.OSM');
 goog.require('ol.source.WMTS');
@@ -22,11 +22,11 @@ for (var z = 0; z < 26; ++z) {
 
 var map = new ol.Map({
   layers: [
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.OSM(),
       opacity: 0.7
     }),
-    new ol.layer.TileLayer({
+    new ol.layer.Tile({
       source: new ol.source.WMTS({
         url: 'http://v2.suite.opengeo.org/geoserver/gwc/service/wmts/',
         layer: 'medford:buildings',
diff --git a/examples/zoomslider.js b/examples/zoomslider.js
index 2bf60cbc85..26daf9b05f 100644
--- a/examples/zoomslider.js
+++ b/examples/zoomslider.js
@@ -1,7 +1,7 @@
 goog.require('ol.Map');
 goog.require('ol.View2D');
 goog.require('ol.control.ZoomSlider');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.source.MapQuestOpenAerial');
 
 
@@ -15,7 +15,7 @@ var createMap = function(divId) {
   var source, layer, map, zoomslider, resolutions;
 
   source = new ol.source.MapQuestOpenAerial();
-  layer = new ol.layer.TileLayer({
+  layer = new ol.layer.Tile({
     source: source
   });
   map = new ol.Map({
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 8058120175..fcb8669daf 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -344,7 +344,7 @@
  */
 
 /**
- * @typedef {Object} ol.layer.TileLayerOptions
+ * @typedef {Object} ol.layer.TileOptions
  * @property {number|undefined} brightness Brightness.
  * @property {number|undefined} contrast Contrast.
  * @property {number|undefined} hue Hue.
diff --git a/src/ol/layer/tilelayer.exports b/src/ol/layer/tilelayer.exports
index 9e6ffaf01f..d3ded24332 100644
--- a/src/ol/layer/tilelayer.exports
+++ b/src/ol/layer/tilelayer.exports
@@ -1 +1 @@
-@exportClass ol.layer.TileLayer ol.layer.TileLayerOptions
+@exportClass ol.layer.Tile ol.layer.TileOptions
diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js
index 30b39fe980..12abf09a64 100644
--- a/src/ol/layer/tilelayer.js
+++ b/src/ol/layer/tilelayer.js
@@ -1,4 +1,4 @@
-goog.provide('ol.layer.TileLayer');
+goog.provide('ol.layer.Tile');
 
 goog.require('ol.layer.Layer');
 goog.require('ol.source.Tile');
@@ -7,7 +7,7 @@ goog.require('ol.source.Tile');
 /**
  * @enum {string}
  */
-ol.layer.TileLayerProperty = {
+ol.layer.TileProperty = {
   PRELOAD: 'preload'
 };
 
@@ -16,9 +16,9 @@ ol.layer.TileLayerProperty = {
 /**
  * @constructor
  * @extends {ol.layer.Layer}
- * @param {ol.layer.TileLayerOptions} options Tile layer options.
+ * @param {ol.layer.TileOptions} options Tile layer options.
  */
-ol.layer.TileLayer = function(options) {
+ol.layer.Tile = function(options) {
 
   goog.base(this, options);
 
@@ -26,25 +26,25 @@ ol.layer.TileLayer = function(options) {
       goog.isDef(options.preload) ? options.preload : 0);
 
 };
-goog.inherits(ol.layer.TileLayer, ol.layer.Layer);
+goog.inherits(ol.layer.Tile, ol.layer.Layer);
 
 
 /**
  * @return {number} Preload.
  */
-ol.layer.TileLayer.prototype.getPreload = function() {
-  return /** @type {number} */ (this.get(ol.layer.TileLayerProperty.PRELOAD));
+ol.layer.Tile.prototype.getPreload = function() {
+  return /** @type {number} */ (this.get(ol.layer.TileProperty.PRELOAD));
 };
 goog.exportProperty(
-    ol.layer.TileLayer.prototype,
+    ol.layer.Tile.prototype,
     'getPreload',
-    ol.layer.TileLayer.prototype.getPreload);
+    ol.layer.Tile.prototype.getPreload);
 
 
 /**
  * @return {ol.source.Tile} Source.
  */
-ol.layer.TileLayer.prototype.getTileSource = function() {
+ol.layer.Tile.prototype.getTileSource = function() {
   return /** @type {ol.source.Tile} */ (this.getSource());
 };
 
@@ -52,10 +52,10 @@ ol.layer.TileLayer.prototype.getTileSource = function() {
 /**
  * @param {number} preload Preload.
  */
-ol.layer.TileLayer.prototype.setPreload = function(preload) {
-  this.set(ol.layer.TileLayerProperty.PRELOAD, preload);
+ol.layer.Tile.prototype.setPreload = function(preload) {
+  this.set(ol.layer.TileProperty.PRELOAD, preload);
 };
 goog.exportProperty(
-    ol.layer.TileLayer.prototype,
+    ol.layer.Tile.prototype,
     'setPreload',
-    ol.layer.TileLayer.prototype.setPreload);
+    ol.layer.Tile.prototype.setPreload);
diff --git a/src/ol/map.js b/src/ol/map.js
index 80760d41db..32aafb8116 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -129,7 +129,7 @@ ol.MapProperty = {
  *         zoom: 1
  *       }),
  *       layers: [
- *         new ol.layer.TileLayer({
+ *         new ol.layer.Tile({
  *           source: new ol.source.MapQuestOSM()
  *         })
  *       ],
diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js
index 56789d1737..1c177d8e54 100644
--- a/src/ol/renderer/canvas/canvasmaprenderer.js
+++ b/src/ol/renderer/canvas/canvasmaprenderer.js
@@ -10,7 +10,7 @@ goog.require('goog.vec.Mat4');
 goog.require('ol.Size');
 goog.require('ol.css');
 goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.ImageLayer');
@@ -68,7 +68,7 @@ goog.inherits(ol.renderer.canvas.Map, ol.renderer.Map);
 ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
   if (layer instanceof ol.layer.Image) {
     return new ol.renderer.canvas.ImageLayer(this, layer);
-  } else if (layer instanceof ol.layer.TileLayer) {
+  } else if (layer instanceof ol.layer.Tile) {
     return new ol.renderer.canvas.TileLayer(this, layer);
   } else if (layer instanceof ol.layer.Vector) {
     return new ol.renderer.canvas.VectorLayer(this, layer);
diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js
index 6dfb1f99f5..52d0c14213 100644
--- a/src/ol/renderer/canvas/canvastilelayerrenderer.js
+++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js
@@ -15,7 +15,7 @@ goog.require('ol.TileCoord');
 goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.canvas.Layer');
 
@@ -25,7 +25,7 @@ goog.require('ol.renderer.canvas.Layer');
  * @constructor
  * @extends {ol.renderer.canvas.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.canvas.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -87,10 +87,10 @@ ol.renderer.canvas.TileLayer.prototype.getImage = function() {
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.canvas.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };
 
 
diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js
index 0ec2f1d80e..1da6b24a6c 100644
--- a/src/ol/renderer/dom/dommaprenderer.js
+++ b/src/ol/renderer/dom/dommaprenderer.js
@@ -6,7 +6,7 @@ goog.require('goog.dom.TagName');
 goog.require('goog.style');
 goog.require('ol.css');
 goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.dom.ImageLayer');
 goog.require('ol.renderer.dom.TileLayer');
@@ -51,7 +51,7 @@ goog.inherits(ol.renderer.dom.Map, ol.renderer.Map);
  */
 ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
   var layerRenderer;
-  if (layer instanceof ol.layer.TileLayer) {
+  if (layer instanceof ol.layer.Tile) {
     layerRenderer = new ol.renderer.dom.TileLayer(this, layer);
   } else if (layer instanceof ol.layer.Image) {
     layerRenderer = new ol.renderer.dom.ImageLayer(this, layer);
diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js
index 9eb83fcad1..77f8234587 100644
--- a/src/ol/renderer/dom/domtilelayerrenderer.js
+++ b/src/ol/renderer/dom/domtilelayerrenderer.js
@@ -18,7 +18,7 @@ goog.require('ol.TileState');
 goog.require('ol.ViewHint');
 goog.require('ol.dom');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.renderer.dom.Layer');
 goog.require('ol.tilegrid.TileGrid');
 
@@ -28,7 +28,7 @@ goog.require('ol.tilegrid.TileGrid');
  * @constructor
  * @extends {ol.renderer.dom.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.dom.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -61,10 +61,10 @@ goog.inherits(ol.renderer.dom.TileLayer, ol.renderer.dom.Layer);
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.dom.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };
 
 
diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
index b88e3864d1..526b6d7005 100644
--- a/src/ol/renderer/webgl/webglmaprenderer.js
+++ b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -18,7 +18,7 @@ goog.require('ol.Size');
 goog.require('ol.Tile');
 goog.require('ol.css');
 goog.require('ol.layer.Image');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.layer.VectorLayer2');
 goog.require('ol.renderer.Map');
 goog.require('ol.renderer.webgl.ImageLayer');
@@ -299,7 +299,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture =
  * @inheritDoc
  */
 ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
-  if (layer instanceof ol.layer.TileLayer) {
+  if (layer instanceof ol.layer.Tile) {
     return new ol.renderer.webgl.TileLayer(this, layer);
   } else if (layer instanceof ol.layer.Image) {
     return new ol.renderer.webgl.ImageLayer(this, layer);
diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js
index ab512c3fd7..0c37253d65 100644
--- a/src/ol/renderer/webgl/webgltilelayerrenderer.js
+++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js
@@ -12,7 +12,7 @@ goog.require('ol.Tile');
 goog.require('ol.TileRange');
 goog.require('ol.TileState');
 goog.require('ol.extent');
-goog.require('ol.layer.TileLayer');
+goog.require('ol.layer.Tile');
 goog.require('ol.math');
 goog.require('ol.renderer.webgl.Layer');
 goog.require('ol.renderer.webgl.tilelayer.shader');
@@ -24,7 +24,7 @@ goog.require('ol.structs.Buffer');
  * @constructor
  * @extends {ol.renderer.webgl.Layer}
  * @param {ol.renderer.Map} mapRenderer Map renderer.
- * @param {ol.layer.TileLayer} tileLayer Tile layer.
+ * @param {ol.layer.Tile} tileLayer Tile layer.
  */
 ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) {
 
@@ -88,10 +88,10 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() {
 
 /**
  * @protected
- * @return {ol.layer.TileLayer} Tile layer.
+ * @return {ol.layer.Tile} Tile layer.
  */
 ol.renderer.webgl.TileLayer.prototype.getTileLayer = function() {
-  return /** @type {ol.layer.TileLayer} */ (this.getLayer());
+  return /** @type {ol.layer.Tile} */ (this.getLayer());
 };