diff --git a/src/all.js b/src/all.js
index df772a0103..8885885b62 100644
--- a/src/all.js
+++ b/src/all.js
@@ -11,5 +11,6 @@ goog.require('ol.Projection');
 goog.require('ol.TileBounds');
 goog.require('ol.TileCoord');
 goog.require('ol.TileGrid');
-goog.require('ol.TileUrl');
+goog.require('ol.TileUrlFunction');
+goog.require('ol.TileUrlFunctionType');
 goog.require('ol.TransformFunction');
diff --git a/src/ol/tileurl.js b/src/ol/tileurlfunction.js
similarity index 55%
rename from src/ol/tileurl.js
rename to src/ol/tileurlfunction.js
index 116e20ee64..7021c035d2 100644
--- a/src/ol/tileurl.js
+++ b/src/ol/tileurlfunction.js
@@ -1,4 +1,5 @@
-goog.provide('ol.TileUrl');
+goog.provide('ol.TileUrlFunction');
+goog.provide('ol.TileUrlFunctionType');
 
 goog.require('goog.math');
 goog.require('ol.TileCoord');
@@ -7,14 +8,14 @@ goog.require('ol.TileCoord');
 /**
  * @typedef {function(ol.TileCoord): string}
  */
-ol.TileUrlFunction;
+ol.TileUrlFunctionType;
 
 
 /**
  * @param {string} template Template.
- * @return {ol.TileUrlFunction} Tile URL function.
+ * @return {ol.TileUrlFunctionType} Tile URL function.
  */
-ol.TileUrl.createFromTemplate = function(template) {
+ol.TileUrlFunction.createFromTemplate = function(template) {
   return function(tileCoord) {
     return template.replace(/\{z\}/, tileCoord.z)
                    .replace(/\{x\}/, tileCoord.x)
@@ -24,10 +25,10 @@ ol.TileUrl.createFromTemplate = function(template) {
 
 
 /**
- * @param {Array.<ol.TileUrlFunction>} tileUrlFunctions Tile URL Functions.
- * @return {ol.TileUrlFunction} Tile URL function.
+ * @param {Array.<ol.TileUrlFunctionType>} tileUrlFunctions Tile URL Functions.
+ * @return {ol.TileUrlFunctionType} Tile URL function.
  */
-ol.TileUrl.createFromTileUrlFunctions = function(tileUrlFunctions) {
+ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
   return function(tileCoord) {
     var index = goog.math.modulo(tileCoord.hash(), tileUrlFunctions.length);
     return tileUrlFunctions[index](tileCoord);
diff --git a/src/ol/tileurl_test.js b/src/ol/tileurlfunction_test.js
similarity index 57%
rename from src/ol/tileurl_test.js
rename to src/ol/tileurlfunction_test.js
index 014f044db0..4812bbcadd 100644
--- a/src/ol/tileurl_test.js
+++ b/src/ol/tileurlfunction_test.js
@@ -1,18 +1,18 @@
 goog.require('goog.testing.jsunit');
 goog.require('ol.TileCoord');
-goog.require('ol.TileUrl');
+goog.require('ol.TileUrlFunction');
 
 
 function testCreateFromTemplate() {
-  var tileUrl = ol.TileUrl.createFromTemplate('{z}/{x}/{y}');
+  var tileUrl = ol.TileUrlFunction.createFromTemplate('{z}/{x}/{y}');
   assertEquals('3/2/1', tileUrl(new ol.TileCoord(3, 2, 1)));
 }
 
 
 function testCreateFromTileUrlFunctions() {
-  var tileUrl = ol.TileUrl.createFromTileUrlFunctions([
-    ol.TileUrl.createFromTemplate('a'),
-    ol.TileUrl.createFromTemplate('b')
+  var tileUrl = ol.TileUrlFunction.createFromTileUrlFunctions([
+    ol.TileUrlFunction.createFromTemplate('a'),
+    ol.TileUrlFunction.createFromTemplate('b')
   ]);
   var tileUrl1 = tileUrl(new ol.TileCoord(1, 0, 0));
   var tileUrl2 = tileUrl(new ol.TileCoord(1, 0, 1));