diff --git a/debug/hacks/jitter.html b/debug/hacks/jitter.html
index 1ec35a05..77cdcd14 100644
--- a/debug/hacks/jitter.html
+++ b/debug/hacks/jitter.html
@@ -25,18 +25,16 @@
 </div>
 	<script type="text/javascript">
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
-			maxZoom: 18,
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			key: 'd4fc77ea4a63471cab2423e66626cbb6'
-		});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+		osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		//Disable the hack fix
 		L.Browser.chrome = true;
 
 		var map = L.map('map')
 				.setView([50.5, 30.51], 15)
-				.addLayer(cloudmade);
+				.addLayer(osm);
 	</script>
 </body>
 </html>
diff --git a/debug/map/controls.html b/debug/map/controls.html
index b84adb62..bb177869 100644
--- a/debug/map/controls.html
+++ b/debug/map/controls.html
@@ -16,15 +16,12 @@
 
 	<script type="text/javascript">
 
-		function getCloudMadeUrl(styleId) {
-			return 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/' + styleId + '/256/{z}/{x}/{y}.png';
-		}
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+		osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
+			osm2 = new L.TileLayer(osmUrl, {attribution: 'Hello world'});
 
-		var cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(getCloudMadeUrl(997), {attribution: cloudmadeAttribution}),
-			cloudmade2 = new L.TileLayer(getCloudMadeUrl(998), {attribution: 'Hello world'});
-
-		var map = new L.Map('map').addLayer(cloudmade).setView(new L.LatLng(50.5, 30.512), 15);
+		var map = new L.Map('map').addLayer(osm).setView(new L.LatLng(50.5, 30.512), 15);
 
 		var marker = new L.Marker(new L.LatLng(50.5, 30.505), {color: 'red'});
 		map.addLayer(marker);
@@ -34,8 +31,8 @@
 		map.addLayer(marker2);
 
 		var layersControl = new L.Control.Layers({
-			'CloudMade Fresh': cloudmade,
-			'CloudMade Pale Dawn': cloudmade2
+			'OSM': osm,
+			'OSM2': osm2
 		}, {
 			'Some marker': marker,
 			'Another marker': marker2
diff --git a/debug/map/geolocation.html b/debug/map/geolocation.html
index 7cc7d93f..43ef035d 100644
--- a/debug/map/geolocation.html
+++ b/debug/map/geolocation.html
@@ -17,11 +17,11 @@
 
     <script type="text/javascript">
 
-        var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-            cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-            cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});
+        var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+        osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+        osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
-        var map = new L.Map('map', {zoom: 15, layers: [cloudmade]});
+        var map = new L.Map('map', {zoom: 15, layers: [osm]});
 
         function logEvent(e) { console.log(e.type); }
         map.on('locationerror', logEvent);
diff --git a/debug/map/image-overlay.html b/debug/map/image-overlay.html
index 43790175..c3f01d0a 100644
--- a/debug/map/image-overlay.html
+++ b/debug/map/image-overlay.html
@@ -19,13 +19,13 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 			latlng = new L.LatLng(50.5, 30.51);
 
 		var map = new L.Map('map');
-		map.addLayer(cloudmade);
+		map.addLayer(osm);
 
 		var	bounds = new L.LatLngBounds(
       		new L.LatLng(40.71222,-74.22655),
diff --git a/debug/map/map-mobile.html b/debug/map/map-mobile.html
index e9829c1c..b7c13c0b 100644
--- a/debug/map/map-mobile.html
+++ b/debug/map/map-mobile.html
@@ -18,12 +18,12 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+		osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
 			latlng = new L.LatLng(50.5, 30.51);
 
-		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [osm]});
 
 		var marker = new L.Marker(latlng);
 		map.addLayer(marker);
diff --git a/debug/map/map.html b/debug/map/map.html
index 2bcd369e..6b7c57ea 100644
--- a/debug/map/map.html
+++ b/debug/map/map.html
@@ -19,15 +19,13 @@
 
 	<script type="text/javascript">
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
-			maxZoom: 18,
-			attribution: 'Map data &copy; 2011 <a href="#">OpenStreetMap</a> contributors, Imagery &copy; 2011 <a href="#">CloudMade</a>',
-			key: 'd4fc77ea4a63471cab2423e66626cbb6'
-		});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		var map = L.map('map')
 				.setView([50.5, 30.51], 15)
-				.addLayer(cloudmade);
+				.addLayer(osm);
 
 		var markers = new L.FeatureGroup();
 
diff --git a/debug/map/max-bounds.html b/debug/map/max-bounds.html
index 7de4eac7..cffadb51 100644
--- a/debug/map/max-bounds.html
+++ b/debug/map/max-bounds.html
@@ -18,15 +18,15 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+		osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
 			bounds = new L.LatLngBounds(new L.LatLng(49.5, -11.3), new L.LatLng(61.2, 2.5));
 
 		var map = new L.Map('map', {
 			center: bounds.getCenter(),
 			zoom: 7,
-			layers: [cloudmade],
+			layers: [osm],
 			maxBounds: bounds
 		});
 
diff --git a/debug/map/opacity.html b/debug/map/opacity.html
index 64dd5ec8..cffeea57 100644
--- a/debug/map/opacity.html
+++ b/debug/map/opacity.html
@@ -82,11 +82,9 @@
 		CASE 1: no opacity set on any layers
 		**********/
 		// OSM Basemap
-		var osm1 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941
-		}).addTo(map1);
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+
+		var osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: ''}).addTo(map1);
 
 		// EEZs / Nations
 		var eez1 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
@@ -103,11 +101,7 @@
 		CASE 2: opacity set on overlays but not on basemap
 		**********/
 		// OSM Basemap
-		var osm2 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941
-		}).addTo(map2);
+		var osm2 = L.tileLayer(osmUrl, {maxZoom: 18, attribution: ''}).addTo(map2);
 
 		// EEZs / Nations
 		var eez2 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
@@ -126,12 +120,7 @@
 		CASE 3: opacity set on overlays but not on basemap, zIndex option set to 0 on basemap
 		**********/
 		// OSM Basemap
-		var osm3 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941,
-		    zIndex: 0
-		}).addTo(map3);
+		var osm3 = L.tileLayer(osmUrl, {maxZoom: 18, attribution: '', zIndex: 0}).addTo(map3);
 
 		// EEZs / Nations
 		var eez3 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
@@ -150,12 +139,7 @@
 		CASE 4: opacity set on overlays but set to 1 on basemap
 		**********/
 		// OSM Basemap
-		var osm4 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941,
-		    opacity: 1
-		}).addTo(map4);
+		var osm4 = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}).addTo(map4);
 
 		// EEZs / Nations
 		var eez4 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
@@ -174,12 +158,7 @@
 		CASE 5: opacity set to .5 on all layers
 		**********/
 		// OSM Basemap
-		var osm5 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941,
-		    opacity: 0.99
-		}).addTo(map5);
+		var osm5 = L.tileLayer(osmUrl, {maxZoom: 18, attribution: '', opacity: 0.99}).addTo(map5);
 
 		// EEZs / Nations
 		var eez5 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
@@ -198,12 +177,7 @@
 		CASE 6: opacity set to .5 on 1st and 3rd layers and 1 on middle layer
 		**********/
 		// OSM Basemap
-		var osm6 = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png?v=1', {
-		    attribution: '',
-		    key: 'BC9A493B41014CAABB98F0471D759707',
-		    styleId: 97941,
-		    opacity: 0.99
-		}).addTo(map6);
+		var osm6 = L.tileLayer(osmUrl, {maxZoom: 18, attribution: '', opacity: 0.99}).addTo(map6);
 
 		// EEZs / Nations
 		var eez6 = new L.tileLayer('http://tile1.mpatlas.org/tilecache/eezs/{z}/{x}/{y}.png', {
diff --git a/debug/map/scroll.html b/debug/map/scroll.html
index 5fcb7e2a..f6cb9027 100644
--- a/debug/map/scroll.html
+++ b/debug/map/scroll.html
@@ -22,12 +22,12 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
 			latlng = new L.LatLng(50.5, 30.51);
 
-		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [osm]});
 
 		var s = '';
 		for (var i = 0; i < 100; i++) s += 'Test<br>';
diff --git a/debug/map/wms.html b/debug/map/wms.html
index 278a2d1f..75bb78ec 100644
--- a/debug/map/wms.html
+++ b/debug/map/wms.html
@@ -17,10 +17,10 @@
 	<script type="text/javascript">
 		var map = new L.Map('map');
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/{styleId}/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {styleId: 997, attribution: cloudmadeAttribution}),
-			cloudmade2 = new L.TileLayer(cloudmadeUrl, {styleId: 998, attribution: cloudmadeAttribution});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {attribution: osmAttrib}),
+			osm2 = L.tileLayer(osmUrl, {attribution: osmAttrib});
 
 		var nexrad = new L.TileLayer.WMS("http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi", {
 			layers: 'nexrad-n0r-900913',
@@ -32,9 +32,9 @@
 
 		var bounds = new L.LatLngBounds(new L.LatLng(32, -126), new L.LatLng(50, -64));
 
-		map.addLayer(cloudmade).addLayer(nexrad).fitBounds(bounds);
+		map.addLayer(osm).addLayer(nexrad).fitBounds(bounds);
 
-		L.control.layers({"CM": cloudmade, "CM2": cloudmade2}, {"NexRad": nexrad}).addTo(map);
+		L.control.layers({"CM": osm, "CM2": osm2}, {"NexRad": nexrad}).addTo(map);
 	</script>
 </body>
 </html>
diff --git a/debug/map/zoomlevels.html b/debug/map/zoomlevels.html
index 87203bfb..fc9ef4d6 100644
--- a/debug/map/zoomlevels.html
+++ b/debug/map/zoomlevels.html
@@ -18,19 +18,15 @@
 	    // Test that changing between layers with differing zoomlevels also updates
         // the zoomlevels in the map + also
 
-		function getCloudMadeUrl(styleId) {
-			return 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/' + styleId + '/256/{z}/{x}/{y}.png';
-		}
-
 		var map = L.map('map').setView(L.latLng(50.5, 30.51), 0);
 
-		var cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = L.tileLayer(getCloudMadeUrl(997), {attribution: cloudmadeAttribution, minZoom: 0, maxZoom: 10}).addTo(map),
-			cloudmade2 = L.tileLayer(getCloudMadeUrl(998), {attribution: 'Hello world', minZoom: 5, maxZoom: 18});
+		var osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {attribution: osmAttrib, minZoom: 0, maxZoom: 10}).addTo(map),
+			osm2 = L.tileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {attribution: 'Hello world', minZoom: 5, maxZoom: 18});
 
 		L.control.layers({
-			'CloudMade Pale Dawn (5-18)': cloudmade2,
-			'CloudMade Fresh (0-10)': cloudmade
+			'OSM (5-18)': osm2,
+			'OSM (0-10)': osm
 		}).addTo(map);
 
 		L.control.scale().addTo(map);
diff --git a/debug/tests/click_on_canvas.html b/debug/tests/click_on_canvas.html
index db7c0375..f4a6b9c0 100644
--- a/debug/tests/click_on_canvas.html
+++ b/debug/tests/click_on_canvas.html
@@ -13,16 +13,16 @@
     <script>
         L_PREFER_CANVAS = true;
         $(document).ready(function() {
-            var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-            cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-            cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});
+            var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+                osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+                osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
             var map = L.map('map', {
                 minZoom: 1,
                 maxZoom: 19,
                 center: [51.505, -0.09],
                 zoom: 9,
-                layers: [cloudmade]
+                layers: [osm]
             });
 
             var polygons = new L.FeatureGroup();
diff --git a/debug/tests/dragging_and_copyworldjump.html b/debug/tests/dragging_and_copyworldjump.html
index d7ede358..8684f4ba 100644
--- a/debug/tests/dragging_and_copyworldjump.html
+++ b/debug/tests/dragging_and_copyworldjump.html
@@ -28,7 +28,7 @@
 
 		<script type="text/javascript">
 			function addLayerAndMarker(map) {
-				var layer = new L.TileLayer('http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png', {
+				var layer = new L.TileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
 					maxZoom : 18
 				}).addTo(map);
 
diff --git a/debug/tests/opacity.html b/debug/tests/opacity.html
index 940a6f37..d3aaaa73 100644
--- a/debug/tests/opacity.html
+++ b/debug/tests/opacity.html
@@ -23,12 +23,12 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
 			latlng = new L.LatLng(50.5, 30.51);
 
-		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [cloudmade]});
+		var map = new L.Map('map', {center: latlng, zoom: 15, layers: [osm]});
 
 		//Create a marker, clicking it toggles opacity
 		var marker = new L.Marker(latlng, { icon: new L.DivIcon({ className: 'mybox', iconSize: new L.Point(100,100), html: 'opaque. click to toggle' }) });
diff --git a/debug/tests/popupcontextmenuclicks.html b/debug/tests/popupcontextmenuclicks.html
index 63698526..3c470bc2 100644
--- a/debug/tests/popupcontextmenuclicks.html
+++ b/debug/tests/popupcontextmenuclicks.html
@@ -24,8 +24,7 @@ map.on('contextmenu', function (e) {
     alert('The map has been right-clicked');
 });
 L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
-    attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-    key: 'BC9A493B41014CAABB98F0471D759707'
+    attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 }).addTo(map);
 
 
diff --git a/debug/tests/reuse_popups.html b/debug/tests/reuse_popups.html
index d5a65ad7..7804414f 100644
--- a/debug/tests/reuse_popups.html
+++ b/debug/tests/reuse_popups.html
@@ -25,11 +25,8 @@
 
 		map.setView([51.505, -0.09], 13);
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png', {
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			maxZoom: 18,
-			key: 'd4fc77ea4a63471cab2423e66626cbb6',
-			styleId: 997
+		var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+    	attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 		}).addTo(map);
 
 		var a_popup = L.popup().setContent('Previously created')
diff --git a/debug/tests/rtl.html b/debug/tests/rtl.html
index 6998652b..e28d25c2 100644
--- a/debug/tests/rtl.html
+++ b/debug/tests/rtl.html
@@ -24,15 +24,13 @@
 
 	<script type="text/javascript">
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/997/256/{z}/{x}/{y}.png', {
-			maxZoom: 18,
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			key: 'd4fc77ea4a63471cab2423e66626cbb6'
+		var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+    	attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 		});
 
 		var map = L.map('map')
 				.setView([50.5, 30.51], 15)
-				.addLayer(cloudmade);
+				.addLayer(osm);
 
 		map.on('click', function(e) {
 			L.popup().setLatLng(e.latlng).setContent('Hello').openOn(map);
diff --git a/debug/vector/bounds-extend.html b/debug/vector/bounds-extend.html
index c0c2d105..db57402c 100644
--- a/debug/vector/bounds-extend.html
+++ b/debug/vector/bounds-extend.html
@@ -16,8 +16,8 @@
     <button onclick="boundsExtendLatLng()">Extend the bounds of the center rectangle with the lower left marker</button>
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.osm.org/{z}/{x}/{y}.png',
+			osm = new L.TileLayer(osmUrl, {maxZoom: 18});
 
         var latLng = new L.LatLng(54.18815548107151, -7.657470703124999);
 
@@ -26,7 +26,7 @@
         var bounds3;
 
     	var map = new L.Map('map', {
-		    layers: [cloudmade],
+		    layers: [osm],
 		    center: bounds1.getCenter(),
 		    zoom: 7
 		});
diff --git a/debug/vector/feature-group-bounds.html b/debug/vector/feature-group-bounds.html
index 173e9c8f..636ade19 100644
--- a/debug/vector/feature-group-bounds.html
+++ b/debug/vector/feature-group-bounds.html
@@ -19,16 +19,16 @@
 	<script type="text/javascript" src="geojson-sample.js"></script>
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution}),
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib}),
 			rectangle,
 			featureGroup;
 
 		var map = new L.Map('map', {
 			center: new L.LatLng(0.78, 102.37),
 			zoom: 7,
-			layers: [cloudmade]
+			layers: [osm]
 		});
 
 		var geojson = L.geoJson(geojsonSample, {
diff --git a/debug/vector/geojson.html b/debug/vector/geojson.html
index c3f72e36..169a20a9 100644
--- a/debug/vector/geojson.html
+++ b/debug/vector/geojson.html
@@ -52,10 +52,8 @@
 
 		var map = L.map('map').setView([37.8, -96], 4);
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png', {
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			key: 'd4fc77ea4a63471cab2423e66626cbb6',
-			styleId: 998
+		var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
+    	attribution: '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 		}).addTo(map);
 
 
diff --git a/debug/vector/rectangle.html b/debug/vector/rectangle.html
index c9179eb9..d1874a13 100644
--- a/debug/vector/rectangle.html
+++ b/debug/vector/rectangle.html
@@ -17,9 +17,9 @@
 
 	<script type="text/javascript">
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});;
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		var bounds = new L.LatLngBounds(new L.LatLng(54.559322, -5.767822), new L.LatLng(56.1210604, -3.021240));
 		var bounds2 = new L.LatLngBounds(new L.LatLng(56.2124322195806, -3.427734375), new L.LatLng(56.307776937156945, -3.2560729980468746));
@@ -39,7 +39,7 @@
 		var map = new L.Map('map', {
 			center: bounds.getCenter(),
 			zoom: 7,
-			layers: [cloudmade]
+			layers: [osm]
 		});
 
 		map.addLayer(rectangle).addLayer(styledRectangle);
diff --git a/debug/vector/touchzoomemu.html b/debug/vector/touchzoomemu.html
index 5030f811..5bd5f1c5 100644
--- a/debug/vector/touchzoomemu.html
+++ b/debug/vector/touchzoomemu.html
@@ -24,9 +24,9 @@
 	//	buffer += text + "\r\n";
 	//}
 
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18}),
-			map = new L.Map('map', {layers: [cloudmade], center: new L.LatLng(51.505, -0.04), zoom: 13});
+		var osmUrl = 'http://{s}.tile.osm.org/{z}/{x}/{y}.png',
+			osm = new L.TileLayer(osmUrl, {maxZoom: 18}),
+			map = new L.Map('map', {layers: [osm], center: new L.LatLng(51.505, -0.04), zoom: 13});
 
 
 		var polygon = new L.Polygon([
diff --git a/debug/vector/vector-bounds.html b/debug/vector/vector-bounds.html
index ba0839ee..6b303ed5 100644
--- a/debug/vector/vector-bounds.html
+++ b/debug/vector/vector-bounds.html
@@ -16,8 +16,9 @@
     <button onclick="map.fitBounds(poly.getBounds())">Zoom to polygon</button>
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		var poly_points = [
 			[39.70348880963439, -104.98603820800781],
@@ -50,7 +51,7 @@
 		var poly = new L.Polygon(latlngs2);
 
 		var map = new L.Map('map', {
-		    layers: [cloudmade],
+		    layers: [osm],
 		    center: new L.LatLng(39.69596043694606, -104.95084762573242),
 		    zoom: 12
 		});
diff --git a/debug/vector/vector-canvas.html b/debug/vector/vector-canvas.html
index 932912a0..7216a646 100644
--- a/debug/vector/vector-canvas.html
+++ b/debug/vector/vector-canvas.html
@@ -22,15 +22,16 @@
 
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {
 			latlngs.push(new L.LatLng(route[i][0], route[i][1]));
 		}
 		var path = new L.Polyline(latlngs);
 
-		var map = new L.Map('map', {layers: [cloudmade]});
+		var map = new L.Map('map', {layers: [osm]});
 
 		var group = new L.LayerGroup();
 
diff --git a/debug/vector/vector-mobile.html b/debug/vector/vector-mobile.html
index db531407..53c2aa85 100644
--- a/debug/vector/vector-mobile.html
+++ b/debug/vector/vector-mobile.html
@@ -17,15 +17,16 @@
 
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {
 			latlngs.push(new L.LatLng(route[i][0], route[i][1]));
 		}
 		var path = new L.Polyline(latlngs, {smoothFactor: 1});
 
-		var map = new L.Map('map', {layers: [cloudmade]});
+		var map = new L.Map('map', {layers: [osm]});
 
 		map.fitBounds(new L.LatLngBounds(latlngs));
 
diff --git a/debug/vector/vector-simple.html b/debug/vector/vector-simple.html
index ae0d40f1..caef7389 100644
--- a/debug/vector/vector-simple.html
+++ b/debug/vector/vector-simple.html
@@ -35,12 +35,9 @@
 
 		map.setView([51.505, -0.09], 13);
 
-		var cloudmade = L.tileLayer('http://{s}.tile.cloudmade.com/{key}/{styleId}/256/{z}/{x}/{y}.png', {
-			attribution: 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
-			maxZoom: 18,
-			key: 'd4fc77ea4a63471cab2423e66626cbb6',
-			styleId: 997
-		}).addTo(map);
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+		osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors';
+		var osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});.addTo(map);
 
 	</script>
 </body>
diff --git a/debug/vector/vector.html b/debug/vector/vector.html
index f39b830f..ae9d44ea 100644
--- a/debug/vector/vector.html
+++ b/debug/vector/vector.html
@@ -14,15 +14,16 @@
 
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
 		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {
 			latlngs.push(new L.LatLng(route[i][0], route[i][1]));
 		}
 		var path = new L.Polyline(latlngs);
 
-		var map = new L.Map('map', {layers: [cloudmade]});
+		var map = new L.Map('map', {layers: [osm]});
 
 		map.fitBounds(new L.LatLngBounds(latlngs));
 
diff --git a/debug/vector/vector2.html b/debug/vector/vector2.html
index 84a9fae3..8ecc6f81 100644
--- a/debug/vector/vector2.html
+++ b/debug/vector/vector2.html
@@ -14,10 +14,11 @@
 
 	<script src="route.js"></script>
 	<script>
-		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/d4fc77ea4a63471cab2423e66626cbb6/997/256/{z}/{x}/{y}.png',
-			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+		var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			osmAttrib = '&copy; <a href="http://openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+			osm = L.tileLayer(osmUrl, {maxZoom: 18, attribution: osmAttrib});
 
-		var map = new L.Map('map', {layers: [cloudmade]});
+		var map = new L.Map('map', {layers: [osm]});
 
 		map.addLayer(L.marker(route[0]));
 		map.addLayer(L.marker(route[route.length - 1]));