diff --git a/debug/tests/detached-dom-memory-leak.html b/debug/tests/detached-dom-memory-leak.html
index b2fd18df4..fc8d47624 100644
--- a/debug/tests/detached-dom-memory-leak.html
+++ b/debug/tests/detached-dom-memory-leak.html
@@ -19,7 +19,7 @@
 		if(mapDiv) mapDiv.parentNode.removeChild(mapDiv); // This will destroy the map div
 
 		// create new map div
-		var randomDivId = 'mapId' + new Date().getTime();
+		var randomDivId = 'map' + new Date().getTime();
 		mapDiv = document.createElement('div');
 		mapDiv.id = randomDivId;
 		mapDiv.style.height = '200px';
diff --git a/docs/examples/quick-start/example-basic.md b/docs/examples/quick-start/example-basic.md
index 16918a37a..d9e291b45 100644
--- a/docs/examples/quick-start/example-basic.md
+++ b/docs/examples/quick-start/example-basic.md
@@ -3,10 +3,10 @@ layout: tutorial_frame
 title: Quick Start
 customMapContainer: "true"
 ---
-<div id='mapid' style='width: 600px; height: 400px;'></div>
+<div id='map' style='width: 600px; height: 400px;'></div>
 <script>
 
-	var mymap = L.map('mapid').setView([51.505, -0.09], 13);
+	var mymap = L.map('map').setView([51.505, -0.09], 13);
 
 	L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
 		maxZoom: 18,
diff --git a/docs/examples/quick-start/example-overlays.md b/docs/examples/quick-start/example-overlays.md
index ac9f527e6..20675671d 100644
--- a/docs/examples/quick-start/example-overlays.md
+++ b/docs/examples/quick-start/example-overlays.md
@@ -3,10 +3,10 @@ layout: tutorial_frame
 title: Quick Start
 customMapContainer: "true"
 ---
-<div id='mapid' style='width: 600px; height: 400px;'></div>
+<div id='map' style='width: 600px; height: 400px;'></div>
 <script>
 
-	var mymap = L.map('mapid').setView([51.505, -0.09], 13);
+	var mymap = L.map('map').setView([51.505, -0.09], 13);
 
 	L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
 		maxZoom: 18,
diff --git a/docs/examples/quick-start/example-popups.md b/docs/examples/quick-start/example-popups.md
index beba64ee7..5ea74f6bc 100644
--- a/docs/examples/quick-start/example-popups.md
+++ b/docs/examples/quick-start/example-popups.md
@@ -3,10 +3,10 @@ layout: tutorial_frame
 title: Quick Start
 customMapContainer: "true"
 ---
-<div id='mapid' style='width: 600px; height: 400px;'></div>
+<div id='map' style='width: 600px; height: 400px;'></div>
 <script>
 
-	var mymap = L.map('mapid').setView([51.505, -0.09], 13);
+	var mymap = L.map('map').setView([51.505, -0.09], 13);
 
 	L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
 		maxZoom: 18,
diff --git a/docs/examples/quick-start/example.md b/docs/examples/quick-start/example.md
index 11e2c474a..4bccff1b6 100644
--- a/docs/examples/quick-start/example.md
+++ b/docs/examples/quick-start/example.md
@@ -3,10 +3,10 @@ layout: tutorial_frame
 title: Quick Start
 customMapContainer: "true"
 ---
-<div id='mapid' style='width: 600px; height: 400px;'></div>
+<div id='map' style='width: 600px; height: 400px;'></div>
 <script>
 
-	var mymap = L.map('mapid').setView([51.505, -0.09], 13);
+	var mymap = L.map('map').setView([51.505, -0.09], 13);
 
 	L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
 		maxZoom: 18,
diff --git a/docs/examples/quick-start/index.md b/docs/examples/quick-start/index.md
index 2af823584..a953cd710 100644
--- a/docs/examples/quick-start/index.md
+++ b/docs/examples/quick-start/index.md
@@ -28,11 +28,11 @@ Before writing any code for the map, you need to do the following preparation st
 
  * Put a `div` element with a certain `id` where you want your map to be:
 
-		<div id="mapid"></div>
+		<div id="map"></div>
 
  * Make sure the map container has a defined height, for example by setting it in CSS:
 
-	<pre><code class="css">#mapid { height: 180px; }</code></pre>
+	<pre><code class="css">#map { height: 180px; }</code></pre>
 
 Now you're ready to initialize the map and do some stuff with it.
 
@@ -44,7 +44,7 @@ Now you're ready to initialize the map and do some stuff with it.
 
 Let's create a map of the center of London with pretty Mapbox Streets tiles. First we'll initialize the map and set its view to our chosen geographical coordinates and a zoom level:
 
-	var mymap = L.map('mapid').setView([51.505, -0.09], 13);
+	var mymap = L.map('map').setView([51.505, -0.09], 13);
 
 By default (as we didn't pass any options when creating the map instance), all mouse and touch interactions on the map are enabled, and it has zoom and attribution controls.