diff --git a/samples/add-map/src/index.js b/samples/add-map/src/index.js
index 25acf1a38e..35e672adf1 100644
--- a/samples/add-map/src/index.js
+++ b/samples/add-map/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_add_map_script_body]
+// [START maps_add_map]
 // Initialize and add the map
 export function initMap() {
   // The location of Uluru
@@ -27,4 +27,4 @@ export function initMap() {
   // The marker, positioned at Uluru
   var marker = new google.maps.Marker({ position: uluru, map: map });
 }
-// [END maps_add_map_script_body]
+// [END maps_add_map]
diff --git a/samples/add-map/src/index.njk b/samples/add-map/src/index.njk
index 594bd01f3d..cd67e7ae1a 100644
--- a/samples/add-map/src/index.njk
+++ b/samples/add-map/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_add_map_html_body] -->
+<!-- [START maps_add_map] -->
 <div id="map"></div>
-<!-- [END maps_add_map_html_body] -->
+<!-- [END maps_add_map] -->
 {% endblock %}
diff --git a/samples/add-map/src/style.scss b/samples/add-map/src/style.scss
index e42bb3530a..5c50866a73 100644
--- a/samples/add-map/src/style.scss
+++ b/samples/add-map/src/style.scss
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-/* [START maps_add_map_css] */
+/* [START maps_add_map] */
 /* Set the size of the div element that contains the map */
 #map {
   height: 400px; /* The height is 400 pixels */
   width: 100%; /* The width is the width of the web page */
 }
-/* [END maps_add_map_css] */
+/* [END maps_add_map] */
diff --git a/samples/aerial-rotation/src/index.js b/samples/aerial-rotation/src/index.js
index dd7fd7059f..b6cc1c31c2 100644
--- a/samples/aerial-rotation/src/index.js
+++ b/samples/aerial-rotation/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_aerial_rotation_script_body]
+// [START maps_aerial_rotation]
 export var map;
 
 export function initMap() {
@@ -38,4 +38,4 @@ export function autoRotate() {
     window.setInterval(rotate90, 3000);
   }
 }
-// [END maps_aerial_rotation_script_body]
+// [END maps_aerial_rotation]
diff --git a/samples/aerial-rotation/src/index.njk b/samples/aerial-rotation/src/index.njk
index e322a771f1..5deac02e0a 100644
--- a/samples/aerial-rotation/src/index.njk
+++ b/samples/aerial-rotation/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_aerial_rotation_html_body] -->
+<!-- [START maps_aerial_rotation] -->
 <div id="floating-panel">
   <input type="button" value="Auto Rotate" onclick="autoRotate();" />
 </div>
 <div id="map"></div>
-<!-- [END maps_aerial_rotation_html_body] -->
+<!-- [END maps_aerial_rotation] -->
 
 {% endblock %}
diff --git a/samples/aerial-rotation/src/style.scss b/samples/aerial-rotation/src/style.scss
index 6b7a121d8c..61b375f3b4 100644
--- a/samples/aerial-rotation/src/style.scss
+++ b/samples/aerial-rotation/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_aerial_rotation_css] */
+/*! [START maps_aerial_rotation] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_aerial_rotation_css] */
+/*! [END maps_aerial_rotation] */
diff --git a/samples/aerial-simple/src/index.js b/samples/aerial-simple/src/index.js
index 7514989d66..d7128368d5 100644
--- a/samples/aerial-simple/src/index.js
+++ b/samples/aerial-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_aerial_simple_script_body]
+// [START maps_aerial_simple]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     center: { lat: 36.964, lng: -122.015 },
@@ -23,4 +23,4 @@ export function initMap() {
   });
   map.setTilt(45);
 }
-// [END maps_aerial_simple_script_body]
+// [END maps_aerial_simple]
diff --git a/samples/aerial-simple/src/index.njk b/samples/aerial-simple/src/index.njk
index edabfd876b..0afe25ff33 100644
--- a/samples/aerial-simple/src/index.njk
+++ b/samples/aerial-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_aerial_simple_html_body] -->
+<!-- [START maps_aerial_simple] -->
 <div id="map"></div>
-<!-- [END maps_aerial_simple_html_body] -->
+<!-- [END maps_aerial_simple] -->
 {% endblock %}
diff --git a/samples/aerial-simple/src/style.scss b/samples/aerial-simple/src/style.scss
index 01eb13872b..cecf0f7ffd 100644
--- a/samples/aerial-simple/src/style.scss
+++ b/samples/aerial-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_aerial_simple_css] */
+/*! [START maps_aerial_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_aerial_simple_css] */
+/*! [END maps_aerial_simple] */
diff --git a/samples/circle-simple/src/index.js b/samples/circle-simple/src/index.js
index ce94f9d98b..99ac6f71c2 100644
--- a/samples/circle-simple/src/index.js
+++ b/samples/circle-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_circle_simple_script_body]
+// [START maps_circle_simple]
 // This example creates circles on the map, representing populations in North
 // America.
 
@@ -62,4 +62,4 @@ export function initMap() {
     });
   }
 }
-// [END maps_circle_simple_script_body]
+// [END maps_circle_simple]
diff --git a/samples/circle-simple/src/index.njk b/samples/circle-simple/src/index.njk
index 39fa3783a5..926513b675 100644
--- a/samples/circle-simple/src/index.njk
+++ b/samples/circle-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_circle_simple_html_body] -->
+<!-- [START maps_circle_simple] -->
 <div id="map"></div>
-<!-- [END maps_circle_simple_html_body] -->
+<!-- [END maps_circle_simple] -->
 {% endblock %}
diff --git a/samples/circle-simple/src/style.scss b/samples/circle-simple/src/style.scss
index 6df349b732..7273050fb5 100644
--- a/samples/circle-simple/src/style.scss
+++ b/samples/circle-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_circle_simple_css] */
+/*! [START maps_circle_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_circle_simple_css] */
+/*! [END maps_circle_simple] */
diff --git a/samples/combining-data/src/index.js b/samples/combining-data/src/index.js
index 92824d819d..d68f2172dc 100644
--- a/samples/combining-data/src/index.js
+++ b/samples/combining-data/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_combining_data_script_body]
+// [START maps_combining_data]
 export var mapStyle = [
   {
     stylers: [{ visibility: "off" }]
@@ -217,4 +217,4 @@ export function mouseOutOfRegion(e) {
 }
 // [END maps_combining_data_snippet_mouseevents]
 
-// [END maps_combining_data_script_body]
+// [END maps_combining_data]
diff --git a/samples/combining-data/src/index.njk b/samples/combining-data/src/index.njk
index 91e44f2fa1..683a304ee1 100644
--- a/samples/combining-data/src/index.njk
+++ b/samples/combining-data/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_combining_data_html_body] -->
+<!-- [START maps_combining_data] -->
 <div id="controls" class="nicebox">
   <div>
     <select id="census-variable">
@@ -47,6 +47,6 @@ limitations under the License.
   <span id="data-value"></span>
 </div>
 <div id="map"></div>
-<!-- [END maps_combining_data_html_body] -->
+<!-- [END maps_combining_data] -->
 
 {% endblock %}
diff --git a/samples/combining-data/src/style.scss b/samples/combining-data/src/style.scss
index e71be5448e..8726f5b38c 100644
--- a/samples/combining-data/src/style.scss
+++ b/samples/combining-data/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_combining_data_css] */
+/* [START maps_combining_data] */
 html,
 body,
 #map {
@@ -97,4 +97,4 @@ body,
   font-size: 14px;
   width: 14px;
 }
-/* [END maps_combining_data_css] */
+/* [END maps_combining_data] */
diff --git a/samples/conserve-map-on-scroll/src/index.js b/samples/conserve-map-on-scroll/src/index.js
index 92d4ca2e3c..2d9bb56c75 100644
--- a/samples/conserve-map-on-scroll/src/index.js
+++ b/samples/conserve-map-on-scroll/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_conserve_map_on_scroll_script_body]
+// [START maps_conserve_map_on_scroll]
 // [START maps_conserve_map_script_snippet]
 export function initMap() {
   var locationRio = { lat: -22.915, lng: -43.197 };
@@ -30,4 +30,4 @@ export function initMap() {
     title: "Hello World!"
   });
 }
-// [END maps_conserve_map_on_scroll_script_body]
+// [END maps_conserve_map_on_scroll]
diff --git a/samples/conserve-map-on-scroll/src/index.njk b/samples/conserve-map-on-scroll/src/index.njk
index b409794b59..f9d598aabc 100644
--- a/samples/conserve-map-on-scroll/src/index.njk
+++ b/samples/conserve-map-on-scroll/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_conserve_map_on_scroll_html_body] -->
+<!-- [START maps_conserve_map_on_scroll] -->
 <div id="map"></div>
-<!-- [END maps_conserve_map_on_scroll_html_body] -->
+<!-- [END maps_conserve_map_on_scroll] -->
 {% endblock %}
diff --git a/samples/conserve-map-on-scroll/src/style.scss b/samples/conserve-map-on-scroll/src/style.scss
index 1786e4686c..7df040876d 100644
--- a/samples/conserve-map-on-scroll/src/style.scss
+++ b/samples/conserve-map-on-scroll/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_conserve_map_on_scroll_css] */
+/*! [START maps_conserve_map_on_scroll] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_conserve_map_on_scroll_css] */
+/*! [END maps_conserve_map_on_scroll] */
diff --git a/samples/control-bounds-restriction/src/index.js b/samples/control-bounds-restriction/src/index.js
index a24448cf6f..7b72af6e38 100644
--- a/samples/control-bounds-restriction/src/index.js
+++ b/samples/control-bounds-restriction/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_bounds_restriction_script_body]
+// [START maps_control_bounds_restriction]
 export var map;
 export var NEW_ZEALAND_BOUNDS = {
   north: -34.36,
@@ -34,4 +34,4 @@ export function initMap() {
     zoom: 7
   });
 }
-// [END maps_control_bounds_restriction_script_body]
+// [END maps_control_bounds_restriction]
diff --git a/samples/control-bounds-restriction/src/index.njk b/samples/control-bounds-restriction/src/index.njk
index aedecf3efd..78d507e965 100644
--- a/samples/control-bounds-restriction/src/index.njk
+++ b/samples/control-bounds-restriction/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_bounds_restriction_html_body] -->
+<!-- [START maps_control_bounds_restriction] -->
 <div id="map"></div>
-<!-- [END maps_control_bounds_restriction_html_body] -->
+<!-- [END maps_control_bounds_restriction] -->
 {% endblock %}
diff --git a/samples/control-bounds-restriction/src/style.scss b/samples/control-bounds-restriction/src/style.scss
index c4752c750e..caf4b7fd35 100644
--- a/samples/control-bounds-restriction/src/style.scss
+++ b/samples/control-bounds-restriction/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_bounds_restriction_css] */
+/*! [START maps_control_bounds_restriction] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_bounds_restriction_css] */
+/*! [END maps_control_bounds_restriction] */
diff --git a/samples/control-custom-state/src/index.js b/samples/control-custom-state/src/index.js
index dda533e7f0..1db6adfb41 100755
--- a/samples/control-custom-state/src/index.js
+++ b/samples/control-custom-state/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_custom_state_script_body]
+// [START maps_control_custom_state]
 export var map;
 export var chicago = { lat: 41.85, lng: -87.65 };
 
@@ -113,4 +113,4 @@ export function initMap() {
   centerControlDiv.style["padding-top"] = "10px";
   map.controls[google.maps.ControlPosition.TOP_CENTER].push(centerControlDiv);
 }
-// [END maps_control_custom_state_script_body]
+// [END maps_control_custom_state]
diff --git a/samples/control-custom-state/src/index.njk b/samples/control-custom-state/src/index.njk
index 7b0a1929e8..3f1552d4ab 100644
--- a/samples/control-custom-state/src/index.njk
+++ b/samples/control-custom-state/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_custom_state_html_body] -->
+<!-- [START maps_control_custom_state] -->
 <div id="map"></div>
-<!-- [END maps_control_custom_state_html_body] -->
+<!-- [END maps_control_custom_state] -->
 {% endblock %}
diff --git a/samples/control-custom-state/src/style.scss b/samples/control-custom-state/src/style.scss
index 7cc521d839..f5d19c5df3 100644
--- a/samples/control-custom-state/src/style.scss
+++ b/samples/control-custom-state/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_custom_state_css] */
+/*! [START maps_control_custom_state] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/custom-control-state.scss";
 
-/*! [END maps_control_custom_state_css] */
+/*! [END maps_control_custom_state] */
diff --git a/samples/control-custom/src/index.js b/samples/control-custom/src/index.js
index 43009d9545..9eca524510 100755
--- a/samples/control-custom/src/index.js
+++ b/samples/control-custom/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_custom_script_body]
+// [START maps_control_custom]
 export var map;
 export var chicago = { lat: 41.85, lng: -87.65 };
 
@@ -68,4 +68,4 @@ export function initMap() {
   centerControlDiv.index = 1;
   map.controls[google.maps.ControlPosition.TOP_CENTER].push(centerControlDiv);
 }
-// [END maps_control_custom_script_body]
+// [END maps_control_custom]
diff --git a/samples/control-custom/src/index.njk b/samples/control-custom/src/index.njk
index efb98e0e8a..e2da188b39 100644
--- a/samples/control-custom/src/index.njk
+++ b/samples/control-custom/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_custom_html_body] -->
+<!-- [START maps_control_custom] -->
 <div id="map"></div>
-<!-- [END maps_control_custom_html_body] -->
+<!-- [END maps_control_custom] -->
 {% endblock %}
diff --git a/samples/control-custom/src/style.scss b/samples/control-custom/src/style.scss
index c4c7c5cf4e..832e5f8f02 100644
--- a/samples/control-custom/src/style.scss
+++ b/samples/control-custom/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_custom_css] */
+/*! [START maps_control_custom] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_custom_css] */
+/*! [END maps_control_custom] */
diff --git a/samples/control-default/src/index.js b/samples/control-default/src/index.js
index f5e7fb32b4..f1118ecea5 100644
--- a/samples/control-default/src/index.js
+++ b/samples/control-default/src/index.js
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-// [START maps_control_default_script_body]
+// [START maps_control_default]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     center: { lat: -34.397, lng: 150.644 },
     zoom: 8
   });
 }
-// [END maps_control_default_script_body]
+// [END maps_control_default]
diff --git a/samples/control-default/src/index.njk b/samples/control-default/src/index.njk
index 558d45d5ff..48c2ffbca7 100644
--- a/samples/control-default/src/index.njk
+++ b/samples/control-default/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_default_html_body] -->
+<!-- [START maps_control_default] -->
 <div id="map"></div>
-<!-- [END maps_control_default_html_body] -->
+<!-- [END maps_control_default] -->
 {% endblock %}
diff --git a/samples/control-default/src/style.scss b/samples/control-default/src/style.scss
index 78f94b121a..aaa1b730f3 100644
--- a/samples/control-default/src/style.scss
+++ b/samples/control-default/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_default_css] */
+/*! [START maps_control_default] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_default_css] */
+/*! [END maps_control_default] */
diff --git a/samples/control-disableUI/src/index.js b/samples/control-disableUI/src/index.js
index ce9941c5e2..222517b2d6 100644
--- a/samples/control-disableUI/src/index.js
+++ b/samples/control-disableUI/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_disableUI_script_body]
+// [START maps_control_disableUI]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -22,4 +22,4 @@ export function initMap() {
     disableDefaultUI: true
   });
 }
-// [END maps_control_disableUI_script_body]
+// [END maps_control_disableUI]
diff --git a/samples/control-disableUI/src/index.njk b/samples/control-disableUI/src/index.njk
index c9c89cd883..1fe99296de 100644
--- a/samples/control-disableUI/src/index.njk
+++ b/samples/control-disableUI/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_disableUI_html_body] -->
+<!-- [START maps_control_disableUI] -->
 <div id="map"></div>
-<!-- [END maps_control_disableUI_html_body] -->
+<!-- [END maps_control_disableUI] -->
 {% endblock %}
diff --git a/samples/control-disableUI/src/style.scss b/samples/control-disableUI/src/style.scss
index 61bacbd4a2..880384f674 100644
--- a/samples/control-disableUI/src/style.scss
+++ b/samples/control-disableUI/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_disableUI_css] */
+/*! [START maps_control_disableUI] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_disableUI_css] */
+/*! [END maps_control_disableUI] */
diff --git a/samples/control-options/src/index.js b/samples/control-options/src/index.js
index 8b08e5a91a..10010b7086 100755
--- a/samples/control-options/src/index.js
+++ b/samples/control-options/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_options_script_body]
+// [START maps_control_options]
 // You can set control options to change the default position or style of many
 // of the map controls.
 
@@ -29,4 +29,4 @@ export function initMap() {
     }
   });
 }
-// [END maps_control_options_script_body]
+// [END maps_control_options]
diff --git a/samples/control-options/src/index.njk b/samples/control-options/src/index.njk
index 7958410f12..e5ed322c67 100644
--- a/samples/control-options/src/index.njk
+++ b/samples/control-options/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_options_html_body] -->
+<!-- [START maps_control_options] -->
 <div id="map"></div>
-<!-- [END maps_control_options_html_body] -->
+<!-- [END maps_control_options] -->
 {% endblock %}
diff --git a/samples/control-options/src/style.scss b/samples/control-options/src/style.scss
index 9ec955b81e..71b5863160 100644
--- a/samples/control-options/src/style.scss
+++ b/samples/control-options/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_options_css] */
+/*! [START maps_control_options] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_options_css] */
+/*! [END maps_control_options] */
diff --git a/samples/control-positioning-labels/src/index.njk b/samples/control-positioning-labels/src/index.njk
index fc1503a8f7..b8020c7d09 100644
--- a/samples/control-positioning-labels/src/index.njk
+++ b/samples/control-positioning-labels/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_positioning_labels_html_body] -->
+<!-- [START maps_control_positioning_labels] -->
 <div id="map"></div>
-<!-- [END maps_control_positioning_labels_html_body] -->
+<!-- [END maps_control_positioning_labels] -->
 {% endblock %}
diff --git a/samples/control-positioning-labels/src/style.scss b/samples/control-positioning-labels/src/style.scss
index 5f7bd5d06e..54389a9c0c 100644
--- a/samples/control-positioning-labels/src/style.scss
+++ b/samples/control-positioning-labels/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_positioning_labels_css] */
+/*! [START maps_control_positioning_labels] */
 
-/*! [END maps_control_positioning_labels_css] */
+/*! [END maps_control_positioning_labels] */
diff --git a/samples/control-positioning/src/index.js b/samples/control-positioning/src/index.js
index a326abdd29..3a04638fd8 100755
--- a/samples/control-positioning/src/index.js
+++ b/samples/control-positioning/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_positioning_script_body]
+// [START maps_control_positioning]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 12,
@@ -36,4 +36,4 @@ export function initMap() {
     fullscreenControl: true
   });
 }
-// [END maps_control_positioning_script_body]
+// [END maps_control_positioning]
diff --git a/samples/control-positioning/src/index.njk b/samples/control-positioning/src/index.njk
index 47a4b48765..b79dc582fc 100644
--- a/samples/control-positioning/src/index.njk
+++ b/samples/control-positioning/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_positioning_html_body] -->
+<!-- [START maps_control_positioning] -->
 <div id="map"></div>
-<!-- [END maps_control_positioning_html_body] -->
+<!-- [END maps_control_positioning] -->
 {% endblock %}
diff --git a/samples/control-positioning/src/style.scss b/samples/control-positioning/src/style.scss
index 1a884c0cf4..87af0778f9 100644
--- a/samples/control-positioning/src/style.scss
+++ b/samples/control-positioning/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_positioning_css] */
+/*! [START maps_control_positioning] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_positioning_css] */
+/*! [END maps_control_positioning] */
diff --git a/samples/control-replacement/src/index.js b/samples/control-replacement/src/index.js
index 0221a67a4e..82593a5b5f 100644
--- a/samples/control-replacement/src/index.js
+++ b/samples/control-replacement/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_replacement_script_body]
+// [START maps_control_replacement]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.querySelector("#map"), {
@@ -108,4 +108,4 @@ export function exitFullscreen() {
     document.msCancelFullScreen();
   }
 }
-// [END maps_control_replacement_script_body]
+// [END maps_control_replacement]
diff --git a/samples/control-replacement/src/index.njk b/samples/control-replacement/src/index.njk
index a6e9475efb..4acb1e7c1f 100644
--- a/samples/control-replacement/src/index.njk
+++ b/samples/control-replacement/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_replacement_html_body] -->
+<!-- [START maps_control_replacement] -->
 <div id="map"></div>
 <!-- Hide controls until they are moved into the map. -->
 <div style="display:none">
@@ -39,6 +39,6 @@ limitations under the License.
     </button>
   </div>
 </div>
-<!-- [END maps_control_replacement_html_body] -->
+<!-- [END maps_control_replacement] -->
 
 {% endblock %}
diff --git a/samples/control-replacement/src/style.scss b/samples/control-replacement/src/style.scss
index 6c85326878..73e51ceb89 100644
--- a/samples/control-replacement/src/style.scss
+++ b/samples/control-replacement/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_control_replacement_css] */
+/* [START maps_control_replacement] */
 
 /* Always set the map height explicitly to define the size of the div
        * element that contains the map. */
@@ -148,4 +148,4 @@ body {
   border-width: 2px 0 0 2px;
 }
 
-/* [END maps_control_replacement_css] */
+/* [END maps_control_replacement] */
diff --git a/samples/control-simple/src/index.js b/samples/control-simple/src/index.js
index 1a381bb76c..80594bba94 100644
--- a/samples/control-simple/src/index.js
+++ b/samples/control-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_control_simple_script_body]
+// [START maps_control_simple]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -23,4 +23,4 @@ export function initMap() {
     scaleControl: true
   });
 }
-// [END maps_control_simple_script_body]
+// [END maps_control_simple]
diff --git a/samples/control-simple/src/index.njk b/samples/control-simple/src/index.njk
index 637be1a04d..10591183f5 100644
--- a/samples/control-simple/src/index.njk
+++ b/samples/control-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_control_simple_html_body] -->
+<!-- [START maps_control_simple] -->
 <div id="map"></div>
-<!-- [END maps_control_simple_html_body] -->
+<!-- [END maps_control_simple] -->
 {% endblock %}
diff --git a/samples/control-simple/src/style.scss b/samples/control-simple/src/style.scss
index b7733e1ba8..0fabf8c35f 100644
--- a/samples/control-simple/src/style.scss
+++ b/samples/control-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_control_simple_css] */
+/*! [START maps_control_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_control_simple_css] */
+/*! [END maps_control_simple] */
diff --git a/samples/controls-basic-map/src/index.js b/samples/controls-basic-map/src/index.js
index 5cb002f708..0af9cb6014 100644
--- a/samples/controls-basic-map/src/index.js
+++ b/samples/controls-basic-map/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_controls_basic_map_script_body]
+// [START maps_controls_basic_map]
 // [START maps_controls_basic_map_script_snippet]
 export function initMap() {
   var locationRio = { lat: -22.915, lng: -43.197 };
@@ -30,4 +30,4 @@ export function initMap() {
     title: "Hello World!"
   });
 }
-// [END maps_controls_basic_map_script_body]
+// [END maps_controls_basic_map]
diff --git a/samples/controls-basic-map/src/index.njk b/samples/controls-basic-map/src/index.njk
index cf11962886..7fbd00a081 100644
--- a/samples/controls-basic-map/src/index.njk
+++ b/samples/controls-basic-map/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_controls_basic_map_html_body] -->
+<!-- [START maps_controls_basic_map] -->
 <div id="map"></div>
-<!-- [END maps_controls_basic_map_html_body] -->
+<!-- [END maps_controls_basic_map] -->
 {% endblock %}
diff --git a/samples/controls-basic-map/src/style.scss b/samples/controls-basic-map/src/style.scss
index 91693af6b0..5e602b498a 100644
--- a/samples/controls-basic-map/src/style.scss
+++ b/samples/controls-basic-map/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_controls_basic_map_css] */
+/*! [START maps_controls_basic_map] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_controls_basic_map_css] */
+/*! [END maps_controls_basic_map] */
diff --git a/samples/custom-markers/src/index.js b/samples/custom-markers/src/index.js
index 19485a0733..46cc05b3f5 100644
--- a/samples/custom-markers/src/index.js
+++ b/samples/custom-markers/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_custom_markers_script_body]
+// [START maps_custom_markers]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -125,4 +125,4 @@ export function initMap() {
     });
   }
 }
-// [END maps_custom_markers_script_body]
+// [END maps_custom_markers]
diff --git a/samples/custom-markers/src/index.njk b/samples/custom-markers/src/index.njk
index bddda9cca6..218c847942 100644
--- a/samples/custom-markers/src/index.njk
+++ b/samples/custom-markers/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_custom_markers_html_body] -->
+<!-- [START maps_custom_markers] -->
 <div id="map"></div>
-<!-- [END maps_custom_markers_html_body] -->
+<!-- [END maps_custom_markers] -->
 {% endblock %}
diff --git a/samples/custom-markers/src/style.scss b/samples/custom-markers/src/style.scss
index 6af85d8406..327a0d5700 100644
--- a/samples/custom-markers/src/style.scss
+++ b/samples/custom-markers/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_custom_markers_css] */
+/*! [START maps_custom_markers] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_custom_markers_css] */
+/*! [END maps_custom_markers] */
diff --git a/samples/delete-vertex-menu/src/index.js b/samples/delete-vertex-menu/src/index.js
index 82bac7efde..dd6af44b81 100644
--- a/samples/delete-vertex-menu/src/index.js
+++ b/samples/delete-vertex-menu/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_delete_vertex_menu_script_body]
+// [START maps_delete_vertex_menu]
 export function initialize() {
   var mapOptions = {
     zoom: 3,
@@ -139,4 +139,4 @@ DeleteMenu.prototype.removeVertex = function() {
   this.close();
 };
 
-// [END maps_delete_vertex_menu_script_body]
+// [END maps_delete_vertex_menu]
diff --git a/samples/delete-vertex-menu/src/index.njk b/samples/delete-vertex-menu/src/index.njk
index cf6d685c85..885380e4eb 100644
--- a/samples/delete-vertex-menu/src/index.njk
+++ b/samples/delete-vertex-menu/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_delete_vertex_menu_html_body] -->
+<!-- [START maps_delete_vertex_menu] -->
 <div id="map"></div>
-<!-- [END maps_delete_vertex_menu_html_body] -->
+<!-- [END maps_delete_vertex_menu] -->
 {% endblock %}
diff --git a/samples/delete-vertex-menu/src/style.scss b/samples/delete-vertex-menu/src/style.scss
index 147253db25..1c76382016 100644
--- a/samples/delete-vertex-menu/src/style.scss
+++ b/samples/delete-vertex-menu/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_delete_vertex_menu_css] */
+/* [START maps_delete_vertex_menu] */
 @import "../../../shared/scss/default.scss";
 
 .delete-menu {
@@ -34,4 +34,4 @@
 .delete-menu:hover {
   background: #eee;
 }
-/* [END maps_delete_vertex_menu_css] */
+/* [END maps_delete_vertex_menu] */
diff --git a/samples/directions-complex/src/index.js b/samples/directions-complex/src/index.js
index facddcf5c1..8740b6949c 100644
--- a/samples/directions-complex/src/index.js
+++ b/samples/directions-complex/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_complex_script_body]
+// [START maps_directions_complex]
 export function initMap() {
   var markerArray = [];
 
@@ -116,4 +116,4 @@ export function attachInstructionText(stepDisplay, marker, text, map) {
     stepDisplay.open(map, marker);
   });
 }
-// [END maps_directions_complex_script_body]
+// [END maps_directions_complex]
diff --git a/samples/directions-complex/src/index.njk b/samples/directions-complex/src/index.njk
index 2a00c95d42..e8ad8fc9fa 100644
--- a/samples/directions-complex/src/index.njk
+++ b/samples/directions-complex/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_complex_html_body] -->
+<!-- [START maps_directions_complex] -->
 <div id="floating-panel">
   <b>Start: </b>
   <select id="start">
@@ -49,5 +49,5 @@ limitations under the License.
 <div id="map"></div>
 &nbsp;
 <div id="warnings-panel"></div>
-<!-- [END maps_directions_complex_html_body] -->
+<!-- [END maps_directions_complex] -->
 {% endblock %}
diff --git a/samples/directions-complex/src/style.scss b/samples/directions-complex/src/style.scss
index ac902256b2..d408c61edd 100644
--- a/samples/directions-complex/src/style.scss
+++ b/samples/directions-complex/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_directions_complex_css] */
+/* [START maps_directions_complex] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
@@ -23,4 +23,4 @@
   height: 10%;
   text-align: center;
 }
-/* [END maps_directions_complex_css] */
+/* [END maps_directions_complex] */
diff --git a/samples/directions-draggable/src/index.js b/samples/directions-draggable/src/index.js
index 4ae37fe7f2..6cea01a8eb 100644
--- a/samples/directions-draggable/src/index.js
+++ b/samples/directions-draggable/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_draggable_script_body]
+// [START maps_directions_draggable]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -71,4 +71,4 @@ export function computeTotalDistance(result) {
   total = total / 1000;
   document.getElementById("total").innerHTML = total + " km";
 }
-// [END maps_directions_draggable_script_body]
+// [END maps_directions_draggable]
diff --git a/samples/directions-draggable/src/index.njk b/samples/directions-draggable/src/index.njk
index 2babc45c66..6ad6f962f9 100644
--- a/samples/directions-draggable/src/index.njk
+++ b/samples/directions-draggable/src/index.njk
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_draggable_html_body] -->
+<!-- [START maps_directions_draggable] -->
 <div id="map"></div>
 <div id="right-panel">
   <p>Total Distance: <span id="total"></span></p>
 </div>
-<!-- [END maps_directions_draggable_html_body] -->
+<!-- [END maps_directions_draggable] -->
 {% endblock %}
diff --git a/samples/directions-draggable/src/style.scss b/samples/directions-draggable/src/style.scss
index 38bd18d0d3..6e20806b5b 100644
--- a/samples/directions-draggable/src/style.scss
+++ b/samples/directions-draggable/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_directions_draggable_css] */
+/* [START maps_directions_draggable] */
 @import "../../../shared/scss/right-panel.scss";
 
 html,
@@ -38,4 +38,4 @@ body {
   height: 100%;
   overflow: auto;
 }
-/* [END maps_directions_draggable_css] */
+/* [END maps_directions_draggable] */
diff --git a/samples/directions-panel/src/index.js b/samples/directions-panel/src/index.js
index c6bf50b21a..2f62631bd8 100644
--- a/samples/directions-panel/src/index.js
+++ b/samples/directions-panel/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_panel_script_body]
+// [START maps_directions_panel]
 export function initMap() {
   var directionsRenderer = new google.maps.DirectionsRenderer();
   var directionsService = new google.maps.DirectionsService();
@@ -57,4 +57,4 @@ export function calculateAndDisplayRoute(
     }
   );
 }
-// [END maps_directions_panel_script_body]
+// [END maps_directions_panel]
diff --git a/samples/directions-panel/src/index.njk b/samples/directions-panel/src/index.njk
index 55c479450f..bb1274eccb 100644
--- a/samples/directions-panel/src/index.njk
+++ b/samples/directions-panel/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_panel_html_body] -->
+<!-- [START maps_directions_panel] -->
 <div id="floating-panel">
   <strong>Start:</strong>
   <select id="start">
@@ -50,5 +50,5 @@ limitations under the License.
 </div>
 <div id="right-panel"></div>
 <div id="map"></div>
-<!-- [END maps_directions_panel_html_body] -->
+<!-- [END maps_directions_panel] -->
 {% endblock %}
diff --git a/samples/directions-panel/src/style.scss b/samples/directions-panel/src/style.scss
index 8109a3f105..ab0dc1cc02 100644
--- a/samples/directions-panel/src/style.scss
+++ b/samples/directions-panel/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_directions_panel_css] */
+/* [START maps_directions_panel] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 @import "../../../shared/scss/right-panel.scss";
@@ -47,4 +47,4 @@
     width: auto;
   }
 }
-/* [END maps_directions_panel_css] */
+/* [END maps_directions_panel] */
diff --git a/samples/directions-simple/src/index.js b/samples/directions-simple/src/index.js
index 4f2fe45a8c..f54c18a71a 100644
--- a/samples/directions-simple/src/index.js
+++ b/samples/directions-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_simple_script_body]
+// [START maps_directions_simple]
 export function initMap() {
   var directionsService = new google.maps.DirectionsService();
   var directionsRenderer = new google.maps.DirectionsRenderer();
@@ -50,4 +50,4 @@ export function calculateAndDisplayRoute(
     }
   );
 }
-// [END maps_directions_simple_script_body]
+// [END maps_directions_simple]
diff --git a/samples/directions-simple/src/index.njk b/samples/directions-simple/src/index.njk
index 840f058901..ab85dcdd80 100644
--- a/samples/directions-simple/src/index.njk
+++ b/samples/directions-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_simple_html_body] -->
+<!-- [START maps_directions_simple] -->
 <div id="floating-panel">
   <b>Start: </b>
   <select id="start">
@@ -48,5 +48,5 @@ limitations under the License.
   </select>
 </div>
 <div id="map"></div>
-<!-- [END maps_directions_simple_html_body] -->
+<!-- [END maps_directions_simple] -->
 {% endblock %}
diff --git a/samples/directions-simple/src/style.scss b/samples/directions-simple/src/style.scss
index e34b93a978..f7786a9bb7 100644
--- a/samples/directions-simple/src/style.scss
+++ b/samples/directions-simple/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_directions_simple_css] */
+/*! [START maps_directions_simple] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_directions_simple_css] */
+/*! [END maps_directions_simple] */
diff --git a/samples/directions-travel-modes/src/index.js b/samples/directions-travel-modes/src/index.js
index e26bda7119..26076a63bb 100644
--- a/samples/directions-travel-modes/src/index.js
+++ b/samples/directions-travel-modes/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_travel_modes_script_body]
+// [START maps_directions_travel_modes]
 export function initMap() {
   var directionsRenderer = new google.maps.DirectionsRenderer();
   var directionsService = new google.maps.DirectionsService();
@@ -53,4 +53,4 @@ export function calculateAndDisplayRoute(
     }
   );
 }
-// [END maps_directions_travel_modes_script_body]
+// [END maps_directions_travel_modes]
diff --git a/samples/directions-travel-modes/src/index.njk b/samples/directions-travel-modes/src/index.njk
index 0421a807c3..7827f77fb3 100644
--- a/samples/directions-travel-modes/src/index.njk
+++ b/samples/directions-travel-modes/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_travel_modes_html_body] -->
+<!-- [START maps_directions_travel_modes] -->
 <div id="floating-panel">
   <b>Mode of Travel: </b>
   <select id="mode">
@@ -25,5 +25,5 @@ limitations under the License.
   </select>
 </div>
 <div id="map"></div>
-<!-- [END maps_directions_travel_modes_html_body] -->
+<!-- [END maps_directions_travel_modes] -->
 {% endblock %}
diff --git a/samples/directions-travel-modes/src/style.scss b/samples/directions-travel-modes/src/style.scss
index a890b85394..d413e06d54 100644
--- a/samples/directions-travel-modes/src/style.scss
+++ b/samples/directions-travel-modes/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_directions_travel_modes_css] */
+/*! [START maps_directions_travel_modes] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_directions_travel_modes_css] */
+/*! [END maps_directions_travel_modes] */
diff --git a/samples/directions-waypoints/src/index.js b/samples/directions-waypoints/src/index.js
index 1c46816e4c..a99f856422 100644
--- a/samples/directions-waypoints/src/index.js
+++ b/samples/directions-waypoints/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_directions_waypoints_script_body]
+// [START maps_directions_waypoints]
 export function initMap() {
   var directionsService = new google.maps.DirectionsService();
   var directionsRenderer = new google.maps.DirectionsRenderer();
@@ -73,4 +73,4 @@ export function calculateAndDisplayRoute(
     }
   );
 }
-// [END maps_directions_waypoints_script_body]
+// [END maps_directions_waypoints]
diff --git a/samples/directions-waypoints/src/index.njk b/samples/directions-waypoints/src/index.njk
index 619103f4f0..d3e9cb745b 100644
--- a/samples/directions-waypoints/src/index.njk
+++ b/samples/directions-waypoints/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_directions_waypoints_html_body] -->
+<!-- [START maps_directions_waypoints] -->
 <div id="map"></div>
 <div id="right-panel">
   <div>
@@ -50,6 +50,6 @@ limitations under the License.
   </div>
   <div id="directions-panel"></div>
 </div>
-<!-- [END maps_directions_waypoints_html_body] -->
+<!-- [END maps_directions_waypoints] -->
 
 {% endblock %}
diff --git a/samples/directions-waypoints/src/style.scss b/samples/directions-waypoints/src/style.scss
index 489a06de6a..2914660524 100644
--- a/samples/directions-waypoints/src/style.scss
+++ b/samples/directions-waypoints/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_directions_waypoints_css] */
+/* [START maps_directions_waypoints] */
 @import "../../../shared/scss/right-panel.scss";
 
 html,
@@ -45,4 +45,4 @@ body {
   overflow: scroll;
   height: 174px;
 }
-/* [END maps_directions_waypoints_css] */
+/* [END maps_directions_waypoints] */
diff --git a/samples/disable-zoom-and-pan/src/index.js b/samples/disable-zoom-and-pan/src/index.js
index e0b80e9e00..c7723f72bf 100644
--- a/samples/disable-zoom-and-pan/src/index.js
+++ b/samples/disable-zoom-and-pan/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_disable_zoom_and_pan_script_body]
+// [START maps_disable_zoom_and_pan]
 // [START maps_disable_zoom_and_pan_script_snippet]
 export function initMap() {
   var locationRio = { lat: -22.915, lng: -43.197 };
@@ -31,4 +31,4 @@ export function initMap() {
     title: "Hello World!"
   });
 }
-// [END maps_disable_zoom_and_pan_script_body]
+// [END maps_disable_zoom_and_pan]
diff --git a/samples/disable-zoom-and-pan/src/index.njk b/samples/disable-zoom-and-pan/src/index.njk
index 1ecf7a4d17..e68824581d 100644
--- a/samples/disable-zoom-and-pan/src/index.njk
+++ b/samples/disable-zoom-and-pan/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_disable_zoom_and_pan_html_body] -->
+<!-- [START maps_disable_zoom_and_pan] -->
 <div id="map"></div>
-<!-- [END maps_disable_zoom_and_pan_html_body] -->
+<!-- [END maps_disable_zoom_and_pan] -->
 {% endblock %}
diff --git a/samples/disable-zoom-and-pan/src/style.scss b/samples/disable-zoom-and-pan/src/style.scss
index bd499ef64a..7a93319de2 100644
--- a/samples/disable-zoom-and-pan/src/style.scss
+++ b/samples/disable-zoom-and-pan/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_disable_zoom_and_pan_css] */
+/*! [START maps_disable_zoom_and_pan] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_disable_zoom_and_pan_css] */
+/*! [END maps_disable_zoom_and_pan] */
diff --git a/samples/distance-matrix/src/index.js b/samples/distance-matrix/src/index.js
index 93d6e92b0c..9f2042b057 100644
--- a/samples/distance-matrix/src/index.js
+++ b/samples/distance-matrix/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_distance_matrix_script_body]
+// [START maps_distance_matrix]
 export function initMap() {
   var bounds = new google.maps.LatLngBounds();
   var markersArray = [];
@@ -107,4 +107,4 @@ export function deleteMarkers(markersArray) {
   }
   markersArray = [];
 }
-// [END maps_distance_matrix_script_body]
+// [END maps_distance_matrix]
diff --git a/samples/distance-matrix/src/index.njk b/samples/distance-matrix/src/index.njk
index 3c6bf5a284..4228fc2504 100644
--- a/samples/distance-matrix/src/index.njk
+++ b/samples/distance-matrix/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_distance_matrix_html_body] -->
+<!-- [START maps_distance_matrix] -->
 <div id="right-panel">
   <div id="inputs">
     <pre>
@@ -31,5 +31,5 @@ var destinationB = {lat: 50.087, lng: 14.421};
   <div id="output"></div>
 </div>
 <div id="map"></div>
-<!-- [END maps_distance_matrix_html_body] -->
+<!-- [END maps_distance_matrix] -->
 {% endblock %}
diff --git a/samples/distance-matrix/src/style.scss b/samples/distance-matrix/src/style.scss
index dc47c297ba..6a8e24f90b 100644
--- a/samples/distance-matrix/src/style.scss
+++ b/samples/distance-matrix/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_distance_matrix_css] */
+/* [START maps_distance_matrix] */
 @import "../../../shared/scss/right-panel.scss";
 
 html,
@@ -35,4 +35,4 @@ body {
 #output {
   font-size: 11px;
 }
-/* [END maps_distance_matrix_css] */
+/* [END maps_distance_matrix] */
diff --git a/samples/drawing-tools/src/index.js b/samples/drawing-tools/src/index.js
index 191356b18f..6d2f4cf1fb 100644
--- a/samples/drawing-tools/src/index.js
+++ b/samples/drawing-tools/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_drawing_tools_script_body]
+// [START maps_drawing_tools]
 // This example requires the Drawing library. Include the libraries=drawing
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=drawing">
@@ -47,4 +47,4 @@ export function initMap() {
   });
   drawingManager.setMap(map);
 }
-// [END maps_drawing_tools_script_body]
+// [END maps_drawing_tools]
diff --git a/samples/drawing-tools/src/index.njk b/samples/drawing-tools/src/index.njk
index 9b36bfe3fd..2e59f50f2c 100644
--- a/samples/drawing-tools/src/index.njk
+++ b/samples/drawing-tools/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_drawing_tools_html_body] -->
+<!-- [START maps_drawing_tools] -->
 <div id="map"></div>
-<!-- [END maps_drawing_tools_html_body] -->
+<!-- [END maps_drawing_tools] -->
 {% endblock %}
diff --git a/samples/drawing-tools/src/style.scss b/samples/drawing-tools/src/style.scss
index ad6d405bbb..a1be110261 100644
--- a/samples/drawing-tools/src/style.scss
+++ b/samples/drawing-tools/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_drawing_tools_css] */
+/*! [START maps_drawing_tools] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_drawing_tools_css] */
+/*! [END maps_drawing_tools] */
diff --git a/samples/earthquake_circles/src/index.js b/samples/earthquake_circles/src/index.js
index e9fd1397e2..4f858876b6 100644
--- a/samples/earthquake_circles/src/index.js
+++ b/samples/earthquake_circles/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_earthquake_circles_script_body]
+// [START maps_earthquake_circles]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -54,4 +54,4 @@ export function getCircle(magnitude) {
 export function eqfeed_callback(results) {
   map.data.addGeoJson(results);
 }
-// [END maps_earthquake_circles_script_body]
+// [END maps_earthquake_circles]
diff --git a/samples/earthquake_circles/src/index.njk b/samples/earthquake_circles/src/index.njk
index 9e4aaf93ad..43f7441468 100644
--- a/samples/earthquake_circles/src/index.njk
+++ b/samples/earthquake_circles/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_earthquake_circles_html_body] -->
+<!-- [START maps_earthquake_circles] -->
 <div id="map"></div>
-<!-- [END maps_earthquake_circles_html_body] -->
+<!-- [END maps_earthquake_circles] -->
 {% endblock %}
diff --git a/samples/earthquake_circles/src/style.scss b/samples/earthquake_circles/src/style.scss
index 81e372cc86..ac2db26fc7 100644
--- a/samples/earthquake_circles/src/style.scss
+++ b/samples/earthquake_circles/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_earthquake_circles_css] */
+/*! [START maps_earthquake_circles] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_earthquake_circles_css] */
+/*! [END maps_earthquake_circles] */
diff --git a/samples/earthquake_heatmap/src/index.js b/samples/earthquake_heatmap/src/index.js
index 23fbd795f7..e6b11ec570 100644
--- a/samples/earthquake_heatmap/src/index.js
+++ b/samples/earthquake_heatmap/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_earthquake_heatmap_script_body]
+// [START maps_earthquake_heatmap]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -46,4 +46,4 @@ export function eqfeed_callback(results) {
     map: map
   });
 }
-// [END maps_earthquake_heatmap_script_body]
+// [END maps_earthquake_heatmap]
diff --git a/samples/earthquake_heatmap/src/index.njk b/samples/earthquake_heatmap/src/index.njk
index 47800f7dec..cf28f8eab9 100644
--- a/samples/earthquake_heatmap/src/index.njk
+++ b/samples/earthquake_heatmap/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_earthquake_heatmap_html_body] -->
+<!-- [START maps_earthquake_heatmap] -->
 <div id="map"></div>
-<!-- [END maps_earthquake_heatmap_html_body] -->
+<!-- [END maps_earthquake_heatmap] -->
 {% endblock %}
diff --git a/samples/earthquake_heatmap/src/style.scss b/samples/earthquake_heatmap/src/style.scss
index 9846d9141a..1ecdb16717 100644
--- a/samples/earthquake_heatmap/src/style.scss
+++ b/samples/earthquake_heatmap/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_earthquake_heatmap_css] */
+/*! [START maps_earthquake_heatmap] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_earthquake_heatmap_css] */
+/*! [END maps_earthquake_heatmap] */
diff --git a/samples/earthquake_heatmap_weighted/src/index.js b/samples/earthquake_heatmap_weighted/src/index.js
index 0738b011ab..d00b2c444e 100644
--- a/samples/earthquake_heatmap_weighted/src/index.js
+++ b/samples/earthquake_heatmap_weighted/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_earthquake_heatmap_weighted_script_body]
+// [START maps_earthquake_heatmap_weighted]
 export var map;
 
 export function initMap() {
@@ -52,4 +52,4 @@ window.eqfeed_callback = function(results) {
     map: map
   });
 };
-// [END maps_earthquake_heatmap_weighted_script_body]
+// [END maps_earthquake_heatmap_weighted]
diff --git a/samples/earthquake_heatmap_weighted/src/index.njk b/samples/earthquake_heatmap_weighted/src/index.njk
index 3f406c0057..5f2fa0b4c1 100644
--- a/samples/earthquake_heatmap_weighted/src/index.njk
+++ b/samples/earthquake_heatmap_weighted/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_earthquake_heatmap_weighted_html_body] -->
+<!-- [START maps_earthquake_heatmap_weighted] -->
 <div id="map"></div>
-<!-- [END maps_earthquake_heatmap_weighted_html_body] -->
+<!-- [END maps_earthquake_heatmap_weighted] -->
 {% endblock %}
diff --git a/samples/earthquake_heatmap_weighted/src/style.scss b/samples/earthquake_heatmap_weighted/src/style.scss
index 20102007e9..b1abfd174b 100644
--- a/samples/earthquake_heatmap_weighted/src/style.scss
+++ b/samples/earthquake_heatmap_weighted/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_earthquake_heatmap_weighted_css] */
+/*! [START maps_earthquake_heatmap_weighted] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_earthquake_heatmap_weighted_css] */
+/*! [END maps_earthquake_heatmap_weighted] */
diff --git a/samples/earthquake_markers/src/index.js b/samples/earthquake_markers/src/index.js
index 7adf323bf1..d0d612a069 100644
--- a/samples/earthquake_markers/src/index.js
+++ b/samples/earthquake_markers/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_earthquake_markers_script_body]
+// [START maps_earthquake_markers]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -44,4 +44,4 @@ window.eqfeed_callback = function(results) {
     });
   }
 };
-// [END maps_earthquake_markers_script_body]
+// [END maps_earthquake_markers]
diff --git a/samples/earthquake_markers/src/index.njk b/samples/earthquake_markers/src/index.njk
index d14ae23dbc..8e3a42a288 100644
--- a/samples/earthquake_markers/src/index.njk
+++ b/samples/earthquake_markers/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_earthquake_markers_html_body] -->
+<!-- [START maps_earthquake_markers] -->
 <div id="map"></div>
-<!-- [END maps_earthquake_markers_html_body] -->
+<!-- [END maps_earthquake_markers] -->
 {% endblock %}
diff --git a/samples/earthquake_markers/src/style.scss b/samples/earthquake_markers/src/style.scss
index ea4cf567e0..8f4e90b7be 100644
--- a/samples/earthquake_markers/src/style.scss
+++ b/samples/earthquake_markers/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_earthquake_markers_css] */
+/*! [START maps_earthquake_markers] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_earthquake_markers_css] */
+/*! [END maps_earthquake_markers] */
diff --git a/samples/elevation-paths/src/index.js b/samples/elevation-paths/src/index.js
index adf024596d..88c1fc9434 100644
--- a/samples/elevation-paths/src/index.js
+++ b/samples/elevation-paths/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_elevation_paths_script_body]
+// [START maps_elevation_paths]
 // Load the Visualization API and the columnchart package.
 google.load("visualization", "1", { packages: ["columnchart"] });
 
@@ -95,4 +95,4 @@ export function plotElevation(elevations, status) {
     titleY: "Elevation (m)"
   });
 }
-// [END maps_elevation_paths_script_body]
+// [END maps_elevation_paths]
diff --git a/samples/elevation-paths/src/index.njk b/samples/elevation-paths/src/index.njk
index 7d73cf0468..9bb3fe3f90 100644
--- a/samples/elevation-paths/src/index.njk
+++ b/samples/elevation-paths/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_elevation_paths_html_body] -->
+<!-- [START maps_elevation_paths] -->
 <div>
   <div id="map" style="height:250px;"></div>
   <div id="elevation_chart"></div>
 </div>
-<!-- [END maps_elevation_paths_html_body] -->
+<!-- [END maps_elevation_paths] -->
 
 {% endblock %}
diff --git a/samples/elevation-paths/src/style.scss b/samples/elevation-paths/src/style.scss
index ad5a1d6eba..869001f464 100644
--- a/samples/elevation-paths/src/style.scss
+++ b/samples/elevation-paths/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_elevation_paths_css] */
+/*! [START maps_elevation_paths] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_elevation_paths_css] */
+/*! [END maps_elevation_paths] */
diff --git a/samples/elevation-simple/src/index.js b/samples/elevation-simple/src/index.js
index 3733bc5772..55291270e9 100644
--- a/samples/elevation-simple/src/index.js
+++ b/samples/elevation-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_elevation_simple_script_body]
+// [START maps_elevation_simple]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 8,
@@ -57,4 +57,4 @@ export function displayLocationElevation(location, elevator, infowindow) {
     }
   );
 }
-// [END maps_elevation_simple_script_body]
+// [END maps_elevation_simple]
diff --git a/samples/elevation-simple/src/index.njk b/samples/elevation-simple/src/index.njk
index fb912dc1c5..e809830eae 100644
--- a/samples/elevation-simple/src/index.njk
+++ b/samples/elevation-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_elevation_simple_html_body] -->
+<!-- [START maps_elevation_simple] -->
 <div id="map"></div>
-<!-- [END maps_elevation_simple_html_body] -->
+<!-- [END maps_elevation_simple] -->
 {% endblock %}
diff --git a/samples/elevation-simple/src/style.scss b/samples/elevation-simple/src/style.scss
index ec6af471bd..a67abaf0a3 100644
--- a/samples/elevation-simple/src/style.scss
+++ b/samples/elevation-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_elevation_simple_css] */
+/*! [START maps_elevation_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_elevation_simple_css] */
+/*! [END maps_elevation_simple] */
diff --git a/samples/event-arguments/src/index.js b/samples/event-arguments/src/index.js
index 3b770e9522..cb6e7f1b4b 100644
--- a/samples/event-arguments/src/index.js
+++ b/samples/event-arguments/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_arguments_script_body]
+// [START maps_event_arguments]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -33,4 +33,4 @@ export function placeMarkerAndPanTo(latLng, map) {
   });
   map.panTo(latLng);
 }
-// [END maps_event_arguments_script_body]
+// [END maps_event_arguments]
diff --git a/samples/event-arguments/src/index.njk b/samples/event-arguments/src/index.njk
index ed5270c8fe..cb86085a99 100644
--- a/samples/event-arguments/src/index.njk
+++ b/samples/event-arguments/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_arguments_html_body] -->
+<!-- [START maps_event_arguments] -->
 <div id="map"></div>
-<!-- [END maps_event_arguments_html_body] -->
+<!-- [END maps_event_arguments] -->
 {% endblock %}
diff --git a/samples/event-arguments/src/style.scss b/samples/event-arguments/src/style.scss
index 7109533ca5..8c1f4ca82b 100644
--- a/samples/event-arguments/src/style.scss
+++ b/samples/event-arguments/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_event_arguments_css] */
+/*! [START maps_event_arguments] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_event_arguments_css] */
+/*! [END maps_event_arguments] */
diff --git a/samples/event-closure/src/index.js b/samples/event-closure/src/index.js
index 308dd934d0..f65b53f94f 100644
--- a/samples/event-closure/src/index.js
+++ b/samples/event-closure/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_closure_script_body]
+// [START maps_event_closure]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -61,4 +61,4 @@ export function attachSecretMessage(marker, secretMessage) {
     infowindow.open(marker.get("map"), marker);
   });
 }
-// [END maps_event_closure_script_body]
+// [END maps_event_closure]
diff --git a/samples/event-closure/src/index.njk b/samples/event-closure/src/index.njk
index 5e17072deb..e3dc48b521 100644
--- a/samples/event-closure/src/index.njk
+++ b/samples/event-closure/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_closure_html_body] -->
+<!-- [START maps_event_closure] -->
 <div id="map"></div>
-<!-- [END maps_event_closure_html_body] -->
+<!-- [END maps_event_closure] -->
 {% endblock %}
diff --git a/samples/event-closure/src/style.scss b/samples/event-closure/src/style.scss
index f52aec2c19..467ec87688 100644
--- a/samples/event-closure/src/style.scss
+++ b/samples/event-closure/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_event_closure_css] */
+/*! [START maps_event_closure] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_event_closure_css] */
+/*! [END maps_event_closure] */
diff --git a/samples/event-domListener/src/index.js b/samples/event-domListener/src/index.js
index cd53804162..eb5a426137 100644
--- a/samples/event-domListener/src/index.js
+++ b/samples/event-domListener/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_domListener_script_body]
+// [START maps_event_domListener]
 export function initMap() {
   var mapDiv = document.getElementById("map");
   var map = new google.maps.Map(mapDiv, {
@@ -28,4 +28,4 @@ export function initMap() {
     window.alert("Map was clicked!");
   });
 }
-// [END maps_event_domListener_script_body]
+// [END maps_event_domListener]
diff --git a/samples/event-domListener/src/index.njk b/samples/event-domListener/src/index.njk
index ee0c4b9cad..35df5606e5 100644
--- a/samples/event-domListener/src/index.njk
+++ b/samples/event-domListener/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_domListener_html_body] -->
+<!-- [START maps_event_domListener] -->
 <div id="map"></div>
-<!-- [END maps_event_domListener_html_body] -->
+<!-- [END maps_event_domListener] -->
 {% endblock %}
diff --git a/samples/event-domListener/src/style.scss b/samples/event-domListener/src/style.scss
index f185c9c35a..ac363ec5a5 100644
--- a/samples/event-domListener/src/style.scss
+++ b/samples/event-domListener/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_event_domListener_css] */
+/*! [START maps_event_domListener] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_event_domListener_css] */
+/*! [END maps_event_domListener] */
diff --git a/samples/event-poi/src/index.js b/samples/event-poi/src/index.js
index 10e5808ebe..53a85744f5 100644
--- a/samples/event-poi/src/index.js
+++ b/samples/event-poi/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_poi_script_body]
+// [START maps_event_poi]
 export function initMap() {
   var origin = { lat: -33.871, lng: 151.197 };
 
@@ -92,4 +92,4 @@ ClickEventHandler.prototype.getPlaceInformation = function(placeId) {
     }
   });
 };
-// [END maps_event_poi_script_body]
+// [END maps_event_poi]
diff --git a/samples/event-poi/src/index.njk b/samples/event-poi/src/index.njk
index 949d764c78..2afb503487 100644
--- a/samples/event-poi/src/index.njk
+++ b/samples/event-poi/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_poi_html_body] -->
+<!-- [START maps_event_poi] -->
 <div id="map"></div>
 <div id="infowindow-content">
   <img id="place-icon" src="" height="16" width="16" />
@@ -22,6 +22,6 @@ limitations under the License.
   Place ID <span id="place-id"></span><br />
   <span id="place-address"></span>
 </div>
-<!-- [END maps_event_poi_html_body] -->
+<!-- [END maps_event_poi] -->
 
 {% endblock %}
diff --git a/samples/event-poi/src/style.scss b/samples/event-poi/src/style.scss
index c2f82879e9..2226cc8486 100644
--- a/samples/event-poi/src/style.scss
+++ b/samples/event-poi/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_event_poi_css] */
+/* [START maps_event_poi] */
 
 /* Always set the map height explicitly to define the size of the div
        * element that contains the map. */
@@ -37,4 +37,4 @@ body {
 #map #infowindow-content {
   display: inline;
 }
-/* [END maps_event_poi_css] */
+/* [END maps_event_poi] */
diff --git a/samples/event-properties/src/index.js b/samples/event-properties/src/index.js
index ae4a105b7a..2a378ae87e 100644
--- a/samples/event-properties/src/index.js
+++ b/samples/event-properties/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_properties_script_body]
+// [START maps_event_properties]
 export function initMap() {
   var originalMapCenter = new google.maps.LatLng(-25.363882, 131.044922);
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -32,4 +32,4 @@ export function initMap() {
     infowindow.setContent("Zoom: " + map.getZoom());
   });
 }
-// [END maps_event_properties_script_body]
+// [END maps_event_properties]
diff --git a/samples/event-properties/src/index.njk b/samples/event-properties/src/index.njk
index 4eb8a51d51..03ebb787a2 100644
--- a/samples/event-properties/src/index.njk
+++ b/samples/event-properties/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_properties_html_body] -->
+<!-- [START maps_event_properties] -->
 <div id="map"></div>
-<!-- [END maps_event_properties_html_body] -->
+<!-- [END maps_event_properties] -->
 {% endblock %}
diff --git a/samples/event-properties/src/style.scss b/samples/event-properties/src/style.scss
index dd5937520c..e2763ebbf4 100644
--- a/samples/event-properties/src/style.scss
+++ b/samples/event-properties/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_event_properties_css] */
+/*! [START maps_event_properties] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_event_properties_css] */
+/*! [END maps_event_properties] */
diff --git a/samples/event-simple/src/index.js b/samples/event-simple/src/index.js
index 572a9dfb58..7e98b6cb79 100644
--- a/samples/event-simple/src/index.js
+++ b/samples/event-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_event_simple_script_body]
+// [START maps_event_simple]
 export function initMap() {
   var myLatlng = { lat: -25.363, lng: 131.044 };
 
@@ -42,4 +42,4 @@ export function initMap() {
     map.setCenter(marker.getPosition());
   });
 }
-// [END maps_event_simple_script_body]
+// [END maps_event_simple]
diff --git a/samples/event-simple/src/index.njk b/samples/event-simple/src/index.njk
index e47c465042..ddaf18d6b6 100644
--- a/samples/event-simple/src/index.njk
+++ b/samples/event-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_event_simple_html_body] -->
+<!-- [START maps_event_simple] -->
 <div id="map"></div>
-<!-- [END maps_event_simple_html_body] -->
+<!-- [END maps_event_simple] -->
 {% endblock %}
diff --git a/samples/event-simple/src/style.scss b/samples/event-simple/src/style.scss
index d289510e11..0cf8d4749b 100644
--- a/samples/event-simple/src/style.scss
+++ b/samples/event-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_event_simple_css] */
+/*! [START maps_event_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_event_simple_css] */
+/*! [END maps_event_simple] */
diff --git a/samples/firebase-map/src/index.js b/samples/firebase-map/src/index.js
index 6fab0ab5c3..e043293a87 100644
--- a/samples/firebase-map/src/index.js
+++ b/samples/firebase-map/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_firebase_map_script_body]
+// [START maps_firebase_map]
 /**
  * Firebase config block.
  */
@@ -226,4 +226,4 @@ export function addToFirebase(data) {
       });
   });
 }
-// [END maps_firebase_map_script_body]
+// [END maps_firebase_map]
diff --git a/samples/firebase-map/src/index.njk b/samples/firebase-map/src/index.njk
index 171fc76c3f..7de8475445 100644
--- a/samples/firebase-map/src/index.njk
+++ b/samples/firebase-map/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_firebase_map_html_body] -->
+<!-- [START maps_firebase_map] -->
 <div id="map"></div>
-<!-- [END maps_firebase_map_html_body] -->
+<!-- [END maps_firebase_map] -->
 {% endblock %}
diff --git a/samples/firebase-map/src/style.scss b/samples/firebase-map/src/style.scss
index 9f28e54824..316e858e84 100644
--- a/samples/firebase-map/src/style.scss
+++ b/samples/firebase-map/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_firebase_map_css] */
+/*! [START maps_firebase_map] */
 
-/*! [END maps_firebase_map_css] */
+/*! [END maps_firebase_map] */
diff --git a/samples/geocoding-component-restriction/src/index.js b/samples/geocoding-component-restriction/src/index.js
index 6d0dcc21b6..026c0f0c63 100644
--- a/samples/geocoding-component-restriction/src/index.js
+++ b/samples/geocoding-component-restriction/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geocoding_component_restriction_script_body]
+// [START maps_geocoding_component_restriction]
 export function initMap() {
   var geocoder = new google.maps.Geocoder();
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -50,4 +50,4 @@ export function geocodeAddress(geocoder, map) {
     }
   );
 }
-// [END maps_geocoding_component_restriction_script_body]
+// [END maps_geocoding_component_restriction]
diff --git a/samples/geocoding-component-restriction/src/index.njk b/samples/geocoding-component-restriction/src/index.njk
index f3876445b6..b27b3249d0 100644
--- a/samples/geocoding-component-restriction/src/index.njk
+++ b/samples/geocoding-component-restriction/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geocoding_component_restriction_html_body] -->
+<!-- [START maps_geocoding_component_restriction] -->
 <div id="floating-panel">
   <pre>componentRestrictions: {country: "AU", postalCode: "2000"}</pre>
   <button id="submit">Geocode</button>
 </div>
 <div id="map"></div>
-<!-- [END maps_geocoding_component_restriction_html_body] -->
+<!-- [END maps_geocoding_component_restriction] -->
 {% endblock %}
diff --git a/samples/geocoding-component-restriction/src/style.scss b/samples/geocoding-component-restriction/src/style.scss
index 04a4751c5d..c43bb14096 100644
--- a/samples/geocoding-component-restriction/src/style.scss
+++ b/samples/geocoding-component-restriction/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_geocoding_component_restriction_css] */
+/*! [START maps_geocoding_component_restriction] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_geocoding_component_restriction_css] */
+/*! [END maps_geocoding_component_restriction] */
diff --git a/samples/geocoding-place-id/src/index.js b/samples/geocoding-place-id/src/index.js
index 35fc4af7a6..3b393d25da 100644
--- a/samples/geocoding-place-id/src/index.js
+++ b/samples/geocoding-place-id/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geocoding_place_id_script_body]
+// [START maps_geocoding_place_id]
 // Initialize the map.
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -52,4 +52,4 @@ export function geocodePlaceId(geocoder, map, infowindow) {
     }
   });
 }
-// [END maps_geocoding_place_id_script_body]
+// [END maps_geocoding_place_id]
diff --git a/samples/geocoding-place-id/src/index.njk b/samples/geocoding-place-id/src/index.njk
index 998963611e..2bdfaa4fea 100644
--- a/samples/geocoding-place-id/src/index.njk
+++ b/samples/geocoding-place-id/src/index.njk
@@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geocoding_place_id_html_body] -->
+<!-- [START maps_geocoding_place_id] -->
 <div id="floating-panel">
   <!-- Supply a default place ID for a place in Brooklyn, New York. -->
   <input id="place-id" type="text" value="ChIJd8BlQ2BZwokRAFUEcm_qrcA" />
   <input id="submit" type="button" value="Get Address for Place ID" />
 </div>
 <div id="map"></div>
-<!-- [END maps_geocoding_place_id_html_body] -->
+<!-- [END maps_geocoding_place_id] -->
 
 {% endblock %}
diff --git a/samples/geocoding-place-id/src/style.scss b/samples/geocoding-place-id/src/style.scss
index dde347753a..14c2ec09af 100644
--- a/samples/geocoding-place-id/src/style.scss
+++ b/samples/geocoding-place-id/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_geocoding_place_id_css] */
+/* [START maps_geocoding_place_id] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
@@ -24,4 +24,4 @@
 #place-id {
   width: 250px;
 }
-/* [END maps_geocoding_place_id_css] */
+/* [END maps_geocoding_place_id] */
diff --git a/samples/geocoding-region/src/index.js b/samples/geocoding-region/src/index.js
index 5f98d25159..b49d931d44 100644
--- a/samples/geocoding-region/src/index.js
+++ b/samples/geocoding-region/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geocoding_region_script_body]
+// [START maps_geocoding_region]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), { zoom: 8 });
   var geocoder = new google.maps.Geocoder();
@@ -32,4 +32,4 @@ export function initMap() {
     }
   });
 }
-// [END maps_geocoding_region_script_body]
+// [END maps_geocoding_region]
diff --git a/samples/geocoding-region/src/index.njk b/samples/geocoding-region/src/index.njk
index f3e2bd4f6b..6cee6fa017 100644
--- a/samples/geocoding-region/src/index.njk
+++ b/samples/geocoding-region/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geocoding_region_html_body] -->
+<!-- [START maps_geocoding_region] -->
 <div id="map"></div>
-<!-- [END maps_geocoding_region_html_body] -->
+<!-- [END maps_geocoding_region] -->
 {% endblock %}
diff --git a/samples/geocoding-region/src/style.scss b/samples/geocoding-region/src/style.scss
index 75db812e2c..a20f71e770 100644
--- a/samples/geocoding-region/src/style.scss
+++ b/samples/geocoding-region/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_geocoding_region_css] */
+/*! [START maps_geocoding_region] */
 
-/*! [END maps_geocoding_region_css] */
+/*! [END maps_geocoding_region] */
diff --git a/samples/geocoding-reverse/src/index.js b/samples/geocoding-reverse/src/index.js
index 802be2285e..769707a4dc 100644
--- a/samples/geocoding-reverse/src/index.js
+++ b/samples/geocoding-reverse/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geocoding_reverse_script_body]
+// [START maps_geocoding_reverse]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 8,
@@ -50,4 +50,4 @@ export function geocodeLatLng(geocoder, map, infowindow) {
     }
   });
 }
-// [END maps_geocoding_reverse_script_body]
+// [END maps_geocoding_reverse]
diff --git a/samples/geocoding-reverse/src/index.njk b/samples/geocoding-reverse/src/index.njk
index d76443104f..afbcf4c693 100644
--- a/samples/geocoding-reverse/src/index.njk
+++ b/samples/geocoding-reverse/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geocoding_reverse_html_body] -->
+<!-- [START maps_geocoding_reverse] -->
 <div id="floating-panel">
   <input id="latlng" type="text" value="40.714224,-73.961452" />
   <input id="submit" type="button" value="Reverse Geocode" />
 </div>
 <div id="map"></div>
-<!-- [END maps_geocoding_reverse_html_body] -->
+<!-- [END maps_geocoding_reverse] -->
 {% endblock %}
diff --git a/samples/geocoding-reverse/src/style.scss b/samples/geocoding-reverse/src/style.scss
index f24f1aef2f..e5e763108c 100644
--- a/samples/geocoding-reverse/src/style.scss
+++ b/samples/geocoding-reverse/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_geocoding_reverse_css] */
+/* [START maps_geocoding_reverse] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
@@ -32,4 +32,4 @@
 #latlng {
   width: 225px;
 }
-/* [END maps_geocoding_reverse_css] */
+/* [END maps_geocoding_reverse] */
diff --git a/samples/geocoding-simple/src/index.js b/samples/geocoding-simple/src/index.js
index f1610830eb..8383b2e947 100644
--- a/samples/geocoding-simple/src/index.js
+++ b/samples/geocoding-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geocoding_simple_script_body]
+// [START maps_geocoding_simple]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 8,
@@ -41,4 +41,4 @@ export function geocodeAddress(geocoder, resultsMap) {
     }
   });
 }
-// [END maps_geocoding_simple_script_body]
+// [END maps_geocoding_simple]
diff --git a/samples/geocoding-simple/src/index.njk b/samples/geocoding-simple/src/index.njk
index 87326ed591..46e2ac133a 100644
--- a/samples/geocoding-simple/src/index.njk
+++ b/samples/geocoding-simple/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geocoding_simple_html_body] -->
+<!-- [START maps_geocoding_simple] -->
 <div id="floating-panel">
   <input id="address" type="textbox" value="Sydney, NSW" />
   <input id="submit" type="button" value="Geocode" />
 </div>
 <div id="map"></div>
-<!-- [END maps_geocoding_simple_html_body] -->
+<!-- [END maps_geocoding_simple] -->
 {% endblock %}
diff --git a/samples/geocoding-simple/src/style.scss b/samples/geocoding-simple/src/style.scss
index ed473aaef8..e655640a30 100644
--- a/samples/geocoding-simple/src/style.scss
+++ b/samples/geocoding-simple/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_geocoding_simple_css] */
+/*! [START maps_geocoding_simple] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_geocoding_simple_css] */
+/*! [END maps_geocoding_simple] */
diff --git a/samples/geometry-encodings/src/index.js b/samples/geometry-encodings/src/index.js
index e760096db9..4b1eb357a8 100644
--- a/samples/geometry-encodings/src/index.js
+++ b/samples/geometry-encodings/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geometry_encodings_script_body]
+// [START maps_geometry_encodings]
 // This example requires the Geometry library. Include the libraries=geometry
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=geometry">
@@ -53,4 +53,4 @@ export function addLatLngToPoly(latLng, poly) {
     document.getElementById("encoded-polyline").value = encodeString;
   }
 }
-// [END maps_geometry_encodings_script_body]
+// [END maps_geometry_encodings]
diff --git a/samples/geometry-encodings/src/index.njk b/samples/geometry-encodings/src/index.njk
index 59c2430a7a..51f5a9e08b 100644
--- a/samples/geometry-encodings/src/index.njk
+++ b/samples/geometry-encodings/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geometry_encodings_html_body] -->
+<!-- [START maps_geometry_encodings] -->
 <div id="map"></div>
 <div id="right-panel">
   <div>Encoding:</div>
   <textarea id="encoded-polyline"></textarea>
 </div>
-<!-- [END maps_geometry_encodings_html_body] -->
+<!-- [END maps_geometry_encodings] -->
 {% endblock %}
diff --git a/samples/geometry-encodings/src/style.scss b/samples/geometry-encodings/src/style.scss
index a0cf5c9507..b7361bddae 100644
--- a/samples/geometry-encodings/src/style.scss
+++ b/samples/geometry-encodings/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_geometry_encodings_css] */
+/* [START maps_geometry_encodings] */
 @import "../../../shared/scss/right-panel.scss";
 
 html,
@@ -36,4 +36,4 @@ body {
   height: 100px;
   width: 100%;
 }
-/* [END maps_geometry_encodings_css] */
+/* [END maps_geometry_encodings] */
diff --git a/samples/geometry-headings/src/index.js b/samples/geometry-headings/src/index.js
index f2e83841f4..7eb53a8c66 100644
--- a/samples/geometry-headings/src/index.js
+++ b/samples/geometry-headings/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_geometry_headings_script_body]
+// [START maps_geometry_headings]
 // This example requires the Geometry library. Include the libraries=geometry
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=geometry">
@@ -80,4 +80,4 @@ export function update() {
   document.getElementById("origin").value = path[0].toString();
   document.getElementById("destination").value = path[1].toString();
 }
-// [END maps_geometry_headings_script_body]
+// [END maps_geometry_headings]
diff --git a/samples/geometry-headings/src/index.njk b/samples/geometry-headings/src/index.njk
index bda9d66e3b..d8ea6ceae3 100644
--- a/samples/geometry-headings/src/index.njk
+++ b/samples/geometry-headings/src/index.njk
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_geometry_headings_html_body] -->
+<!-- [START maps_geometry_headings] -->
 <div id="map"></div>
 <div id="floating-panel">
   Origin: <input type="text" readonly id="origin" /> Destination:
   <input type="text" readonly id="destination" /><br />
   Heading: <input type="text" readonly id="heading" /> degrees
 </div>
-<!-- [END maps_geometry_headings_html_body] -->
+<!-- [END maps_geometry_headings] -->
 {% endblock %}
diff --git a/samples/geometry-headings/src/style.scss b/samples/geometry-headings/src/style.scss
index 4b235ba5ee..3723437842 100644
--- a/samples/geometry-headings/src/style.scss
+++ b/samples/geometry-headings/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_geometry_headings_css] */
+/*! [START maps_geometry_headings] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_geometry_headings_css] */
+/*! [END maps_geometry_headings] */
diff --git a/samples/groundoverlay-simple/src/index.js b/samples/groundoverlay-simple/src/index.js
index 6c496cb4e7..0a79a19067 100644
--- a/samples/groundoverlay-simple/src/index.js
+++ b/samples/groundoverlay-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_groundoverlay_simple_script_body]
+// [START maps_groundoverlay_simple]
 // This example uses a GroundOverlay to place an image on the map
 // showing an antique map of Newark, NJ.
 
@@ -39,4 +39,4 @@ export function initMap() {
   );
   historicalOverlay.setMap(map);
 }
-// [END maps_groundoverlay_simple_script_body]
+// [END maps_groundoverlay_simple]
diff --git a/samples/groundoverlay-simple/src/index.njk b/samples/groundoverlay-simple/src/index.njk
index 845515e49b..9d2676a5bc 100644
--- a/samples/groundoverlay-simple/src/index.njk
+++ b/samples/groundoverlay-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_groundoverlay_simple_html_body] -->
+<!-- [START maps_groundoverlay_simple] -->
 <div id="map"></div>
-<!-- [END maps_groundoverlay_simple_html_body] -->
+<!-- [END maps_groundoverlay_simple] -->
 {% endblock %}
diff --git a/samples/groundoverlay-simple/src/style.scss b/samples/groundoverlay-simple/src/style.scss
index 4d8e430a08..52fa14186d 100644
--- a/samples/groundoverlay-simple/src/style.scss
+++ b/samples/groundoverlay-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_groundoverlay_simple_css] */
+/*! [START maps_groundoverlay_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_groundoverlay_simple_css] */
+/*! [END maps_groundoverlay_simple] */
diff --git a/samples/hiding-features/src/index.js b/samples/hiding-features/src/index.js
index 5220dfd139..88f7c2ad9a 100644
--- a/samples/hiding-features/src/index.js
+++ b/samples/hiding-features/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_hiding_features_script_body]
+// [START maps_hiding_features]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -51,4 +51,4 @@ export var styles = {
   ]
 };
 
-// [END maps_hiding_features_script_body]
+// [END maps_hiding_features]
diff --git a/samples/hiding-features/src/index.njk b/samples/hiding-features/src/index.njk
index d95bb094f5..50a81bb5ea 100644
--- a/samples/hiding-features/src/index.njk
+++ b/samples/hiding-features/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_hiding_features_html_body] -->
+<!-- [START maps_hiding_features] -->
 <div id="style-selector-control" class="map-control">
   <input type="radio" name="show-hide" id="hide-poi" class="selector-control" />
   <label for="hide-poi">Hide</label>
@@ -28,6 +28,6 @@ limitations under the License.
   <label for="show-poi">Show</label>
 </div>
 <div id="map"></div>
-<!-- [END maps_hiding_features_html_body] -->
+<!-- [END maps_hiding_features] -->
 
 {% endblock %}
diff --git a/samples/hiding-features/src/style.scss b/samples/hiding-features/src/style.scss
index 9589f48a90..350367fa50 100644
--- a/samples/hiding-features/src/style.scss
+++ b/samples/hiding-features/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_hiding_features_css] */
+/* [START maps_hiding_features] */
 @import "../../../shared/scss/default.scss";
 
 .map-control {
@@ -38,4 +38,4 @@
   line-height: 30px;
   vertical-align: baseline;
 }
-/* [END maps_hiding_features_css] */
+/* [END maps_hiding_features] */
diff --git a/samples/icon-complex/src/index.js b/samples/icon-complex/src/index.js
index 3a33af0bec..f4adb3a3d1 100644
--- a/samples/icon-complex/src/index.js
+++ b/samples/icon-complex/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_icon_complex_script_body]
+// [START maps_icon_complex]
 // The following example creates complex markers to indicate beaches near
 // Sydney, NSW, Australia. Note that the anchor is set to (0,32) to correspond
 // to the base of the flagpole.
@@ -75,4 +75,4 @@ export function setMarkers(map) {
     });
   }
 }
-// [END maps_icon_complex_script_body]
+// [END maps_icon_complex]
diff --git a/samples/icon-complex/src/index.njk b/samples/icon-complex/src/index.njk
index 397fcee490..2475cede6b 100644
--- a/samples/icon-complex/src/index.njk
+++ b/samples/icon-complex/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_icon_complex_html_body] -->
+<!-- [START maps_icon_complex] -->
 <div id="map"></div>
-<!-- [END maps_icon_complex_html_body] -->
+<!-- [END maps_icon_complex] -->
 {% endblock %}
diff --git a/samples/icon-complex/src/style.scss b/samples/icon-complex/src/style.scss
index 787c2d4274..a8d497aa06 100644
--- a/samples/icon-complex/src/style.scss
+++ b/samples/icon-complex/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_icon_complex_css] */
+/*! [START maps_icon_complex] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_icon_complex_css] */
+/*! [END maps_icon_complex] */
diff --git a/samples/icon-simple/src/index.js b/samples/icon-simple/src/index.js
index 48a70e0475..d4839df0d7 100644
--- a/samples/icon-simple/src/index.js
+++ b/samples/icon-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_icon_simple_script_body]
+// [START maps_icon_simple]
 // This example adds a marker to indicate the position of Bondi Beach in Sydney,
 // Australia.
 export function initMap() {
@@ -31,4 +31,4 @@ export function initMap() {
     icon: image
   });
 }
-// [END maps_icon_simple_script_body]
+// [END maps_icon_simple]
diff --git a/samples/icon-simple/src/index.njk b/samples/icon-simple/src/index.njk
index f2dd5c0203..4cd1581588 100644
--- a/samples/icon-simple/src/index.njk
+++ b/samples/icon-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_icon_simple_html_body] -->
+<!-- [START maps_icon_simple] -->
 <div id="map"></div>
-<!-- [END maps_icon_simple_html_body] -->
+<!-- [END maps_icon_simple] -->
 {% endblock %}
diff --git a/samples/icon-simple/src/style.scss b/samples/icon-simple/src/style.scss
index 1e5ef89152..ef631e509f 100644
--- a/samples/icon-simple/src/style.scss
+++ b/samples/icon-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_icon_simple_css] */
+/*! [START maps_icon_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_icon_simple_css] */
+/*! [END maps_icon_simple] */
diff --git a/samples/infowindow-simple-max/src/index.js b/samples/infowindow-simple-max/src/index.js
index 71b31920d9..45c463f3c3 100644
--- a/samples/infowindow-simple-max/src/index.js
+++ b/samples/infowindow-simple-max/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_infowindow_simple_max_script_body]
+// [START maps_infowindow_simple_max]
 // This example displays a marker at the center of Australia.
 // When the user clicks the marker, an info window opens.
 // The maximum width of the info window is set to 200 pixels.
@@ -62,4 +62,4 @@ export function initMap() {
     infowindow.open(map, marker);
   });
 }
-// [END maps_infowindow_simple_max_script_body]
+// [END maps_infowindow_simple_max]
diff --git a/samples/infowindow-simple-max/src/index.njk b/samples/infowindow-simple-max/src/index.njk
index c9c1221a59..22d64ff750 100644
--- a/samples/infowindow-simple-max/src/index.njk
+++ b/samples/infowindow-simple-max/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_infowindow_simple_max_html_body] -->
+<!-- [START maps_infowindow_simple_max] -->
 <div id="map"></div>
-<!-- [END maps_infowindow_simple_max_html_body] -->
+<!-- [END maps_infowindow_simple_max] -->
 {% endblock %}
diff --git a/samples/infowindow-simple-max/src/style.scss b/samples/infowindow-simple-max/src/style.scss
index f09bc53232..dabd9418ae 100644
--- a/samples/infowindow-simple-max/src/style.scss
+++ b/samples/infowindow-simple-max/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_infowindow_simple_max_css] */
+/*! [START maps_infowindow_simple_max] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_infowindow_simple_max_css] */
+/*! [END maps_infowindow_simple_max] */
diff --git a/samples/infowindow-simple/src/index.js b/samples/infowindow-simple/src/index.js
index 85f31242cc..7551723bc8 100644
--- a/samples/infowindow-simple/src/index.js
+++ b/samples/infowindow-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_infowindow_simple_script_body]
+// [START maps_infowindow_simple]
 // This example displays a marker at the center of Australia.
 // When the user clicks the marker, an info window opens.
 
@@ -60,4 +60,4 @@ export function initMap() {
     infowindow.open(map, marker);
   });
 }
-// [END maps_infowindow_simple_script_body]
+// [END maps_infowindow_simple]
diff --git a/samples/infowindow-simple/src/index.njk b/samples/infowindow-simple/src/index.njk
index 904f5a06b6..39c7c37385 100644
--- a/samples/infowindow-simple/src/index.njk
+++ b/samples/infowindow-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_infowindow_simple_html_body] -->
+<!-- [START maps_infowindow_simple] -->
 <div id="map"></div>
-<!-- [END maps_infowindow_simple_html_body] -->
+<!-- [END maps_infowindow_simple] -->
 {% endblock %}
diff --git a/samples/infowindow-simple/src/style.scss b/samples/infowindow-simple/src/style.scss
index 631dfdcd19..9947ca59c6 100644
--- a/samples/infowindow-simple/src/style.scss
+++ b/samples/infowindow-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_infowindow_simple_css] */
+/*! [START maps_infowindow_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_infowindow_simple_css] */
+/*! [END maps_infowindow_simple] */
diff --git a/samples/interaction-cooperative/src/index.js b/samples/interaction-cooperative/src/index.js
index 016bc31484..4901c40404 100644
--- a/samples/interaction-cooperative/src/index.js
+++ b/samples/interaction-cooperative/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_interaction_cooperative_script_body]
+// [START maps_interaction_cooperative]
 /**
  * This sample sets the gesture handling mode to 'cooperative',
  * which means that on a mobile device, the user must swipe with one
@@ -35,4 +35,4 @@ export function initMap() {
     title: "Hello World!"
   });
 }
-// [END maps_interaction_cooperative_script_body]
+// [END maps_interaction_cooperative]
diff --git a/samples/interaction-cooperative/src/index.njk b/samples/interaction-cooperative/src/index.njk
index 497adfd90d..6d26170d64 100644
--- a/samples/interaction-cooperative/src/index.njk
+++ b/samples/interaction-cooperative/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_interaction_cooperative_html_body] -->
+<!-- [START maps_interaction_cooperative] -->
 <div id="map"></div>
-<!-- [END maps_interaction_cooperative_html_body] -->
+<!-- [END maps_interaction_cooperative] -->
 {% endblock %}
diff --git a/samples/interaction-cooperative/src/style.scss b/samples/interaction-cooperative/src/style.scss
index 20688fad4c..29fbc8ab79 100644
--- a/samples/interaction-cooperative/src/style.scss
+++ b/samples/interaction-cooperative/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_interaction_cooperative_css] */
+/*! [START maps_interaction_cooperative] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_interaction_cooperative_css] */
+/*! [END maps_interaction_cooperative] */
diff --git a/samples/kml-map/src/index.js b/samples/kml-map/src/index.js
index dd7ddf55f0..bc1d0debad 100755
--- a/samples/kml-map/src/index.js
+++ b/samples/kml-map/src/index.js
@@ -19,7 +19,7 @@
  *   and displaying the contents in a side panel instead of
  *   an InfoWindow
  */
-// [START maps_kml_map_script_body]
+// [START maps_kml_map]
 export var map;
 export var src =
   "https://developers.google.com/maps/documentation/javascript/examples/kml/westcampus.kml";
@@ -42,4 +42,4 @@ export function initMap() {
     testimonial.innerHTML = content;
   });
 }
-// [END maps_kml_map_script_body]
+// [END maps_kml_map]
diff --git a/samples/kml-map/src/index.njk b/samples/kml-map/src/index.njk
index c351dc1412..e200e93e77 100644
--- a/samples/kml-map/src/index.njk
+++ b/samples/kml-map/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_kml_map_html_body] -->
+<!-- [START maps_kml_map] -->
 <div id="map"></div>
-<!-- [END maps_kml_map_html_body] -->
+<!-- [END maps_kml_map] -->
 {% endblock %}
diff --git a/samples/kml-map/src/style.scss b/samples/kml-map/src/style.scss
index 6c4522ae47..d342e1a12f 100644
--- a/samples/kml-map/src/style.scss
+++ b/samples/kml-map/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_kml_map_css] */
+/*! [START maps_kml_map] */
 
-/*! [END maps_kml_map_css] */
+/*! [END maps_kml_map] */
diff --git a/samples/landing-page-add-map/src/index.js b/samples/landing-page-add-map/src/index.js
index 467087f81e..92b02b1ceb 100644
--- a/samples/landing-page-add-map/src/index.js
+++ b/samples/landing-page-add-map/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_landing_page_add_map_script_body]
+// [START maps_landing_page_add_map]
 export function initMap() {
   var uluru = { lat: -25.363, lng: 131.044 };
 
@@ -32,4 +32,4 @@ export function initMap() {
     map: map
   });
 }
-// [END maps_landing_page_add_map_script_body]
+// [END maps_landing_page_add_map]
diff --git a/samples/landing-page-add-map/src/index.njk b/samples/landing-page-add-map/src/index.njk
index 487b2cd3f8..730b2adaec 100644
--- a/samples/landing-page-add-map/src/index.njk
+++ b/samples/landing-page-add-map/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_landing_page_add_map_html_body] -->
+<!-- [START maps_landing_page_add_map] -->
 <div id="map"></div>
-<!-- [END maps_landing_page_add_map_html_body] -->
+<!-- [END maps_landing_page_add_map] -->
 {% endblock %}
diff --git a/samples/landing-page-add-map/src/style.scss b/samples/landing-page-add-map/src/style.scss
index 79cb55af46..3ce79a32cf 100644
--- a/samples/landing-page-add-map/src/style.scss
+++ b/samples/landing-page-add-map/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_landing_page_add_map_css] */
+/*! [START maps_landing_page_add_map] */
 
-/*! [END maps_landing_page_add_map_css] */
+/*! [END maps_landing_page_add_map] */
diff --git a/samples/landing-page-marker-clustering/src/index.js b/samples/landing-page-marker-clustering/src/index.js
index c9a4d3c3ab..d425c1ca8c 100644
--- a/samples/landing-page-marker-clustering/src/index.js
+++ b/samples/landing-page-marker-clustering/src/index.js
@@ -22,7 +22,7 @@
  * @constructor
  */
 export function MarkerClusterer(map, markers, options) {}
-// [START maps_landing_page_marker_clustering_script_body]
+// [START maps_landing_page_marker_clustering]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 3,
@@ -78,4 +78,4 @@ export var locations = [
   { lat: -42.735258, lng: 147.438 },
   { lat: -43.999792, lng: 170.463352 }
 ];
-// [END maps_landing_page_marker_clustering_script_body]
+// [END maps_landing_page_marker_clustering]
diff --git a/samples/landing-page-marker-clustering/src/index.njk b/samples/landing-page-marker-clustering/src/index.njk
index 3e74b47139..41a0a8c2e2 100644
--- a/samples/landing-page-marker-clustering/src/index.njk
+++ b/samples/landing-page-marker-clustering/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_landing_page_marker_clustering_html_body] -->
+<!-- [START maps_landing_page_marker_clustering] -->
 <div id="map"></div>
-<!-- [END maps_landing_page_marker_clustering_html_body] -->
+<!-- [END maps_landing_page_marker_clustering] -->
 {% endblock %}
diff --git a/samples/landing-page-marker-clustering/src/style.scss b/samples/landing-page-marker-clustering/src/style.scss
index b51be55ff8..bf486f1dcf 100644
--- a/samples/landing-page-marker-clustering/src/style.scss
+++ b/samples/landing-page-marker-clustering/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_landing_page_marker_clustering_css] */
+/*! [START maps_landing_page_marker_clustering] */
 
-/*! [END maps_landing_page_marker_clustering_css] */
+/*! [END maps_landing_page_marker_clustering] */
diff --git a/samples/landing-page-visualize-data/src/index.js b/samples/landing-page-visualize-data/src/index.js
index 773b913c07..37d71da362 100644
--- a/samples/landing-page-visualize-data/src/index.js
+++ b/samples/landing-page-visualize-data/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_landing_page_visualize_data_script_body]
+// [START maps_landing_page_visualize_data]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -58,4 +58,4 @@ export function getCircle(magnitude) {
 export function eqfeed_callback(results) {
   map.data.addGeoJson(results);
 }
-// [END maps_landing_page_visualize_data_script_body]
+// [END maps_landing_page_visualize_data]
diff --git a/samples/landing-page-visualize-data/src/index.njk b/samples/landing-page-visualize-data/src/index.njk
index 99e3a70ebe..da000b75a1 100644
--- a/samples/landing-page-visualize-data/src/index.njk
+++ b/samples/landing-page-visualize-data/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_landing_page_visualize_data_html_body] -->
+<!-- [START maps_landing_page_visualize_data] -->
 <div id="map"></div>
-<!-- [END maps_landing_page_visualize_data_html_body] -->
+<!-- [END maps_landing_page_visualize_data] -->
 {% endblock %}
diff --git a/samples/landing-page-visualize-data/src/style.scss b/samples/landing-page-visualize-data/src/style.scss
index b3fb25d080..19adff000a 100644
--- a/samples/landing-page-visualize-data/src/style.scss
+++ b/samples/landing-page-visualize-data/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_landing_page_visualize_data_css] */
+/*! [START maps_landing_page_visualize_data] */
 
-/*! [END maps_landing_page_visualize_data_css] */
+/*! [END maps_landing_page_visualize_data] */
diff --git a/samples/layer-bicycling/src/index.js b/samples/layer-bicycling/src/index.js
index 4c6a3e67e5..29d3372d68 100644
--- a/samples/layer-bicycling/src/index.js
+++ b/samples/layer-bicycling/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_bicycling_script_body]
+// [START maps_layer_bicycling]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 14,
@@ -24,4 +24,4 @@ export function initMap() {
   var bikeLayer = new google.maps.BicyclingLayer();
   bikeLayer.setMap(map);
 }
-// [END maps_layer_bicycling_script_body]
+// [END maps_layer_bicycling]
diff --git a/samples/layer-bicycling/src/index.njk b/samples/layer-bicycling/src/index.njk
index 45bf3e4735..66735f9565 100644
--- a/samples/layer-bicycling/src/index.njk
+++ b/samples/layer-bicycling/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_bicycling_html_body] -->
+<!-- [START maps_layer_bicycling] -->
 <div id="map"></div>
-<!-- [END maps_layer_bicycling_html_body] -->
+<!-- [END maps_layer_bicycling] -->
 {% endblock %}
diff --git a/samples/layer-bicycling/src/style.scss b/samples/layer-bicycling/src/style.scss
index d424e5d890..a013351f1e 100644
--- a/samples/layer-bicycling/src/style.scss
+++ b/samples/layer-bicycling/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_bicycling_css] */
+/*! [START maps_layer_bicycling] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_bicycling_css] */
+/*! [END maps_layer_bicycling] */
diff --git a/samples/layer-data-dragndrop/src/index.js b/samples/layer-data-dragndrop/src/index.js
index 7749653125..6cabe9560f 100644
--- a/samples/layer-data-dragndrop/src/index.js
+++ b/samples/layer-data-dragndrop/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_dragndrop_script_body]
+// [START maps_layer_data_dragndrop]
 /* Map functions */
 
 export var map;
@@ -128,4 +128,4 @@ export function initialize() {
   initMap();
   initEvents();
 }
-// [END maps_layer_data_dragndrop_script_body]
+// [END maps_layer_data_dragndrop]
diff --git a/samples/layer-data-dragndrop/src/index.njk b/samples/layer-data-dragndrop/src/index.njk
index 6e18daf3ef..a25693da38 100644
--- a/samples/layer-data-dragndrop/src/index.njk
+++ b/samples/layer-data-dragndrop/src/index.njk
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_dragndrop_html_body] -->
+<!-- [START maps_layer_data_dragndrop] -->
 <div id="map"></div>
 <div id="drop-container"><div id="drop-silhouette"></div></div>
-<!-- [END maps_layer_data_dragndrop_html_body] -->
+<!-- [END maps_layer_data_dragndrop] -->
 
 {% endblock %}
diff --git a/samples/layer-data-dragndrop/src/style.scss b/samples/layer-data-dragndrop/src/style.scss
index cf418190e8..ec37de37aa 100644
--- a/samples/layer-data-dragndrop/src/style.scss
+++ b/samples/layer-data-dragndrop/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_layer_data_dragndrop_css] */
+/* [START maps_layer_data_dragndrop] */
 
 html {
   height: 100%;
@@ -47,4 +47,4 @@ body {
   background-repeat: no-repeat;
   background-position: center;
 }
-/* [END maps_layer_data_dragndrop_css] */
+/* [END maps_layer_data_dragndrop] */
diff --git a/samples/layer-data-dynamic/src/index.js b/samples/layer-data-dynamic/src/index.js
index 348e0e630b..8734ba224f 100644
--- a/samples/layer-data-dynamic/src/index.js
+++ b/samples/layer-data-dynamic/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_dynamic_script_body]
+// [START maps_layer_data_dynamic]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -60,4 +60,4 @@ export function initMap() {
   });
   // [END snippet]
 }
-// [END maps_layer_data_dynamic_script_body]
+// [END maps_layer_data_dynamic]
diff --git a/samples/layer-data-dynamic/src/index.njk b/samples/layer-data-dynamic/src/index.njk
index 42d2092dc0..b55dbac1fd 100644
--- a/samples/layer-data-dynamic/src/index.njk
+++ b/samples/layer-data-dynamic/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_dynamic_html_body] -->
+<!-- [START maps_layer_data_dynamic] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_dynamic_html_body] -->
+<!-- [END maps_layer_data_dynamic] -->
 {% endblock %}
diff --git a/samples/layer-data-dynamic/src/style.scss b/samples/layer-data-dynamic/src/style.scss
index 4f1de1c766..c4440d866a 100644
--- a/samples/layer-data-dynamic/src/style.scss
+++ b/samples/layer-data-dynamic/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_dynamic_css] */
+/*! [START maps_layer_data_dynamic] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_dynamic_css] */
+/*! [END maps_layer_data_dynamic] */
diff --git a/samples/layer-data-event/src/index.js b/samples/layer-data-event/src/index.js
index 779c6f0b55..8f486b0fe4 100644
--- a/samples/layer-data-event/src/index.js
+++ b/samples/layer-data-event/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_event_script_body]
+// [START maps_layer_data_event]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -44,4 +44,4 @@ export function initMap() {
   });
   // [END snippet]
 }
-// [END maps_layer_data_event_script_body]
+// [END maps_layer_data_event]
diff --git a/samples/layer-data-event/src/index.njk b/samples/layer-data-event/src/index.njk
index 4af786501a..d6153a1d8a 100644
--- a/samples/layer-data-event/src/index.njk
+++ b/samples/layer-data-event/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_event_html_body] -->
+<!-- [START maps_layer_data_event] -->
 <div id="map"></div>
 <div id="info-box">?</div>
-<!-- [END maps_layer_data_event_html_body] -->
+<!-- [END maps_layer_data_event] -->
 {% endblock %}
diff --git a/samples/layer-data-event/src/style.scss b/samples/layer-data-event/src/style.scss
index 978e8bdbfc..a8a4d15c6c 100644
--- a/samples/layer-data-event/src/style.scss
+++ b/samples/layer-data-event/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_layer_data_event_css] */
+/* [START maps_layer_data_event] */
 @import "../../../shared/scss/default.scss";
 
 #info-box {
@@ -26,4 +26,4 @@
   position: absolute;
   left: 30px;
 }
-/* [END maps_layer_data_event_css] */
+/* [END maps_layer_data_event] */
diff --git a/samples/layer-data-polygon/src/index.js b/samples/layer-data-polygon/src/index.js
index 94b8f03fde..392be9714c 100644
--- a/samples/layer-data-polygon/src/index.js
+++ b/samples/layer-data-polygon/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_polygon_script_body]
+// [START maps_layer_data_polygon]
 // This example uses the Google Maps JavaScript API's Data layer
 // to create a rectangular polygon with 2 holes in it.
 
@@ -56,4 +56,4 @@ export function initMap() {
     ])
   });
 }
-// [END maps_layer_data_polygon_script_body]
+// [END maps_layer_data_polygon]
diff --git a/samples/layer-data-polygon/src/index.njk b/samples/layer-data-polygon/src/index.njk
index 858861d380..93fad9e855 100644
--- a/samples/layer-data-polygon/src/index.njk
+++ b/samples/layer-data-polygon/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_polygon_html_body] -->
+<!-- [START maps_layer_data_polygon] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_polygon_html_body] -->
+<!-- [END maps_layer_data_polygon] -->
 {% endblock %}
diff --git a/samples/layer-data-polygon/src/style.scss b/samples/layer-data-polygon/src/style.scss
index 45cd354fa8..78d4fb8397 100644
--- a/samples/layer-data-polygon/src/style.scss
+++ b/samples/layer-data-polygon/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_polygon_css] */
+/*! [START maps_layer_data_polygon] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_polygon_css] */
+/*! [END maps_layer_data_polygon] */
diff --git a/samples/layer-data-quakes-red/src/index.js b/samples/layer-data-quakes-red/src/index.js
index 981c6abc64..11766a8580 100644
--- a/samples/layer-data-quakes-red/src/index.js
+++ b/samples/layer-data-quakes-red/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_quakes_red_script_body]
+// [START maps_layer_data_quakes_red]
 export var map;
 
 export function initMap() {
@@ -52,4 +52,4 @@ export function initMap() {
 export function eqfeed_callback(data) {
   map.data.addGeoJson(data);
 }
-// [END maps_layer_data_quakes_red_script_body]
+// [END maps_layer_data_quakes_red]
diff --git a/samples/layer-data-quakes-red/src/index.njk b/samples/layer-data-quakes-red/src/index.njk
index c3036eef56..f5dd234418 100644
--- a/samples/layer-data-quakes-red/src/index.njk
+++ b/samples/layer-data-quakes-red/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_quakes_red_html_body] -->
+<!-- [START maps_layer_data_quakes_red] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_quakes_red_html_body] -->
+<!-- [END maps_layer_data_quakes_red] -->
 {% endblock %}
diff --git a/samples/layer-data-quakes-red/src/style.scss b/samples/layer-data-quakes-red/src/style.scss
index c97cba653e..92c3d290a1 100644
--- a/samples/layer-data-quakes-red/src/style.scss
+++ b/samples/layer-data-quakes-red/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_quakes_red_css] */
+/*! [START maps_layer_data_quakes_red] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_quakes_red_css] */
+/*! [END maps_layer_data_quakes_red] */
diff --git a/samples/layer-data-quakes-simple/src/index.js b/samples/layer-data-quakes-simple/src/index.js
index 66b1f9dd91..25740fb847 100644
--- a/samples/layer-data-quakes-simple/src/index.js
+++ b/samples/layer-data-quakes-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_quakes_simple_script_body]
+// [START maps_layer_data_quakes_simple]
 export var map;
 
 export function initMap() {
@@ -38,4 +38,4 @@ export function initMap() {
 export function eqfeed_callback(data) {
   map.data.addGeoJson(data);
 }
-// [END maps_layer_data_quakes_simple_script_body]
+// [END maps_layer_data_quakes_simple]
diff --git a/samples/layer-data-quakes-simple/src/index.njk b/samples/layer-data-quakes-simple/src/index.njk
index b58340de7e..38f8296eec 100644
--- a/samples/layer-data-quakes-simple/src/index.njk
+++ b/samples/layer-data-quakes-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_quakes_simple_html_body] -->
+<!-- [START maps_layer_data_quakes_simple] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_quakes_simple_html_body] -->
+<!-- [END maps_layer_data_quakes_simple] -->
 {% endblock %}
diff --git a/samples/layer-data-quakes-simple/src/style.scss b/samples/layer-data-quakes-simple/src/style.scss
index 522e5a4c86..a81181563f 100644
--- a/samples/layer-data-quakes-simple/src/style.scss
+++ b/samples/layer-data-quakes-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_quakes_simple_css] */
+/*! [START maps_layer_data_quakes_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_quakes_simple_css] */
+/*! [END maps_layer_data_quakes_simple] */
diff --git a/samples/layer-data-quakes/src/index.js b/samples/layer-data-quakes/src/index.js
index d3c0d291a1..ca60c86328 100644
--- a/samples/layer-data-quakes/src/index.js
+++ b/samples/layer-data-quakes/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_quakes_script_body]
+// [START maps_layer_data_quakes]
 export var map;
 
 export function initMap() {
@@ -100,4 +100,4 @@ export var mapStyle = [
     stylers: [{ visibility: "on" }, { hue: "#5f94ff" }, { lightness: 60 }]
   }
 ];
-// [END maps_layer_data_quakes_script_body]
+// [END maps_layer_data_quakes]
diff --git a/samples/layer-data-quakes/src/index.njk b/samples/layer-data-quakes/src/index.njk
index 770c88d017..71f3a472f7 100644
--- a/samples/layer-data-quakes/src/index.njk
+++ b/samples/layer-data-quakes/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_quakes_html_body] -->
+<!-- [START maps_layer_data_quakes] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_quakes_html_body] -->
+<!-- [END maps_layer_data_quakes] -->
 {% endblock %}
diff --git a/samples/layer-data-quakes/src/style.scss b/samples/layer-data-quakes/src/style.scss
index 8042920826..1072e0810a 100644
--- a/samples/layer-data-quakes/src/style.scss
+++ b/samples/layer-data-quakes/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_quakes_css] */
+/*! [START maps_layer_data_quakes] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_quakes_css] */
+/*! [END maps_layer_data_quakes] */
diff --git a/samples/layer-data-simple/src/index.js b/samples/layer-data-simple/src/index.js
index 05037545d8..2edb562e7d 100644
--- a/samples/layer-data-simple/src/index.js
+++ b/samples/layer-data-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_simple_script_body]
+// [START maps_layer_data_simple]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -27,4 +27,4 @@ export function initMap() {
     "https://storage.googleapis.com/mapsdevsite/json/google.json"
   );
 }
-// [END maps_layer_data_simple_script_body]
+// [END maps_layer_data_simple]
diff --git a/samples/layer-data-simple/src/index.njk b/samples/layer-data-simple/src/index.njk
index 18d6d6f50d..e30de4808e 100644
--- a/samples/layer-data-simple/src/index.njk
+++ b/samples/layer-data-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_simple_html_body] -->
+<!-- [START maps_layer_data_simple] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_simple_html_body] -->
+<!-- [END maps_layer_data_simple] -->
 {% endblock %}
diff --git a/samples/layer-data-simple/src/style.scss b/samples/layer-data-simple/src/style.scss
index bd71b6acfb..11208b0400 100644
--- a/samples/layer-data-simple/src/style.scss
+++ b/samples/layer-data-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_simple_css] */
+/*! [START maps_layer_data_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_simple_css] */
+/*! [END maps_layer_data_simple] */
diff --git a/samples/layer-data-style/src/index.js b/samples/layer-data-style/src/index.js
index 0cf567f54b..8c434fcd03 100644
--- a/samples/layer-data-style/src/index.js
+++ b/samples/layer-data-style/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_data_style_script_body]
+// [START maps_layer_data_style]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -37,4 +37,4 @@ export function initMap() {
   });
   // [END maps_layer_data_style_script_snippet_style]
 }
-// [END maps_layer_data_style_script_body]
+// [END maps_layer_data_style]
diff --git a/samples/layer-data-style/src/index.njk b/samples/layer-data-style/src/index.njk
index 4e888998ab..8e9cec17a1 100644
--- a/samples/layer-data-style/src/index.njk
+++ b/samples/layer-data-style/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_data_style_html_body] -->
+<!-- [START maps_layer_data_style] -->
 <div id="map"></div>
-<!-- [END maps_layer_data_style_html_body] -->
+<!-- [END maps_layer_data_style] -->
 {% endblock %}
diff --git a/samples/layer-data-style/src/style.scss b/samples/layer-data-style/src/style.scss
index d33fc3736e..7e04a8ee52 100644
--- a/samples/layer-data-style/src/style.scss
+++ b/samples/layer-data-style/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_data_style_css] */
+/*! [START maps_layer_data_style] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_data_style_css] */
+/*! [END maps_layer_data_style] */
diff --git a/samples/layer-georss/src/index.js b/samples/layer-georss/src/index.js
index 0e6b28171b..7fa4bd0d24 100644
--- a/samples/layer-georss/src/index.js
+++ b/samples/layer-georss/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_georss_script_body]
+// [START maps_layer_georss]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 4,
@@ -27,4 +27,4 @@ export function initMap() {
   });
   georssLayer.setMap(map);
 }
-// [END maps_layer_georss_script_body]
+// [END maps_layer_georss]
diff --git a/samples/layer-georss/src/index.njk b/samples/layer-georss/src/index.njk
index ccfb4f6f0f..42f2dc3045 100644
--- a/samples/layer-georss/src/index.njk
+++ b/samples/layer-georss/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_georss_html_body] -->
+<!-- [START maps_layer_georss] -->
 <div id="map"></div>
-<!-- [END maps_layer_georss_html_body] -->
+<!-- [END maps_layer_georss] -->
 {% endblock %}
diff --git a/samples/layer-georss/src/style.scss b/samples/layer-georss/src/style.scss
index 44c7422057..d45be017bd 100644
--- a/samples/layer-georss/src/style.scss
+++ b/samples/layer-georss/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_georss_css] */
+/*! [START maps_layer_georss] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_georss_css] */
+/*! [END maps_layer_georss] */
diff --git a/samples/layer-heatmap/src/index.js b/samples/layer-heatmap/src/index.js
index 062348349d..dfed5fbd77 100644
--- a/samples/layer-heatmap/src/index.js
+++ b/samples/layer-heatmap/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_heatmap_script_body]
+// [START maps_layer_heatmap]
 // This example requires the Visualization library. Include the libraries=visualization
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=visualization">
@@ -571,4 +571,4 @@ export function getPoints() {
     new google.maps.LatLng(37.751266, -122.403355)
   ];
 }
-// [END maps_layer_heatmap_script_body]
+// [END maps_layer_heatmap]
diff --git a/samples/layer-heatmap/src/index.njk b/samples/layer-heatmap/src/index.njk
index 0b11c89b9f..f5c5eb51a7 100644
--- a/samples/layer-heatmap/src/index.njk
+++ b/samples/layer-heatmap/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_heatmap_html_body] -->
+<!-- [START maps_layer_heatmap] -->
 <div id="floating-panel">
   <button onclick="toggleHeatmap()">Toggle Heatmap</button>
   <button onclick="changeGradient()">Change gradient</button>
@@ -22,5 +22,5 @@ limitations under the License.
   <button onclick="changeOpacity()">Change opacity</button>
 </div>
 <div id="map"></div>
-<!-- [END maps_layer_heatmap_html_body] -->
+<!-- [END maps_layer_heatmap] -->
 {% endblock %}
diff --git a/samples/layer-heatmap/src/style.scss b/samples/layer-heatmap/src/style.scss
index 5cb34a5832..e499b846fb 100644
--- a/samples/layer-heatmap/src/style.scss
+++ b/samples/layer-heatmap/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_layer_heatmap_css] */
+/* [START maps_layer_heatmap] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
@@ -27,4 +27,4 @@
   top: 10px;
   z-index: 5;
 }
-/* [END maps_layer_heatmap_css] */
+/* [END maps_layer_heatmap] */
diff --git a/samples/layer-kml-features/src/index.js b/samples/layer-kml-features/src/index.js
index e0b29a226f..0b8c60dfed 100644
--- a/samples/layer-kml-features/src/index.js
+++ b/samples/layer-kml-features/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_kml_features_script_body]
+// [START maps_layer_kml_features]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 12,
@@ -37,4 +37,4 @@ export function initMap() {
     sidediv.innerHTML = text;
   }
 }
-// [END maps_layer_kml_features_script_body]
+// [END maps_layer_kml_features]
diff --git a/samples/layer-kml-features/src/index.njk b/samples/layer-kml-features/src/index.njk
index 66ecb81aa0..30571bf3f7 100644
--- a/samples/layer-kml-features/src/index.njk
+++ b/samples/layer-kml-features/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_kml_features_html_body] -->
+<!-- [START maps_layer_kml_features] -->
 <div id="map"></div>
 <div id="content-window"></div>
-<!-- [END maps_layer_kml_features_html_body] -->
+<!-- [END maps_layer_kml_features] -->
 {% endblock %}
diff --git a/samples/layer-kml-features/src/style.scss b/samples/layer-kml-features/src/style.scss
index 435a46eebd..6e3ed3a19b 100644
--- a/samples/layer-kml-features/src/style.scss
+++ b/samples/layer-kml-features/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_layer_kml_features_css] */
+/* [START maps_layer_kml_features] */
 
 html,
 body {
@@ -35,4 +35,4 @@ body {
   padding-left: 10px;
   width: 19%;
 }
-/* [END maps_layer_kml_features_css] */
+/* [END maps_layer_kml_features] */
diff --git a/samples/layer-kml/src/index.js b/samples/layer-kml/src/index.js
index 555e7cb9f4..59d28fa2b6 100644
--- a/samples/layer-kml/src/index.js
+++ b/samples/layer-kml/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_kml_script_body]
+// [START maps_layer_kml]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 11,
@@ -26,4 +26,4 @@ export function initMap() {
     map: map
   });
 }
-// [END maps_layer_kml_script_body]
+// [END maps_layer_kml]
diff --git a/samples/layer-kml/src/index.njk b/samples/layer-kml/src/index.njk
index 79204a890b..e8db328b96 100644
--- a/samples/layer-kml/src/index.njk
+++ b/samples/layer-kml/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_kml_html_body] -->
+<!-- [START maps_layer_kml] -->
 <div id="map"></div>
-<!-- [END maps_layer_kml_html_body] -->
+<!-- [END maps_layer_kml] -->
 {% endblock %}
diff --git a/samples/layer-kml/src/style.scss b/samples/layer-kml/src/style.scss
index 205fc44b99..cc8f134b6a 100644
--- a/samples/layer-kml/src/style.scss
+++ b/samples/layer-kml/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_kml_css] */
+/*! [START maps_layer_kml] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_kml_css] */
+/*! [END maps_layer_kml] */
diff --git a/samples/layer-traffic/src/index.js b/samples/layer-traffic/src/index.js
index f727daca40..c39a358bba 100644
--- a/samples/layer-traffic/src/index.js
+++ b/samples/layer-traffic/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_traffic_script_body]
+// [START maps_layer_traffic]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 13,
@@ -24,4 +24,4 @@ export function initMap() {
   var trafficLayer = new google.maps.TrafficLayer();
   trafficLayer.setMap(map);
 }
-// [END maps_layer_traffic_script_body]
+// [END maps_layer_traffic]
diff --git a/samples/layer-traffic/src/index.njk b/samples/layer-traffic/src/index.njk
index 17261f7281..00d77b9e3b 100644
--- a/samples/layer-traffic/src/index.njk
+++ b/samples/layer-traffic/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_traffic_html_body] -->
+<!-- [START maps_layer_traffic] -->
 <div id="map"></div>
-<!-- [END maps_layer_traffic_html_body] -->
+<!-- [END maps_layer_traffic] -->
 {% endblock %}
diff --git a/samples/layer-traffic/src/style.scss b/samples/layer-traffic/src/style.scss
index 0b626491bc..e3d83b2cac 100644
--- a/samples/layer-traffic/src/style.scss
+++ b/samples/layer-traffic/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_traffic_css] */
+/*! [START maps_layer_traffic] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_traffic_css] */
+/*! [END maps_layer_traffic] */
diff --git a/samples/layer-transit/src/index.js b/samples/layer-transit/src/index.js
index 75db761156..d82bb40f92 100644
--- a/samples/layer-transit/src/index.js
+++ b/samples/layer-transit/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_layer_transit_script_body]
+// [START maps_layer_transit]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 13,
@@ -24,4 +24,4 @@ export function initMap() {
   var transitLayer = new google.maps.TransitLayer();
   transitLayer.setMap(map);
 }
-// [END maps_layer_transit_script_body]
+// [END maps_layer_transit]
diff --git a/samples/layer-transit/src/index.njk b/samples/layer-transit/src/index.njk
index d113954e24..fc889361b5 100644
--- a/samples/layer-transit/src/index.njk
+++ b/samples/layer-transit/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_layer_transit_html_body] -->
+<!-- [START maps_layer_transit] -->
 <div id="map"></div>
-<!-- [END maps_layer_transit_html_body] -->
+<!-- [END maps_layer_transit] -->
 {% endblock %}
diff --git a/samples/layer-transit/src/style.scss b/samples/layer-transit/src/style.scss
index 61e856b078..5bdbfcc11b 100644
--- a/samples/layer-transit/src/style.scss
+++ b/samples/layer-transit/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_layer_transit_css] */
+/*! [START maps_layer_transit] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_layer_transit_css] */
+/*! [END maps_layer_transit] */
diff --git a/samples/legend/src/index.js b/samples/legend/src/index.js
index a65f064e36..054e458dc5 100644
--- a/samples/legend/src/index.js
+++ b/samples/legend/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_legend_script_body]
+// [START maps_legend]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -139,4 +139,4 @@ export function initMap() {
 
   map.controls[google.maps.ControlPosition.RIGHT_BOTTOM].push(legend);
 }
-// [END maps_legend_script_body]
+// [END maps_legend]
diff --git a/samples/legend/src/index.njk b/samples/legend/src/index.njk
index c35c0f5bbf..926811dd18 100644
--- a/samples/legend/src/index.njk
+++ b/samples/legend/src/index.njk
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_legend_html_body] -->
+<!-- [START maps_legend] -->
 <div id="map"></div>
 <div id="legend"><h3>Legend</h3></div>
-<!-- [END maps_legend_html_body] -->
+<!-- [END maps_legend] -->
 
 {% endblock %}
diff --git a/samples/legend/src/style.scss b/samples/legend/src/style.scss
index 6256450197..fccd68e0a1 100644
--- a/samples/legend/src/style.scss
+++ b/samples/legend/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_legend_css] */
+/* [START maps_legend] */
 
 html,
 body {
@@ -40,4 +40,4 @@ body {
 #legend img {
   vertical-align: middle;
 }
-/* [END maps_legend_css] */
+/* [END maps_legend] */
diff --git a/samples/map-coordinates/src/index.js b/samples/map-coordinates/src/index.js
index b7cb6ea299..0a3e5753bd 100644
--- a/samples/map-coordinates/src/index.js
+++ b/samples/map-coordinates/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_coordinates_script_body]
+// [START maps_map_coordinates]
 export function initMap() {
   var chicago = new google.maps.LatLng(41.85, -87.65);
 
@@ -75,4 +75,4 @@ export function project(latLng) {
     TILE_SIZE * (0.5 - Math.log((1 + siny) / (1 - siny)) / (4 * Math.PI))
   );
 }
-// [END maps_map_coordinates_script_body]
+// [END maps_map_coordinates]
diff --git a/samples/map-coordinates/src/index.njk b/samples/map-coordinates/src/index.njk
index a297d9d1dc..e1850d5e9a 100644
--- a/samples/map-coordinates/src/index.njk
+++ b/samples/map-coordinates/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_coordinates_html_body] -->
+<!-- [START maps_map_coordinates] -->
 <div id="map"></div>
-<!-- [END maps_map_coordinates_html_body] -->
+<!-- [END maps_map_coordinates] -->
 {% endblock %}
diff --git a/samples/map-coordinates/src/style.scss b/samples/map-coordinates/src/style.scss
index 907fb6f560..c9f2c9ba58 100644
--- a/samples/map-coordinates/src/style.scss
+++ b/samples/map-coordinates/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_coordinates_css] */
+/*! [START maps_map_coordinates] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_coordinates_css] */
+/*! [END maps_map_coordinates] */
diff --git a/samples/map-events/src/index.njk b/samples/map-events/src/index.njk
index 18e78ed76b..3ca9712c92 100644
--- a/samples/map-events/src/index.njk
+++ b/samples/map-events/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_events_html_body] -->
+<!-- [START maps_map_events] -->
 <div id="map"></div>
-<!-- [END maps_map_events_html_body] -->
+<!-- [END maps_map_events] -->
 {% endblock %}
diff --git a/samples/map-events/src/style.scss b/samples/map-events/src/style.scss
index f9fff05a92..f04ed2e46a 100644
--- a/samples/map-events/src/style.scss
+++ b/samples/map-events/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_events_css] */
+/*! [START maps_map_events] */
 
-/*! [END maps_map_events_css] */
+/*! [END maps_map_events] */
diff --git a/samples/map-geolocation/src/index.js b/samples/map-geolocation/src/index.js
index aa6834f0cb..a4ab5717ce 100644
--- a/samples/map-geolocation/src/index.js
+++ b/samples/map-geolocation/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_geolocation_script_body]
+// [START maps_map_geolocation]
 // Note: This example requires that you consent to location sharing when
 // prompted by your browser. If you see the error "The Geolocation service
 // failed.", it means you probably did not give permission for the browser to
@@ -60,4 +60,4 @@ export function handleLocationError(browserHasGeolocation, infoWindow, pos) {
   );
   infoWindow.open(map);
 }
-// [END maps_map_geolocation_script_body]
+// [END maps_map_geolocation]
diff --git a/samples/map-geolocation/src/index.njk b/samples/map-geolocation/src/index.njk
index f57de17d15..e6358da221 100644
--- a/samples/map-geolocation/src/index.njk
+++ b/samples/map-geolocation/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_geolocation_html_body] -->
+<!-- [START maps_map_geolocation] -->
 <div id="map"></div>
-<!-- [END maps_map_geolocation_html_body] -->
+<!-- [END maps_map_geolocation] -->
 {% endblock %}
diff --git a/samples/map-geolocation/src/style.scss b/samples/map-geolocation/src/style.scss
index 782114909f..f8b661c2f5 100644
--- a/samples/map-geolocation/src/style.scss
+++ b/samples/map-geolocation/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_geolocation_css] */
+/*! [START maps_map_geolocation] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_geolocation_css] */
+/*! [END maps_map_geolocation] */
diff --git a/samples/map-language/src/index.js b/samples/map-language/src/index.js
index 2173193509..4a4d24a8be 100644
--- a/samples/map-language/src/index.js
+++ b/samples/map-language/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_language_script_body]
+// [START maps_map_language]
 // This example displays a map with the language and region set
 // to Japan. These settings are specified in the HTML script element
 // when loading the Google Maps JavaScript API.
@@ -26,4 +26,4 @@ export function initMap() {
     center: { lat: 35.717, lng: 139.731 }
   });
 }
-// [END maps_map_language_script_body]
+// [END maps_map_language]
diff --git a/samples/map-language/src/index.njk b/samples/map-language/src/index.njk
index 96f46f8728..688bfa6a6b 100644
--- a/samples/map-language/src/index.njk
+++ b/samples/map-language/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_language_html_body] -->
+<!-- [START maps_map_language] -->
 <div id="map"></div>
-<!-- [END maps_map_language_html_body] -->
+<!-- [END maps_map_language] -->
 {% endblock %}
diff --git a/samples/map-language/src/style.scss b/samples/map-language/src/style.scss
index 30b7b6decb..93f8c122f9 100644
--- a/samples/map-language/src/style.scss
+++ b/samples/map-language/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_language_css] */
+/*! [START maps_map_language] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_language_css] */
+/*! [END maps_map_language] */
diff --git a/samples/map-latlng-literal/src/index.js b/samples/map-latlng-literal/src/index.js
index af61f48077..f7701994c7 100644
--- a/samples/map-latlng-literal/src/index.js
+++ b/samples/map-latlng-literal/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_latlng_literal_script_body]
+// [START maps_map_latlng_literal]
 // In this example, we center the map, and add a marker, using a LatLng object
 // literal instead of a google.maps.LatLng object. LatLng object literals are
 // a convenient way to add a LatLng coordinate and, in most cases, can be used
@@ -48,4 +48,4 @@ export function initMap() {
     infowindow.open(map, marker);
   });
 }
-// [END maps_map_latlng_literal_script_body]
+// [END maps_map_latlng_literal]
diff --git a/samples/map-latlng-literal/src/index.njk b/samples/map-latlng-literal/src/index.njk
index 56576fa8e7..60653354af 100644
--- a/samples/map-latlng-literal/src/index.njk
+++ b/samples/map-latlng-literal/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_latlng_literal_html_body] -->
+<!-- [START maps_map_latlng_literal] -->
 <div id="map"></div>
-<!-- [END maps_map_latlng_literal_html_body] -->
+<!-- [END maps_map_latlng_literal] -->
 {% endblock %}
diff --git a/samples/map-latlng-literal/src/style.scss b/samples/map-latlng-literal/src/style.scss
index e9de3fc1f0..30c9f1932b 100644
--- a/samples/map-latlng-literal/src/style.scss
+++ b/samples/map-latlng-literal/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_latlng_literal_css] */
+/*! [START maps_map_latlng_literal] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_latlng_literal_css] */
+/*! [END maps_map_latlng_literal] */
diff --git a/samples/map-projection-simple/src/index.js b/samples/map-projection-simple/src/index.js
index 42d0e1a091..e46ea4048c 100644
--- a/samples/map-projection-simple/src/index.js
+++ b/samples/map-projection-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_projection_simple_script_body]
+// [START maps_map_projection_simple]
 // This example defines an image map type using the Gall-Peters
 // projection.
 // https://en.wikipedia.org/wiki/Gall%E2%80%93Peters_projection
@@ -155,4 +155,4 @@ export var cities = {
     }
   ]
 };
-// [END maps_map_projection_simple_script_body]
+// [END maps_map_projection_simple]
diff --git a/samples/map-projection-simple/src/index.njk b/samples/map-projection-simple/src/index.njk
index bd28d9241d..346df57b67 100644
--- a/samples/map-projection-simple/src/index.njk
+++ b/samples/map-projection-simple/src/index.njk
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_projection_simple_html_body] -->
+<!-- [START maps_map_projection_simple] -->
 <div id="map"></div>
 <div id="coords"></div>
-<!-- [END maps_map_projection_simple_html_body] -->
+<!-- [END maps_map_projection_simple] -->
 
 {% endblock %}
diff --git a/samples/map-projection-simple/src/style.scss b/samples/map-projection-simple/src/style.scss
index 5687829200..868356c06e 100644
--- a/samples/map-projection-simple/src/style.scss
+++ b/samples/map-projection-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_map_projection_simple_css] */
+/* [START maps_map_projection_simple] */
 @import "../../../shared/scss/default.scss";
 
 #coords {
@@ -22,4 +22,4 @@
   color: white;
   padding: 5px;
 }
-/* [END maps_map_projection_simple_css] */
+/* [END maps_map_projection_simple] */
diff --git a/samples/map-puzzle/src/index.js b/samples/map-puzzle/src/index.js
index 7eca5d3aaa..d87d87b807 100644
--- a/samples/map-puzzle/src/index.js
+++ b/samples/map-puzzle/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_puzzle_script_body]
+// [START maps_map_puzzle]
 /**
  * @constructor @struct @final
  */
@@ -420,4 +420,4 @@ export function initMap() {
 
   new PuzzleDemo().init(map);
 }
-// [END maps_map_puzzle_script_body]
+// [END maps_map_puzzle]
diff --git a/samples/map-puzzle/src/index.njk b/samples/map-puzzle/src/index.njk
index bcae87d8b0..43455d13d6 100644
--- a/samples/map-puzzle/src/index.njk
+++ b/samples/map-puzzle/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_puzzle_html_body] -->
+<!-- [START maps_map_puzzle] -->
 <div id="map"></div>
-<!-- [END maps_map_puzzle_html_body] -->
+<!-- [END maps_map_puzzle] -->
 {% endblock %}
diff --git a/samples/map-puzzle/src/style.scss b/samples/map-puzzle/src/style.scss
index 323984c78c..d1bc23e3e5 100644
--- a/samples/map-puzzle/src/style.scss
+++ b/samples/map-puzzle/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_puzzle_css] */
+/*! [START maps_map_puzzle] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_puzzle_css] */
+/*! [END maps_map_puzzle] */
diff --git a/samples/map-rtl/src/index.js b/samples/map-rtl/src/index.js
index f8c8c707e8..829f0bbd00 100644
--- a/samples/map-rtl/src/index.js
+++ b/samples/map-rtl/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_rtl_script_body]
+// [START maps_map_rtl]
 // This example displays a map with the language set to Arabic and the
 // regions set to Egypt. These settings are specified in the HTML script
 // element when loading the Google Maps JavaScript API.
@@ -39,4 +39,4 @@ export function initMap() {
     infowindow.open(map, marker);
   });
 }
-// [END maps_map_rtl_script_body]
+// [END maps_map_rtl]
diff --git a/samples/map-rtl/src/index.njk b/samples/map-rtl/src/index.njk
index a18ee5f834..b97c3fecac 100644
--- a/samples/map-rtl/src/index.njk
+++ b/samples/map-rtl/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_rtl_html_body] -->
+<!-- [START maps_map_rtl] -->
 <div id="map"></div>
-<!-- [END maps_map_rtl_html_body] -->
+<!-- [END maps_map_rtl] -->
 {% endblock %}
diff --git a/samples/map-rtl/src/style.scss b/samples/map-rtl/src/style.scss
index b72a52beac..c5b6476dd3 100644
--- a/samples/map-rtl/src/style.scss
+++ b/samples/map-rtl/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_rtl_css] */
+/*! [START maps_map_rtl] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_rtl_css] */
+/*! [END maps_map_rtl] */
diff --git a/samples/map-simple/src/index.js b/samples/map-simple/src/index.js
index e4502bc5fd..31b4a19c29 100644
--- a/samples/map-simple/src/index.js
+++ b/samples/map-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_simple_script_body]
+// [START maps_map_simple]
 export var map;
 export function initMap() {
   map = new google.maps.Map(document.getElementById("map"), {
@@ -22,4 +22,4 @@ export function initMap() {
     zoom: 8
   });
 }
-// [END maps_map_simple_script_body]
+// [END maps_map_simple]
diff --git a/samples/map-simple/src/index.njk b/samples/map-simple/src/index.njk
index 8d9095280b..4f10686d06 100644
--- a/samples/map-simple/src/index.njk
+++ b/samples/map-simple/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_simple_html_body] -->
+<!-- [START maps_map_simple] -->
 <div id="map"></div>
-<!-- [END maps_map_simple_html_body] -->
+<!-- [END maps_map_simple] -->
 
 {% endblock %}
diff --git a/samples/map-simple/src/style.scss b/samples/map-simple/src/style.scss
index 9de3af1138..1911346559 100644
--- a/samples/map-simple/src/style.scss
+++ b/samples/map-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_simple_css] */
+/*! [START maps_map_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_simple_css] */
+/*! [END maps_map_simple] */
diff --git a/samples/map-sync/src/index.js b/samples/map-sync/src/index.js
index ebf0db7b71..33dfd252ef 100755
--- a/samples/map-sync/src/index.js
+++ b/samples/map-sync/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_map_sync_script_body]
+// [START maps_map_sync]
 export var map;
 
 export function initMap() {
@@ -23,4 +23,4 @@ export function initMap() {
     zoom: 8
   });
 }
-// [END maps_map_sync_script_body]
+// [END maps_map_sync]
diff --git a/samples/map-sync/src/index.njk b/samples/map-sync/src/index.njk
index 28016faf47..cbd8b51f8e 100644
--- a/samples/map-sync/src/index.njk
+++ b/samples/map-sync/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_map_sync_html_body] -->
+<!-- [START maps_map_sync] -->
 <div id="map"></div>
-<!-- [END maps_map_sync_html_body] -->
+<!-- [END maps_map_sync] -->
 {% endblock %}
diff --git a/samples/map-sync/src/style.scss b/samples/map-sync/src/style.scss
index 1f19558962..3c17d5456b 100644
--- a/samples/map-sync/src/style.scss
+++ b/samples/map-sync/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_map_sync_css] */
+/*! [START maps_map_sync] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_map_sync_css] */
+/*! [END maps_map_sync] */
diff --git a/samples/maptype-base/src/index.js b/samples/maptype-base/src/index.js
index 4dc785691f..c6072ba50b 100644
--- a/samples/maptype-base/src/index.js
+++ b/samples/maptype-base/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maptype_base_script_body]
+// [START maps_maptype_base]
 /*
  * This demo demonstrates how to replace default map tiles with custom imagery.
  * In this case, the CoordMapType displays gray tiles annotated with the tile
@@ -73,4 +73,4 @@ export function initMap() {
     new CoordMapType(new google.maps.Size(256, 256))
   );
 }
-// [END maps_maptype_base_script_body]
+// [END maps_maptype_base]
diff --git a/samples/maptype-base/src/index.njk b/samples/maptype-base/src/index.njk
index c257fdfcc4..9df08ec148 100644
--- a/samples/maptype-base/src/index.njk
+++ b/samples/maptype-base/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maptype_base_html_body] -->
+<!-- [START maps_maptype_base] -->
 <div id="map"></div>
-<!-- [END maps_maptype_base_html_body] -->
+<!-- [END maps_maptype_base] -->
 {% endblock %}
diff --git a/samples/maptype-base/src/style.scss b/samples/maptype-base/src/style.scss
index 785b9cd1ae..84a88f44a7 100644
--- a/samples/maptype-base/src/style.scss
+++ b/samples/maptype-base/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maptype_base_css] */
+/*! [START maps_maptype_base] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maptype_base_css] */
+/*! [END maps_maptype_base] */
diff --git a/samples/maptype-image-overlay/src/index.js b/samples/maptype-image-overlay/src/index.js
index 4480efceac..56498bb337 100644
--- a/samples/maptype-image-overlay/src/index.js
+++ b/samples/maptype-image-overlay/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maptype_image_overlay_script_body]
+// [START maps_maptype_image_overlay]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 18,
@@ -56,4 +56,4 @@ export function initMap() {
 
   map.overlayMapTypes.push(imageMapType);
 }
-// [END maps_maptype_image_overlay_script_body]
+// [END maps_maptype_image_overlay]
diff --git a/samples/maptype-image-overlay/src/index.njk b/samples/maptype-image-overlay/src/index.njk
index 429c383ac4..bfe7d87d83 100644
--- a/samples/maptype-image-overlay/src/index.njk
+++ b/samples/maptype-image-overlay/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maptype_image_overlay_html_body] -->
+<!-- [START maps_maptype_image_overlay] -->
 <div id="map"></div>
-<!-- [END maps_maptype_image_overlay_html_body] -->
+<!-- [END maps_maptype_image_overlay] -->
 {% endblock %}
diff --git a/samples/maptype-image-overlay/src/style.scss b/samples/maptype-image-overlay/src/style.scss
index 1268489aa7..385d29ddac 100644
--- a/samples/maptype-image-overlay/src/style.scss
+++ b/samples/maptype-image-overlay/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maptype_image_overlay_css] */
+/*! [START maps_maptype_image_overlay] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maptype_image_overlay_css] */
+/*! [END maps_maptype_image_overlay] */
diff --git a/samples/maptype-image/src/index.js b/samples/maptype-image/src/index.js
index 9d9b4393ea..3600a0c408 100644
--- a/samples/maptype-image/src/index.js
+++ b/samples/maptype-image/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maptype_image_script_body]
+// [START maps_maptype_image]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     center: { lat: 0, lng: 0 },
@@ -76,4 +76,4 @@ export function getNormalizedCoord(coord, zoom) {
 
   return { x: x, y: y };
 }
-// [END maps_maptype_image_script_body]
+// [END maps_maptype_image]
diff --git a/samples/maptype-image/src/index.njk b/samples/maptype-image/src/index.njk
index 5a70dcaedf..6121f32087 100644
--- a/samples/maptype-image/src/index.njk
+++ b/samples/maptype-image/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maptype_image_html_body] -->
+<!-- [START maps_maptype_image] -->
 <div id="map"></div>
-<!-- [END maps_maptype_image_html_body] -->
+<!-- [END maps_maptype_image] -->
 {% endblock %}
diff --git a/samples/maptype-image/src/style.scss b/samples/maptype-image/src/style.scss
index d8f26b70ae..c7145371bc 100644
--- a/samples/maptype-image/src/style.scss
+++ b/samples/maptype-image/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maptype_image_css] */
+/*! [START maps_maptype_image] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maptype_image_css] */
+/*! [END maps_maptype_image] */
diff --git a/samples/maptype-overlay/src/index.js b/samples/maptype-overlay/src/index.js
index 45360332a3..c593f2af5a 100644
--- a/samples/maptype-overlay/src/index.js
+++ b/samples/maptype-overlay/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maptype_overlay_script_body]
+// [START maps_maptype_overlay]
 /*
  * This demo illustrates the coordinate system used to display map tiles in the
  * API.
@@ -58,4 +58,4 @@ export function initMap() {
     new CoordMapType(new google.maps.Size(256, 256))
   );
 }
-// [END maps_maptype_overlay_script_body]
+// [END maps_maptype_overlay]
diff --git a/samples/maptype-overlay/src/index.njk b/samples/maptype-overlay/src/index.njk
index cde5c53db5..0ab777112a 100644
--- a/samples/maptype-overlay/src/index.njk
+++ b/samples/maptype-overlay/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maptype_overlay_html_body] -->
+<!-- [START maps_maptype_overlay] -->
 <div id="map"></div>
-<!-- [END maps_maptype_overlay_html_body] -->
+<!-- [END maps_maptype_overlay] -->
 {% endblock %}
diff --git a/samples/maptype-overlay/src/style.scss b/samples/maptype-overlay/src/style.scss
index f6f59f0fbf..550f5c8cb8 100644
--- a/samples/maptype-overlay/src/style.scss
+++ b/samples/maptype-overlay/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maptype_overlay_css] */
+/*! [START maps_maptype_overlay] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maptype_overlay_css] */
+/*! [END maps_maptype_overlay] */
diff --git a/samples/maptype-styled-simple/src/index.js b/samples/maptype-styled-simple/src/index.js
index 6ddbc8029d..cd9524d4fc 100644
--- a/samples/maptype-styled-simple/src/index.js
+++ b/samples/maptype-styled-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maptype_styled_simple_script_body]
+// [START maps_maptype_styled_simple]
 export function initMap() {
   // Create a new StyledMapType object, passing it an array of styles,
   // and the name to be displayed on the map type control.
@@ -146,4 +146,4 @@ export function initMap() {
   map.mapTypes.set("styled_map", styledMapType);
   map.setMapTypeId("styled_map");
 }
-// [END maps_maptype_styled_simple_script_body]
+// [END maps_maptype_styled_simple]
diff --git a/samples/maptype-styled-simple/src/index.njk b/samples/maptype-styled-simple/src/index.njk
index f3c9c874b5..60eb94f6fa 100644
--- a/samples/maptype-styled-simple/src/index.njk
+++ b/samples/maptype-styled-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maptype_styled_simple_html_body] -->
+<!-- [START maps_maptype_styled_simple] -->
 <div id="map"></div>
-<!-- [END maps_maptype_styled_simple_html_body] -->
+<!-- [END maps_maptype_styled_simple] -->
 {% endblock %}
diff --git a/samples/maptype-styled-simple/src/style.scss b/samples/maptype-styled-simple/src/style.scss
index 3460c7039a..fcf76f123c 100644
--- a/samples/maptype-styled-simple/src/style.scss
+++ b/samples/maptype-styled-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maptype_styled_simple_css] */
+/*! [START maps_maptype_styled_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maptype_styled_simple_css] */
+/*! [END maps_maptype_styled_simple] */
diff --git a/samples/marker-animations-iteration/src/index.js b/samples/marker-animations-iteration/src/index.js
index d0a36331f3..7dd38e1b5f 100755
--- a/samples/marker-animations-iteration/src/index.js
+++ b/samples/marker-animations-iteration/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_animations_iteration_script_body]
+// [START maps_marker_animations_iteration]
 // If you're adding a number of markers, you may want to drop them on the map
 // consecutively rather than all at once. This example shows how to use
 // window.setTimeout() to space your markers' animation.
@@ -61,4 +61,4 @@ export function clearMarkers() {
   }
   markers = [];
 }
-// [END maps_marker_animations_iteration_script_body]
+// [END maps_marker_animations_iteration]
diff --git a/samples/marker-animations-iteration/src/index.njk b/samples/marker-animations-iteration/src/index.njk
index c9e54d629a..65964f7587 100644
--- a/samples/marker-animations-iteration/src/index.njk
+++ b/samples/marker-animations-iteration/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_animations_iteration_html_body] -->
+<!-- [START maps_marker_animations_iteration] -->
 <div id="floating-panel">
   <button id="drop" onclick="drop()">Drop Markers</button>
 </div>
 <div id="map"></div>
-<!-- [END maps_marker_animations_iteration_html_body] -->
+<!-- [END maps_marker_animations_iteration] -->
 
 {% endblock %}
diff --git a/samples/marker-animations-iteration/src/style.scss b/samples/marker-animations-iteration/src/style.scss
index 84453af9ce..e3f66d0613 100644
--- a/samples/marker-animations-iteration/src/style.scss
+++ b/samples/marker-animations-iteration/src/style.scss
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-/* [START maps_marker_animations_iteration_css] */
+/* [START maps_marker_animations_iteration] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
 #floating-panel {
   margin-left: -52px;
 }
-/* [END maps_marker_animations_iteration_css] */
+/* [END maps_marker_animations_iteration] */
diff --git a/samples/marker-animations/src/index.js b/samples/marker-animations/src/index.js
index e4d006d7dd..2a90cb20a7 100644
--- a/samples/marker-animations/src/index.js
+++ b/samples/marker-animations/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_animations_script_body]
+// [START maps_marker_animations]
 // The following example creates a marker in Stockholm, Sweden using a DROP
 // animation. Clicking on the marker will toggle the animation between a BOUNCE
 // animation and no animation.
@@ -43,4 +43,4 @@ export function toggleBounce() {
     marker.setAnimation(google.maps.Animation.BOUNCE);
   }
 }
-// [END maps_marker_animations_script_body]
+// [END maps_marker_animations]
diff --git a/samples/marker-animations/src/index.njk b/samples/marker-animations/src/index.njk
index 32be365f58..a265eb2ddd 100644
--- a/samples/marker-animations/src/index.njk
+++ b/samples/marker-animations/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_animations_html_body] -->
+<!-- [START maps_marker_animations] -->
 <div id="map"></div>
-<!-- [END maps_marker_animations_html_body] -->
+<!-- [END maps_marker_animations] -->
 {% endblock %}
diff --git a/samples/marker-animations/src/style.scss b/samples/marker-animations/src/style.scss
index 30ddca1a7b..c421ed70bf 100644
--- a/samples/marker-animations/src/style.scss
+++ b/samples/marker-animations/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_animations_css] */
+/*! [START maps_marker_animations] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_animations_css] */
+/*! [END maps_marker_animations] */
diff --git a/samples/marker-clustering/src/index.js b/samples/marker-clustering/src/index.js
index 99a5bc199a..1326eb7e01 100644
--- a/samples/marker-clustering/src/index.js
+++ b/samples/marker-clustering/src/index.js
@@ -23,7 +23,7 @@
  */
 export function MarkerClusterer(map, markers, options) {}
 
-// [START maps_marker_clustering_script_body]
+// [START maps_marker_clustering]
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
     zoom: 3,
@@ -75,4 +75,4 @@ export var locations = [
   { lat: -42.735258, lng: 147.438 },
   { lat: -43.999792, lng: 170.463352 }
 ];
-// [END maps_marker_clustering_script_body]
+// [END maps_marker_clustering]
diff --git a/samples/marker-clustering/src/index.njk b/samples/marker-clustering/src/index.njk
index 1ce5a89970..54fd07cd62 100644
--- a/samples/marker-clustering/src/index.njk
+++ b/samples/marker-clustering/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_clustering_html_body] -->
+<!-- [START maps_marker_clustering] -->
 <div id="map"></div>
-<!-- [END maps_marker_clustering_html_body] -->
+<!-- [END maps_marker_clustering] -->
 {% endblock %}
diff --git a/samples/marker-clustering/src/style.scss b/samples/marker-clustering/src/style.scss
index e8b23be306..4433c7d15a 100644
--- a/samples/marker-clustering/src/style.scss
+++ b/samples/marker-clustering/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_clustering_css] */
+/*! [START maps_marker_clustering] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_clustering_css] */
+/*! [END maps_marker_clustering] */
diff --git a/samples/marker-labels/src/index.js b/samples/marker-labels/src/index.js
index 75108de628..42327a505b 100644
--- a/samples/marker-labels/src/index.js
+++ b/samples/marker-labels/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_labels_script_body]
+// [START maps_marker_labels]
 // In the following example, markers appear when the user clicks on the map.
 // Each marker is labeled with a single alphabetical character.
 export var labels = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -46,4 +46,4 @@ export function addMarker(location, map) {
     map: map
   });
 }
-// [END maps_marker_labels_script_body]
+// [END maps_marker_labels]
diff --git a/samples/marker-labels/src/index.njk b/samples/marker-labels/src/index.njk
index 5bd6a2d96e..94ad290197 100644
--- a/samples/marker-labels/src/index.njk
+++ b/samples/marker-labels/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_labels_html_body] -->
+<!-- [START maps_marker_labels] -->
 <div id="map"></div>
-<!-- [END maps_marker_labels_html_body] -->
+<!-- [END maps_marker_labels] -->
 {% endblock %}
diff --git a/samples/marker-labels/src/style.scss b/samples/marker-labels/src/style.scss
index 52832b4804..18066fa40e 100644
--- a/samples/marker-labels/src/style.scss
+++ b/samples/marker-labels/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_labels_css] */
+/*! [START maps_marker_labels] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_labels_css] */
+/*! [END maps_marker_labels] */
diff --git a/samples/marker-remove/src/index.js b/samples/marker-remove/src/index.js
index 225a724570..01e7416662 100755
--- a/samples/marker-remove/src/index.js
+++ b/samples/marker-remove/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_remove_script_body]
+// [START maps_marker_remove]
 // In the following example, markers appear when the user clicks on the map.
 // The markers are stored in an array.
 // The user can then click an option to hide, show or delete the markers.
@@ -70,4 +70,4 @@ export function deleteMarkers() {
   clearMarkers();
   markers = [];
 }
-// [END maps_marker_remove_script_body]
+// [END maps_marker_remove]
diff --git a/samples/marker-remove/src/index.njk b/samples/marker-remove/src/index.njk
index 12841cc65d..1059b19f2e 100644
--- a/samples/marker-remove/src/index.njk
+++ b/samples/marker-remove/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_remove_html_body] -->
+<!-- [START maps_marker_remove] -->
 <div id="floating-panel">
   <input onclick="clearMarkers();" type="button" value="Hide Markers" />
   <input onclick="showMarkers();" type="button" value="Show All Markers" />
@@ -22,5 +22,5 @@ limitations under the License.
 </div>
 <div id="map"></div>
 <p>Click on the map to add markers.</p>
-<!-- [END maps_marker_remove_html_body] -->
+<!-- [END maps_marker_remove] -->
 {% endblock %}
diff --git a/samples/marker-remove/src/style.scss b/samples/marker-remove/src/style.scss
index 5b96b6d72e..b7af1999c1 100644
--- a/samples/marker-remove/src/style.scss
+++ b/samples/marker-remove/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_remove_css] */
+/*! [START maps_marker_remove] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_marker_remove_css] */
+/*! [END maps_marker_remove] */
diff --git a/samples/marker-simple/src/index.js b/samples/marker-simple/src/index.js
index 3bc9be34da..0347d3d814 100644
--- a/samples/marker-simple/src/index.js
+++ b/samples/marker-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_simple_script_body]
+// [START maps_marker_simple]
 export function initMap() {
   var myLatLng = { lat: -25.363, lng: 131.044 };
 
@@ -29,4 +29,4 @@ export function initMap() {
     title: "Hello World!"
   });
 }
-// [END maps_marker_simple_script_body]
+// [END maps_marker_simple]
diff --git a/samples/marker-simple/src/index.njk b/samples/marker-simple/src/index.njk
index 650df6465f..024f1757c1 100644
--- a/samples/marker-simple/src/index.njk
+++ b/samples/marker-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_simple_html_body] -->
+<!-- [START maps_marker_simple] -->
 <div id="map"></div>
-<!-- [END maps_marker_simple_html_body] -->
+<!-- [END maps_marker_simple] -->
 {% endblock %}
diff --git a/samples/marker-simple/src/style.scss b/samples/marker-simple/src/style.scss
index 67ba1733d5..0aca77d871 100644
--- a/samples/marker-simple/src/style.scss
+++ b/samples/marker-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_simple_css] */
+/*! [START maps_marker_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_simple_css] */
+/*! [END maps_marker_simple] */
diff --git a/samples/marker-symbol-custom/src/index.js b/samples/marker-symbol-custom/src/index.js
index 91778424bc..36dc016d45 100644
--- a/samples/marker-symbol-custom/src/index.js
+++ b/samples/marker-symbol-custom/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_symbol_custom_script_body]
+// [START maps_marker_symbol_custom]
 // This example uses SVG path notation to add a vector-based symbol
 // as the icon for a marker. The resulting icon is a star-shaped symbol
 // with a pale yellow fill and a thick yellow border.
@@ -41,4 +41,4 @@ export function initMap() {
     map: map
   });
 }
-// [END maps_marker_symbol_custom_script_body]
+// [END maps_marker_symbol_custom]
diff --git a/samples/marker-symbol-custom/src/index.njk b/samples/marker-symbol-custom/src/index.njk
index b0c49037ed..b72d2a0fc1 100644
--- a/samples/marker-symbol-custom/src/index.njk
+++ b/samples/marker-symbol-custom/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_symbol_custom_html_body] -->
+<!-- [START maps_marker_symbol_custom] -->
 <div id="map"></div>
-<!-- [END maps_marker_symbol_custom_html_body] -->
+<!-- [END maps_marker_symbol_custom] -->
 {% endblock %}
diff --git a/samples/marker-symbol-custom/src/style.scss b/samples/marker-symbol-custom/src/style.scss
index 555b0eaa8a..bb6722e745 100644
--- a/samples/marker-symbol-custom/src/style.scss
+++ b/samples/marker-symbol-custom/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_symbol_custom_css] */
+/*! [START maps_marker_symbol_custom] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_symbol_custom_css] */
+/*! [END maps_marker_symbol_custom] */
diff --git a/samples/marker-symbol-predefined/src/index.js b/samples/marker-symbol-predefined/src/index.js
index 06e1952845..4073380082 100644
--- a/samples/marker-symbol-predefined/src/index.js
+++ b/samples/marker-symbol-predefined/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_marker_symbol_predefined_script_body]
+// [START maps_marker_symbol_predefined]
 // This example uses a symbol to add a vector-based icon to a marker.
 // The symbol uses one of the predefined vector paths ('CIRCLE') supplied by the
 // Google Maps JavaScript API.
@@ -35,4 +35,4 @@ export function initMap() {
     map: map
   });
 }
-// [END maps_marker_symbol_predefined_script_body]
+// [END maps_marker_symbol_predefined]
diff --git a/samples/marker-symbol-predefined/src/index.njk b/samples/marker-symbol-predefined/src/index.njk
index 2e06131a09..d90ed31952 100644
--- a/samples/marker-symbol-predefined/src/index.njk
+++ b/samples/marker-symbol-predefined/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_marker_symbol_predefined_html_body] -->
+<!-- [START maps_marker_symbol_predefined] -->
 <div id="map"></div>
-<!-- [END maps_marker_symbol_predefined_html_body] -->
+<!-- [END maps_marker_symbol_predefined] -->
 {% endblock %}
diff --git a/samples/marker-symbol-predefined/src/style.scss b/samples/marker-symbol-predefined/src/style.scss
index 1819039b9a..26bdaf8d21 100644
--- a/samples/marker-symbol-predefined/src/style.scss
+++ b/samples/marker-symbol-predefined/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_marker_symbol_predefined_css] */
+/*! [START maps_marker_symbol_predefined] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_marker_symbol_predefined_css] */
+/*! [END maps_marker_symbol_predefined] */
diff --git a/samples/maxzoom-simple/src/index.js b/samples/maxzoom-simple/src/index.js
index 0d9fa7b980..0c2dc2f052 100644
--- a/samples/maxzoom-simple/src/index.js
+++ b/samples/maxzoom-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_maxzoom_simple_script_body]
+// [START maps_maxzoom_simple]
 export var map;
 export var maxZoomService;
 export var infoWindow;
@@ -46,4 +46,4 @@ export function showMaxZoom(e) {
     infoWindow.open(map);
   });
 }
-// [END maps_maxzoom_simple_script_body]
+// [END maps_maxzoom_simple]
diff --git a/samples/maxzoom-simple/src/index.njk b/samples/maxzoom-simple/src/index.njk
index 36a22d580c..3e0063af52 100644
--- a/samples/maxzoom-simple/src/index.njk
+++ b/samples/maxzoom-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_maxzoom_simple_html_body] -->
+<!-- [START maps_maxzoom_simple] -->
 <div id="map"></div>
-<!-- [END maps_maxzoom_simple_html_body] -->
+<!-- [END maps_maxzoom_simple] -->
 {% endblock %}
diff --git a/samples/maxzoom-simple/src/style.scss b/samples/maxzoom-simple/src/style.scss
index 09565bf62f..1f91ad99b8 100644
--- a/samples/maxzoom-simple/src/style.scss
+++ b/samples/maxzoom-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_maxzoom_simple_css] */
+/*! [START maps_maxzoom_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_maxzoom_simple_css] */
+/*! [END maps_maxzoom_simple] */
diff --git a/samples/mysql-to-maps/src/index.js b/samples/mysql-to-maps/src/index.js
index cb4598e540..2cae5f947b 100644
--- a/samples/mysql-to-maps/src/index.js
+++ b/samples/mysql-to-maps/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_mysql_to_maps_script_body]
+// [START maps_mysql_to_maps]
 export var customLabel = {
   restaurant: {
     label: "R"
@@ -88,4 +88,4 @@ export function downloadUrl(url, callback) {
 }
 
 export function doNothing() {}
-// [END maps_mysql_to_maps_script_body]
+// [END maps_mysql_to_maps]
diff --git a/samples/mysql-to-maps/src/index.njk b/samples/mysql-to-maps/src/index.njk
index 11b0609c90..882cf5941e 100644
--- a/samples/mysql-to-maps/src/index.njk
+++ b/samples/mysql-to-maps/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_mysql_to_maps_html_body] -->
+<!-- [START maps_mysql_to_maps] -->
 <div id="map"></div>
-<!-- [END maps_mysql_to_maps_html_body] -->
+<!-- [END maps_mysql_to_maps] -->
 {% endblock %}
diff --git a/samples/mysql-to-maps/src/style.scss b/samples/mysql-to-maps/src/style.scss
index 3e271c55f0..1f8f6b9ef6 100644
--- a/samples/mysql-to-maps/src/style.scss
+++ b/samples/mysql-to-maps/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_mysql_to_maps_css] */
+/*! [START maps_mysql_to_maps] */
 
-/*! [END maps_mysql_to_maps_css] */
+/*! [END maps_mysql_to_maps] */
diff --git a/samples/overlay-hideshow/src/index.js b/samples/overlay-hideshow/src/index.js
index d3e8a45c4d..ec9af7593f 100644
--- a/samples/overlay-hideshow/src/index.js
+++ b/samples/overlay-hideshow/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_hideshow_script_body]
+// [START maps_overlay_hideshow]
 // This example adds hide() and show() methods to a custom overlay's prototype.
 // These methods toggle the visibility of the container <div>.
 // Additionally, we add a toggleDOM() method, which attaches or detaches the
@@ -144,4 +144,4 @@ USGSOverlay.prototype.toggleDOM = function() {
   }
 };
 // [END region_hideshow]
-// [END maps_overlay_hideshow_script_body]
+// [END maps_overlay_hideshow]
diff --git a/samples/overlay-hideshow/src/index.njk b/samples/overlay-hideshow/src/index.njk
index 561450b3fb..778f7029e3 100644
--- a/samples/overlay-hideshow/src/index.njk
+++ b/samples/overlay-hideshow/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_hideshow_html_body] -->
+<!-- [START maps_overlay_hideshow] -->
 <!-- [START region_toolbar] -->
 <!-- Add an input button to initiate the toggle method on the overlay. -->
 <div id="floating-panel">
@@ -27,5 +27,5 @@ limitations under the License.
 </div>
 <!-- [END region_toolbar] -->
 <div id="map"></div>
-<!-- [END maps_overlay_hideshow_html_body] -->
+<!-- [END maps_overlay_hideshow] -->
 {% endblock %}
diff --git a/samples/overlay-hideshow/src/style.scss b/samples/overlay-hideshow/src/style.scss
index d25f6ed491..ba2dca04b8 100644
--- a/samples/overlay-hideshow/src/style.scss
+++ b/samples/overlay-hideshow/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_hideshow_css] */
+/*! [START maps_overlay_hideshow] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_overlay_hideshow_css] */
+/*! [END maps_overlay_hideshow] */
diff --git a/samples/overlay-popup/src/index.js b/samples/overlay-popup/src/index.js
index 0803471816..642de6b85e 100644
--- a/samples/overlay-popup/src/index.js
+++ b/samples/overlay-popup/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_popup_script_body]
+// [START maps_overlay_popup]
 export var map, popup, Popup;
 
 /** Initializes the map and the custom popup. */
@@ -101,4 +101,4 @@ export function createPopupClass() {
 
   return Popup;
 }
-// [END maps_overlay_popup_script_body]
+// [END maps_overlay_popup]
diff --git a/samples/overlay-popup/src/index.njk b/samples/overlay-popup/src/index.njk
index 982e9d52d1..bd341c2bb9 100644
--- a/samples/overlay-popup/src/index.njk
+++ b/samples/overlay-popup/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_popup_html_body] -->
+<!-- [START maps_overlay_popup] -->
 <div id="map"></div>
 <div id="content">
   Hello world!
 </div>
-<!-- [END maps_overlay_popup_html_body] -->
+<!-- [END maps_overlay_popup] -->
 
 {% endblock %}
diff --git a/samples/overlay-popup/src/style.scss b/samples/overlay-popup/src/style.scss
index e44e2bb03d..4d3a524971 100644
--- a/samples/overlay-popup/src/style.scss
+++ b/samples/overlay-popup/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_overlay_popup_css] */
+/* [START maps_overlay_popup] */
 @import "../../../shared/scss/default.scss";
 
 /* The popup bubble styling. */
@@ -65,4 +65,4 @@
   /* The max width of the info window. */
   width: 200px;
 }
-/* [END maps_overlay_popup_css] */
+/* [END maps_overlay_popup] */
diff --git a/samples/overlay-remove/src/index.js b/samples/overlay-remove/src/index.js
index 65e9ee0114..5c48714e6e 100644
--- a/samples/overlay-remove/src/index.js
+++ b/samples/overlay-remove/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_remove_script_body]
+// [START maps_overlay_remove]
 // This example adds a UI control allowing users to remove the
 // ground overlay from the map.
 
@@ -51,4 +51,4 @@ export function removeOverlay() {
   historicalOverlay.setMap(null);
 }
 // [END region_removal]
-// [END maps_overlay_remove_script_body]
+// [END maps_overlay_remove]
diff --git a/samples/overlay-remove/src/index.njk b/samples/overlay-remove/src/index.njk
index 201f97e98a..36ec600f84 100644
--- a/samples/overlay-remove/src/index.njk
+++ b/samples/overlay-remove/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_remove_html_body] -->
+<!-- [START maps_overlay_remove] -->
 <div id="floating-panel">
   <input onclick="removeOverlay();" type="button" value="Remove overlay" />
   <input onclick="addOverlay();" type="button" value="Restore overlay" />
 </div>
 <div id="map"></div>
-<!-- [END maps_overlay_remove_html_body] -->
+<!-- [END maps_overlay_remove] -->
 {% endblock %}
diff --git a/samples/overlay-remove/src/style.scss b/samples/overlay-remove/src/style.scss
index 86ce8b9fbb..79321f46d2 100644
--- a/samples/overlay-remove/src/style.scss
+++ b/samples/overlay-remove/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_remove_css] */
+/*! [START maps_overlay_remove] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_overlay_remove_css] */
+/*! [END maps_overlay_remove] */
diff --git a/samples/overlay-simple/src/index.js b/samples/overlay-simple/src/index.js
index 4853373ce0..248a0908ea 100644
--- a/samples/overlay-simple/src/index.js
+++ b/samples/overlay-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_simple_script_body]
+// [START maps_overlay_simple]
 // [START region_initialization]
 // This example creates a custom overlay called USGSOverlay, containing
 // a U.S. Geological Survey (USGS) image of the relevant area on the map.
@@ -129,4 +129,4 @@ USGSOverlay.prototype.onRemove = function() {
   this.div_ = null;
 };
 // [END region_removal]
-// [END maps_overlay_simple_script_body]
+// [END maps_overlay_simple]
diff --git a/samples/overlay-simple/src/index.njk b/samples/overlay-simple/src/index.njk
index 26a8c4d23e..eaa3542edb 100644
--- a/samples/overlay-simple/src/index.njk
+++ b/samples/overlay-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_simple_html_body] -->
+<!-- [START maps_overlay_simple] -->
 <div id="map"></div>
-<!-- [END maps_overlay_simple_html_body] -->
+<!-- [END maps_overlay_simple] -->
 {% endblock %}
diff --git a/samples/overlay-simple/src/style.scss b/samples/overlay-simple/src/style.scss
index 1ed1c85f40..77ab35be5d 100644
--- a/samples/overlay-simple/src/style.scss
+++ b/samples/overlay-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_simple_css] */
+/*! [START maps_overlay_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_overlay_simple_css] */
+/*! [END maps_overlay_simple] */
diff --git a/samples/overlay-symbol-animate/src/index.js b/samples/overlay-symbol-animate/src/index.js
index 2a220dafc9..e0387867a9 100644
--- a/samples/overlay-symbol-animate/src/index.js
+++ b/samples/overlay-symbol-animate/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_symbol_animate_script_body]
+// [START maps_overlay_symbol_animate]
 // This example adds an animated symbol to a polyline.
 
 export function initMap() {
@@ -59,4 +59,4 @@ export function animateCircle(line) {
     line.set("icons", icons);
   }, 20);
 }
-// [END maps_overlay_symbol_animate_script_body]
+// [END maps_overlay_symbol_animate]
diff --git a/samples/overlay-symbol-animate/src/index.njk b/samples/overlay-symbol-animate/src/index.njk
index 83b286cb12..e324901dca 100644
--- a/samples/overlay-symbol-animate/src/index.njk
+++ b/samples/overlay-symbol-animate/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_symbol_animate_html_body] -->
+<!-- [START maps_overlay_symbol_animate] -->
 <div id="map"></div>
-<!-- [END maps_overlay_symbol_animate_html_body] -->
+<!-- [END maps_overlay_symbol_animate] -->
 {% endblock %}
diff --git a/samples/overlay-symbol-animate/src/style.scss b/samples/overlay-symbol-animate/src/style.scss
index 2a8fb0ba42..78b2d75361 100644
--- a/samples/overlay-symbol-animate/src/style.scss
+++ b/samples/overlay-symbol-animate/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_symbol_animate_css] */
+/*! [START maps_overlay_symbol_animate] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_overlay_symbol_animate_css] */
+/*! [END maps_overlay_symbol_animate] */
diff --git a/samples/overlay-symbol-arrow/src/index.js b/samples/overlay-symbol-arrow/src/index.js
index 7b11eaaaef..83a1b8db75 100644
--- a/samples/overlay-symbol-arrow/src/index.js
+++ b/samples/overlay-symbol-arrow/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_symbol_arrow_script_body]
+// [START maps_overlay_symbol_arrow]
 // This example adds a predefined symbol (an arrow) to a polyline.
 // Setting offset to 100% places the arrow at the end of the line.
 
@@ -45,4 +45,4 @@ export function initMap() {
   });
   // [END region_polyline]
 }
-// [END maps_overlay_symbol_arrow_script_body]
+// [END maps_overlay_symbol_arrow]
diff --git a/samples/overlay-symbol-arrow/src/index.njk b/samples/overlay-symbol-arrow/src/index.njk
index 891ac25ac4..57d2b64e9c 100644
--- a/samples/overlay-symbol-arrow/src/index.njk
+++ b/samples/overlay-symbol-arrow/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_symbol_arrow_html_body] -->
+<!-- [START maps_overlay_symbol_arrow] -->
 <div id="map"></div>
-<!-- [END maps_overlay_symbol_arrow_html_body] -->
+<!-- [END maps_overlay_symbol_arrow] -->
 {% endblock %}
diff --git a/samples/overlay-symbol-arrow/src/style.scss b/samples/overlay-symbol-arrow/src/style.scss
index 0142184fad..8b46385078 100644
--- a/samples/overlay-symbol-arrow/src/style.scss
+++ b/samples/overlay-symbol-arrow/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_symbol_arrow_css] */
+/*! [START maps_overlay_symbol_arrow] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_overlay_symbol_arrow_css] */
+/*! [END maps_overlay_symbol_arrow] */
diff --git a/samples/overlay-symbol-custom/src/index.js b/samples/overlay-symbol-custom/src/index.js
index de710a1d5c..730ee00682 100644
--- a/samples/overlay-symbol-custom/src/index.js
+++ b/samples/overlay-symbol-custom/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_symbol_custom_script_body]
+// [START maps_overlay_symbol_custom]
 // This example adds three custom symbols to a polyline.
 
 export function initMap() {
@@ -69,4 +69,4 @@ export function initMap() {
   });
   // [END region_polyline]
 }
-// [END maps_overlay_symbol_custom_script_body]
+// [END maps_overlay_symbol_custom]
diff --git a/samples/overlay-symbol-custom/src/index.njk b/samples/overlay-symbol-custom/src/index.njk
index f208fa43c5..5ba7f2ceed 100644
--- a/samples/overlay-symbol-custom/src/index.njk
+++ b/samples/overlay-symbol-custom/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_symbol_custom_html_body] -->
+<!-- [START maps_overlay_symbol_custom] -->
 <div id="map"></div>
-<!-- [END maps_overlay_symbol_custom_html_body] -->
+<!-- [END maps_overlay_symbol_custom] -->
 {% endblock %}
diff --git a/samples/overlay-symbol-custom/src/style.scss b/samples/overlay-symbol-custom/src/style.scss
index 0fe83a1912..7721c5f631 100644
--- a/samples/overlay-symbol-custom/src/style.scss
+++ b/samples/overlay-symbol-custom/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_symbol_custom_css] */
+/*! [START maps_overlay_symbol_custom] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_overlay_symbol_custom_css] */
+/*! [END maps_overlay_symbol_custom] */
diff --git a/samples/overlay-symbol-dashed/src/index.js b/samples/overlay-symbol-dashed/src/index.js
index 53811f8751..5300d092ec 100644
--- a/samples/overlay-symbol-dashed/src/index.js
+++ b/samples/overlay-symbol-dashed/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_overlay_symbol_dashed_script_body]
+// [START maps_overlay_symbol_dashed]
 // This example converts a polyline to a dashed line, by
 // setting the opacity of the polyline to 0, and drawing an opaque symbol
 // at a regular interval on the polyline.
@@ -51,4 +51,4 @@ export function initMap() {
   });
   // [END region_polyline]
 }
-// [END maps_overlay_symbol_dashed_script_body]
+// [END maps_overlay_symbol_dashed]
diff --git a/samples/overlay-symbol-dashed/src/index.njk b/samples/overlay-symbol-dashed/src/index.njk
index 0815c31e0d..7cddedf368 100644
--- a/samples/overlay-symbol-dashed/src/index.njk
+++ b/samples/overlay-symbol-dashed/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_overlay_symbol_dashed_html_body] -->
+<!-- [START maps_overlay_symbol_dashed] -->
 <div id="map"></div>
-<!-- [END maps_overlay_symbol_dashed_html_body] -->
+<!-- [END maps_overlay_symbol_dashed] -->
 {% endblock %}
diff --git a/samples/overlay-symbol-dashed/src/style.scss b/samples/overlay-symbol-dashed/src/style.scss
index 1e70b561e2..d536b86860 100644
--- a/samples/overlay-symbol-dashed/src/style.scss
+++ b/samples/overlay-symbol-dashed/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_overlay_symbol_dashed_css] */
+/*! [START maps_overlay_symbol_dashed] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_overlay_symbol_dashed_css] */
+/*! [END maps_overlay_symbol_dashed] */
diff --git a/samples/place-details/src/index.js b/samples/place-details/src/index.js
index 10320c555b..78154075db 100644
--- a/samples/place-details/src/index.js
+++ b/samples/place-details/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_place_details_script_body]
+// [START maps_place_details]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
@@ -55,4 +55,4 @@ export function initMap() {
     }
   });
 }
-// [END maps_place_details_script_body]
+// [END maps_place_details]
diff --git a/samples/place-details/src/index.njk b/samples/place-details/src/index.njk
index e00c1a83fc..0ea5880714 100644
--- a/samples/place-details/src/index.njk
+++ b/samples/place-details/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_place_details_html_body] -->
+<!-- [START maps_place_details] -->
 <div id="map"></div>
-<!-- [END maps_place_details_html_body] -->
+<!-- [END maps_place_details] -->
 {% endblock %}
diff --git a/samples/place-details/src/style.scss b/samples/place-details/src/style.scss
index 729b649f9f..12376e3585 100644
--- a/samples/place-details/src/style.scss
+++ b/samples/place-details/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_place_details_css] */
+/*! [START maps_place_details] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_place_details_css] */
+/*! [END maps_place_details] */
diff --git a/samples/place-id/src/index.njk b/samples/place-id/src/index.njk
index 866d77f9b3..cd13754401 100644
--- a/samples/place-id/src/index.njk
+++ b/samples/place-id/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_place_id_html_body] -->
+<!-- [START maps_place_id] -->
 <div id="map"></div>
-<!-- [END maps_place_id_html_body] -->
+<!-- [END maps_place_id] -->
 {% endblock %}
diff --git a/samples/place-id/src/style.scss b/samples/place-id/src/style.scss
index 26c7bb7e95..76c66d5a13 100644
--- a/samples/place-id/src/style.scss
+++ b/samples/place-id/src/style.scss
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-/*! [START maps_place_id_css] */
+/*! [START maps_place_id] */
 
-/*! [END maps_place_id_css] */
+/*! [END maps_place_id] */
diff --git a/samples/place-search-pagination/src/index.js b/samples/place-search-pagination/src/index.js
index 9091538778..a9c41aa77c 100644
--- a/samples/place-search-pagination/src/index.js
+++ b/samples/place-search-pagination/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_place_search_pagination_script_body]
+// [START maps_place_search_pagination]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
@@ -83,4 +83,4 @@ export function createMarkers(places) {
   }
   map.fitBounds(bounds);
 }
-// [END maps_place_search_pagination_script_body]
+// [END maps_place_search_pagination]
diff --git a/samples/place-search-pagination/src/index.njk b/samples/place-search-pagination/src/index.njk
index 6898ed3f1f..8386c7c96c 100644
--- a/samples/place-search-pagination/src/index.njk
+++ b/samples/place-search-pagination/src/index.njk
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_place_search_pagination_html_body] -->
+<!-- [START maps_place_search_pagination] -->
 <div id="map"></div>
 <div id="right-panel">
   <h2>Results</h2>
   <ul id="places"></ul>
   <button id="more">More results</button>
 </div>
-<!-- [END maps_place_search_pagination_html_body] -->
+<!-- [END maps_place_search_pagination] -->
 {% endblock %}
diff --git a/samples/place-search-pagination/src/style.scss b/samples/place-search-pagination/src/style.scss
index 0fc5ee5a3f..b228a0aeed 100644
--- a/samples/place-search-pagination/src/style.scss
+++ b/samples/place-search-pagination/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_place_search_pagination_css] */
+/* [START maps_place_search_pagination] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/right-panel.scss";
 
@@ -57,4 +57,4 @@ li:nth-child(odd) {
   width: 100%;
   margin: 5px 0 0 0;
 }
-/* [END maps_place_search_pagination_css] */
+/* [END maps_place_search_pagination] */
diff --git a/samples/place-search/src/index.js b/samples/place-search/src/index.js
index d226ead1f8..46c70ee374 100644
--- a/samples/place-search/src/index.js
+++ b/samples/place-search/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_place_search_script_body]
+// [START maps_place_search]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
@@ -62,4 +62,4 @@ export function createMarker(place) {
     infowindow.open(map, this);
   });
 }
-// [END maps_place_search_script_body]
+// [END maps_place_search]
diff --git a/samples/place-search/src/index.njk b/samples/place-search/src/index.njk
index e763767324..6f35565d07 100644
--- a/samples/place-search/src/index.njk
+++ b/samples/place-search/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_place_search_html_body] -->
+<!-- [START maps_place_search] -->
 <div id="map"></div>
-<!-- [END maps_place_search_html_body] -->
+<!-- [END maps_place_search] -->
 {% endblock %}
diff --git a/samples/place-search/src/style.scss b/samples/place-search/src/style.scss
index ebbbec598d..c224200c71 100644
--- a/samples/place-search/src/style.scss
+++ b/samples/place-search/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_place_search_css] */
+/*! [START maps_place_search] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_place_search_css] */
+/*! [END maps_place_search] */
diff --git a/samples/places-autocomplete-addressform/src/index.js b/samples/places-autocomplete-addressform/src/index.js
index 33ffcb7cbf..51227fe8bb 100644
--- a/samples/places-autocomplete-addressform/src/index.js
+++ b/samples/places-autocomplete-addressform/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_autocomplete_addressform_script_body]
+// [START maps_places_autocomplete_addressform]
 // This sample uses the Autocomplete widget to help the user select a
 // place, then it retrieves the address components associated with that
 // place, and then it populates the form fields with those details.
@@ -92,4 +92,4 @@ export function geolocate() {
   }
 }
 // [END region_geolocation]
-// [END maps_places_autocomplete_addressform_script_body]
+// [END maps_places_autocomplete_addressform]
diff --git a/samples/places-autocomplete-addressform/src/index.njk b/samples/places-autocomplete-addressform/src/index.njk
index dd4080bef3..649f8f5447 100644
--- a/samples/places-autocomplete-addressform/src/index.njk
+++ b/samples/places-autocomplete-addressform/src/index.njk
@@ -20,7 +20,7 @@ limitations under the License.
   href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"
 />
 {% endblock %} {% block html %}
-<!-- [START maps_places_autocomplete_addressform_html_body] -->
+<!-- [START maps_places_autocomplete_addressform] -->
 <div id="locationField">
   <input
     id="autocomplete"
@@ -69,6 +69,6 @@ limitations under the License.
   </tr>
 </table>
 
-<!-- [END maps_places_autocomplete_addressform_html_body] -->
+<!-- [END maps_places_autocomplete_addressform] -->
 
 {% endblock %}
diff --git a/samples/places-autocomplete-addressform/src/style.scss b/samples/places-autocomplete-addressform/src/style.scss
index 603209c879..f496a8e720 100644
--- a/samples/places-autocomplete-addressform/src/style.scss
+++ b/samples/places-autocomplete-addressform/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_places_autocomplete_addressform_css] */
+/* [START maps_places_autocomplete_addressform] */
 @import "../../../shared/scss/default.scss";
 
 #locationField,
@@ -57,4 +57,4 @@
   height: 20px;
   margin-bottom: 2px;
 }
-/* [END maps_places_autocomplete_addressform_css] */
+/* [END maps_places_autocomplete_addressform] */
diff --git a/samples/places-autocomplete-directions/src/index.js b/samples/places-autocomplete-directions/src/index.js
index c428e9c445..87fc1838e5 100644
--- a/samples/places-autocomplete-directions/src/index.js
+++ b/samples/places-autocomplete-directions/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_autocomplete_directions_script_body]
+// [START maps_places_autocomplete_directions]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script
@@ -130,4 +130,4 @@ AutocompleteDirectionsHandler.prototype.route = function() {
   );
 };
 
-// [END maps_places_autocomplete_directions_script_body]
+// [END maps_places_autocomplete_directions]
diff --git a/samples/places-autocomplete-directions/src/index.njk b/samples/places-autocomplete-directions/src/index.njk
index 27b31165fd..9d2294607b 100644
--- a/samples/places-autocomplete-directions/src/index.njk
+++ b/samples/places-autocomplete-directions/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_autocomplete_directions_html_body] -->
+<!-- [START maps_places_autocomplete_directions] -->
 <div style="display: none">
   <input
     id="origin-input"
@@ -43,6 +43,6 @@ limitations under the License.
 </div>
 
 <div id="map"></div>
-<!-- [END maps_places_autocomplete_directions_html_body] -->
+<!-- [END maps_places_autocomplete_directions] -->
 
 {% endblock %}
diff --git a/samples/places-autocomplete-directions/src/style.scss b/samples/places-autocomplete-directions/src/style.scss
index 8f87c2db2a..38f44f979f 100644
--- a/samples/places-autocomplete-directions/src/style.scss
+++ b/samples/places-autocomplete-directions/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_places_autocomplete_directions_css] */
+/*! [START maps_places_autocomplete_directions] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/autocomplete-directions.scss";
 
-/*! [END maps_places_autocomplete_directions_css] */
+/*! [END maps_places_autocomplete_directions] */
diff --git a/samples/places-autocomplete-hotelsearch/src/index.js b/samples/places-autocomplete-hotelsearch/src/index.js
index 70a4ef1b9e..21b56e6735 100644
--- a/samples/places-autocomplete-hotelsearch/src/index.js
+++ b/samples/places-autocomplete-hotelsearch/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_autocomplete_hotelsearch_script_body]
+// [START maps_places_autocomplete_hotelsearch]
 // This example uses the autocomplete feature of the Google Places API.
 // It allows the user to find all hotels in a given place, within a given
 // country. It then displays markers for all the hotels returned,
@@ -297,4 +297,4 @@ export function buildIWContent(place) {
     document.getElementById("iw-website-row").style.display = "none";
   }
 }
-// [END maps_places_autocomplete_hotelsearch_script_body]
+// [END maps_places_autocomplete_hotelsearch]
diff --git a/samples/places-autocomplete-hotelsearch/src/index.njk b/samples/places-autocomplete-hotelsearch/src/index.njk
index 09b2a580c2..a53cdb854f 100644
--- a/samples/places-autocomplete-hotelsearch/src/index.njk
+++ b/samples/places-autocomplete-hotelsearch/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_autocomplete_hotelsearch_html_body] -->
+<!-- [START maps_places_autocomplete_hotelsearch] -->
 <div class="hotel-search">
   <div id="findhotels">
     Find hotels in:
@@ -78,6 +78,6 @@ limitations under the License.
     </table>
   </div>
 </div>
-<!-- [END maps_places_autocomplete_hotelsearch_html_body] -->
+<!-- [END maps_places_autocomplete_hotelsearch] -->
 
 {% endblock %}
diff --git a/samples/places-autocomplete-hotelsearch/src/style.scss b/samples/places-autocomplete-hotelsearch/src/style.scss
index 72a3e3fc88..ccfafac2fd 100644
--- a/samples/places-autocomplete-hotelsearch/src/style.scss
+++ b/samples/places-autocomplete-hotelsearch/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_places_autocomplete_hotelsearch_css] */
+/* [START maps_places_autocomplete_hotelsearch] */
 @import "../../../shared/scss/default.scss";
 
 body {
@@ -98,4 +98,4 @@ table {
 .iw_table_icon {
   text-align: right;
 }
-/* [END maps_places_autocomplete_hotelsearch_css] */
+/* [END maps_places_autocomplete_hotelsearch] */
diff --git a/samples/places-autocomplete-multiple-countries/src/index.js b/samples/places-autocomplete-multiple-countries/src/index.js
index 5e8465c6dd..8a465e12f4 100644
--- a/samples/places-autocomplete-multiple-countries/src/index.js
+++ b/samples/places-autocomplete-multiple-countries/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_autocomplete_multiple_countries_script_body]
+// [START maps_places_autocomplete_multiple_countries]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
@@ -108,4 +108,4 @@ export function initMap() {
     "mp"
   ]);
 }
-// [END maps_places_autocomplete_multiple_countries_script_body]
+// [END maps_places_autocomplete_multiple_countries]
diff --git a/samples/places-autocomplete-multiple-countries/src/index.njk b/samples/places-autocomplete-multiple-countries/src/index.njk
index 699d5a9a5d..fac41eaf98 100644
--- a/samples/places-autocomplete-multiple-countries/src/index.njk
+++ b/samples/places-autocomplete-multiple-countries/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_autocomplete_multiple_countries_html_body] -->
+<!-- [START maps_places_autocomplete_multiple_countries] -->
 <div class="pac-card" id="pac-card">
   <div>
     <div id="title">
@@ -45,6 +45,6 @@ limitations under the License.
   <span id="place-name" class="title"></span><br />
   <span id="place-address"></span>
 </div>
-<!-- [END maps_places_autocomplete_multiple_countries_html_body] -->
+<!-- [END maps_places_autocomplete_multiple_countries] -->
 
 {% endblock %}
diff --git a/samples/places-autocomplete-multiple-countries/src/style.scss b/samples/places-autocomplete-multiple-countries/src/style.scss
index 57985b6d70..5b698e724a 100644
--- a/samples/places-autocomplete-multiple-countries/src/style.scss
+++ b/samples/places-autocomplete-multiple-countries/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_places_autocomplete_multiple_countries_css] */
+/*! [START maps_places_autocomplete_multiple_countries] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/autocomplete.scss";
 
-/*! [END maps_places_autocomplete_multiple_countries_css] */
+/*! [END maps_places_autocomplete_multiple_countries] */
diff --git a/samples/places-autocomplete/src/index.js b/samples/places-autocomplete/src/index.js
index 5e110d6f12..36459d9555 100644
--- a/samples/places-autocomplete/src/index.js
+++ b/samples/places-autocomplete/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_autocomplete_script_body]
+// [START maps_places_autocomplete]
 // This example requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=places">
@@ -112,4 +112,4 @@ export function initMap() {
       autocomplete.setOptions({ strictBounds: this.checked });
     });
 }
-// [END maps_places_autocomplete_script_body]
+// [END maps_places_autocomplete]
diff --git a/samples/places-autocomplete/src/index.njk b/samples/places-autocomplete/src/index.njk
index 6a1a0d5d83..dcb47a872d 100644
--- a/samples/places-autocomplete/src/index.njk
+++ b/samples/places-autocomplete/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_autocomplete_html_body] -->
+<!-- [START maps_places_autocomplete] -->
 <div class="pac-card" id="pac-card">
   <div>
     <div id="title">
@@ -48,6 +48,6 @@ limitations under the License.
   <span id="place-name" class="title"></span><br />
   <span id="place-address"></span>
 </div>
-<!-- [END maps_places_autocomplete_html_body] -->
+<!-- [END maps_places_autocomplete] -->
 
 {% endblock %}
diff --git a/samples/places-autocomplete/src/style.scss b/samples/places-autocomplete/src/style.scss
index 0efb2fb784..bc137683b3 100644
--- a/samples/places-autocomplete/src/style.scss
+++ b/samples/places-autocomplete/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_places_autocomplete_css] */
+/*! [START maps_places_autocomplete] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/autocomplete.scss";
 
-/*! [END maps_places_autocomplete_css] */
+/*! [END maps_places_autocomplete] */
diff --git a/samples/places-placeid-finder/src/index.js b/samples/places-placeid-finder/src/index.js
index b2eaf8b38e..fb6371787d 100644
--- a/samples/places-placeid-finder/src/index.js
+++ b/samples/places-placeid-finder/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_placeid_finder_script_body]
+// [START maps_places_placeid_finder]
 // This sample uses the Place Autocomplete widget to allow the user to search
 // for and select a place. The sample then displays an info window containing
 // the place ID and other information about the place that the user has
@@ -81,4 +81,4 @@ export function initMap() {
     infowindow.open(map, marker);
   });
 }
-// [END maps_places_placeid_finder_script_body]
+// [END maps_places_placeid_finder]
diff --git a/samples/places-placeid-finder/src/index.njk b/samples/places-placeid-finder/src/index.njk
index ecd037f35c..c928a6aa55 100644
--- a/samples/places-placeid-finder/src/index.njk
+++ b/samples/places-placeid-finder/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_placeid_finder_html_body] -->
+<!-- [START maps_places_placeid_finder] -->
 <div style="display: none">
   <input
     id="pac-input"
@@ -29,6 +29,6 @@ limitations under the License.
   <strong>Place ID:</strong> <span id="place-id"></span><br />
   <span id="place-address"></span>
 </div>
-<!-- [END maps_places_placeid_finder_html_body] -->
+<!-- [END maps_places_placeid_finder] -->
 
 {% endblock %}
diff --git a/samples/places-placeid-finder/src/style.scss b/samples/places-placeid-finder/src/style.scss
index 1b333a2326..cde2a5a2bc 100644
--- a/samples/places-placeid-finder/src/style.scss
+++ b/samples/places-placeid-finder/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_places_placeid_finder_css] */
+/* [START maps_places_placeid_finder] */
 @import "../../../shared/scss/default.scss";
 
 .controls {
@@ -48,4 +48,4 @@
   display: inline;
 }
 
-/* [END maps_places_placeid_finder_css] */
+/* [END maps_places_placeid_finder] */
diff --git a/samples/places-placeid-geocoder/src/index.js b/samples/places-placeid-geocoder/src/index.js
index 7b638385c3..947497be60 100644
--- a/samples/places-placeid-geocoder/src/index.js
+++ b/samples/places-placeid-geocoder/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_placeid_geocoder_script_body]
+// [START maps_places_placeid_geocoder]
 // This sample requires the Places library. Include the libraries=places
 // parameter when you first load the API. For example:
 // <script
@@ -81,4 +81,4 @@ export function initMap() {
     });
   });
 }
-// [END maps_places_placeid_geocoder_script_body]
+// [END maps_places_placeid_geocoder]
diff --git a/samples/places-placeid-geocoder/src/index.njk b/samples/places-placeid-geocoder/src/index.njk
index 66a54cf322..fd2fe4b16d 100644
--- a/samples/places-placeid-geocoder/src/index.njk
+++ b/samples/places-placeid-geocoder/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_placeid_geocoder_html_body] -->
+<!-- [START maps_places_placeid_geocoder] -->
 <div style="display: none">
   <input
     id="pac-input"
@@ -29,6 +29,6 @@ limitations under the License.
   <strong>Place ID</strong>: <span id="place-id"></span><br />
   <span id="place-address"></span>
 </div>
-<!-- [END maps_places_placeid_geocoder_html_body] -->
+<!-- [END maps_places_placeid_geocoder] -->
 
 {% endblock %}
diff --git a/samples/places-placeid-geocoder/src/style.scss b/samples/places-placeid-geocoder/src/style.scss
index 0dd4ce8b3c..5d6726ee5d 100644
--- a/samples/places-placeid-geocoder/src/style.scss
+++ b/samples/places-placeid-geocoder/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_places_placeid_geocoder_css] */
+/* [START maps_places_placeid_geocoder] */
 @import "../../../shared/scss/default.scss";
 
 .controls {
@@ -48,4 +48,4 @@
   display: inline;
 }
 
-/* [END maps_places_placeid_geocoder_css] */
+/* [END maps_places_placeid_geocoder] */
diff --git a/samples/places-queryprediction/src/index.js b/samples/places-queryprediction/src/index.js
index c53ed44e38..ba69641d58 100644
--- a/samples/places-queryprediction/src/index.js
+++ b/samples/places-queryprediction/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_queryprediction_script_body]
+// [START maps_places_queryprediction]
 // This example retrieves autocomplete predictions programmatically from the
 // autocomplete service, and displays them as an HTML list.
 
@@ -39,4 +39,4 @@ export function initService() {
   var service = new google.maps.places.AutocompleteService();
   service.getQueryPredictions({ input: "pizza near Syd" }, displaySuggestions);
 }
-// [END maps_places_queryprediction_script_body]
+// [END maps_places_queryprediction]
diff --git a/samples/places-queryprediction/src/index.njk b/samples/places-queryprediction/src/index.njk
index 7d6c7c52ca..f58f456286 100644
--- a/samples/places-queryprediction/src/index.njk
+++ b/samples/places-queryprediction/src/index.njk
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_queryprediction_html_body] -->
+<!-- [START maps_places_queryprediction] -->
 <div id="right-panel">
   <p>Query suggestions for 'pizza near Syd':</p>
   <ul id="results"></ul>
 </div>
-<!-- [END maps_places_queryprediction_html_body] -->
+<!-- [END maps_places_queryprediction] -->
 {% endblock %}
diff --git a/samples/places-queryprediction/src/style.scss b/samples/places-queryprediction/src/style.scss
index 55d061990e..5306e4245c 100644
--- a/samples/places-queryprediction/src/style.scss
+++ b/samples/places-queryprediction/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_places_queryprediction_css] */
+/*! [START maps_places_queryprediction] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/right-panel.scss";
 
-/*! [END maps_places_queryprediction_css] */
+/*! [END maps_places_queryprediction] */
diff --git a/samples/places-searchbox/src/index.js b/samples/places-searchbox/src/index.js
index 925e0f4038..a600a6ee86 100644
--- a/samples/places-searchbox/src/index.js
+++ b/samples/places-searchbox/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_places_searchbox_script_body]
+// [START maps_places_searchbox]
 // This example adds a search box to a map, using the Google Place Autocomplete
 // feature. People can enter geographical searches. The search box will return a
 // pick list containing a mix of places and predicted search terms.
@@ -94,4 +94,4 @@ export function initAutocomplete() {
   // [END region_getplaces]
 }
 
-// [END maps_places_searchbox_script_body]
+// [END maps_places_searchbox]
diff --git a/samples/places-searchbox/src/index.njk b/samples/places-searchbox/src/index.njk
index dbc458d645..094940effe 100644
--- a/samples/places-searchbox/src/index.njk
+++ b/samples/places-searchbox/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_places_searchbox_html_body] -->
+<!-- [START maps_places_searchbox] -->
 <input id="pac-input" class="controls" type="text" placeholder="Search Box" />
 <div id="map"></div>
-<!-- [END maps_places_searchbox_html_body] -->
+<!-- [END maps_places_searchbox] -->
 {% endblock %}
diff --git a/samples/places-searchbox/src/style.scss b/samples/places-searchbox/src/style.scss
index e992586bdd..5cb5992765 100644
--- a/samples/places-searchbox/src/style.scss
+++ b/samples/places-searchbox/src/style.scss
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-/* [START maps_places_searchbox_css] */
+/* [START maps_places_searchbox] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/autocomplete.scss";
 
 #target {
   width: 345px;
 }
-/* [END maps_places_searchbox_css] */
+/* [END maps_places_searchbox] */
diff --git a/samples/poly-containsLocation/src/index.js b/samples/poly-containsLocation/src/index.js
index 1370169d86..3c20f94bdd 100755
--- a/samples/poly-containsLocation/src/index.js
+++ b/samples/poly-containsLocation/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_poly_containsLocation_script_body]
+// [START maps_poly_containsLocation]
 // This example requires the Geometry library. Include the libraries=geometry
 // parameter when you first load the API. For example:
 // <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY&libraries=geometry">
@@ -63,4 +63,4 @@ export function initMap() {
     });
   });
 }
-// [END maps_poly_containsLocation_script_body]
+// [END maps_poly_containsLocation]
diff --git a/samples/poly-containsLocation/src/index.njk b/samples/poly-containsLocation/src/index.njk
index 54a52a1808..155ca51ac3 100644
--- a/samples/poly-containsLocation/src/index.njk
+++ b/samples/poly-containsLocation/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_poly_containsLocation_html_body] -->
+<!-- [START maps_poly_containsLocation] -->
 <div id="map"></div>
-<!-- [END maps_poly_containsLocation_html_body] -->
+<!-- [END maps_poly_containsLocation] -->
 {% endblock %}
diff --git a/samples/poly-containsLocation/src/style.scss b/samples/poly-containsLocation/src/style.scss
index d1c5eb6581..3f056214ef 100644
--- a/samples/poly-containsLocation/src/style.scss
+++ b/samples/poly-containsLocation/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_poly_containsLocation_css] */
+/*! [START maps_poly_containsLocation] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_poly_containsLocation_css] */
+/*! [END maps_poly_containsLocation] */
diff --git a/samples/polygon-arrays/src/index.js b/samples/polygon-arrays/src/index.js
index 8ab144e042..e0639038a1 100644
--- a/samples/polygon-arrays/src/index.js
+++ b/samples/polygon-arrays/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polygon_arrays_script_body]
+// [START maps_polygon_arrays]
 // This example creates a simple polygon representing the Bermuda Triangle.
 // When the user clicks on the polygon an info window opens, showing
 // information about the polygon's coordinates.
@@ -80,4 +80,4 @@ export function showArrays(event) {
 
   infoWindow.open(map);
 }
-// [END maps_polygon_arrays_script_body]
+// [END maps_polygon_arrays]
diff --git a/samples/polygon-arrays/src/index.njk b/samples/polygon-arrays/src/index.njk
index d4daa2ec20..8cf0a87108 100644
--- a/samples/polygon-arrays/src/index.njk
+++ b/samples/polygon-arrays/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polygon_arrays_html_body] -->
+<!-- [START maps_polygon_arrays] -->
 <div id="map"></div>
-<!-- [END maps_polygon_arrays_html_body] -->
+<!-- [END maps_polygon_arrays] -->
 {% endblock %}
diff --git a/samples/polygon-arrays/src/style.scss b/samples/polygon-arrays/src/style.scss
index b96084d95a..8e6fec37e6 100644
--- a/samples/polygon-arrays/src/style.scss
+++ b/samples/polygon-arrays/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polygon_arrays_css] */
+/*! [START maps_polygon_arrays] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polygon_arrays_css] */
+/*! [END maps_polygon_arrays] */
diff --git a/samples/polygon-autoclose/src/index.js b/samples/polygon-autoclose/src/index.js
index cdb3f93dd0..646c640124 100644
--- a/samples/polygon-autoclose/src/index.js
+++ b/samples/polygon-autoclose/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polygon_autoclose_script_body]
+// [START maps_polygon_autoclose]
 // This example creates a simple polygon representing the Bermuda Triangle. Note
 // that the code specifies only three LatLng coordinates for the polygon. The
 // API automatically draws a stroke connecting the last LatLng back to the first
@@ -46,4 +46,4 @@ export function initMap() {
   });
   bermudaTriangle.setMap(map);
 }
-// [END maps_polygon_autoclose_script_body]
+// [END maps_polygon_autoclose]
diff --git a/samples/polygon-autoclose/src/index.njk b/samples/polygon-autoclose/src/index.njk
index d3331e1167..bc3581ecc6 100644
--- a/samples/polygon-autoclose/src/index.njk
+++ b/samples/polygon-autoclose/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polygon_autoclose_html_body] -->
+<!-- [START maps_polygon_autoclose] -->
 <div id="map"></div>
-<!-- [END maps_polygon_autoclose_html_body] -->
+<!-- [END maps_polygon_autoclose] -->
 {% endblock %}
diff --git a/samples/polygon-autoclose/src/style.scss b/samples/polygon-autoclose/src/style.scss
index 1a2c5ce448..04bbab251c 100644
--- a/samples/polygon-autoclose/src/style.scss
+++ b/samples/polygon-autoclose/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polygon_autoclose_css] */
+/*! [START maps_polygon_autoclose] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polygon_autoclose_css] */
+/*! [END maps_polygon_autoclose] */
diff --git a/samples/polygon-draggable/src/index.js b/samples/polygon-draggable/src/index.js
index 5896a7fdbe..726cb81759 100644
--- a/samples/polygon-draggable/src/index.js
+++ b/samples/polygon-draggable/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polygon_draggable_script_body]
+// [START maps_polygon_draggable]
 // This example creates draggable triangles on the map.
 // Note also that the red triangle is geodesic, so its shape changes
 // as you drag it north or south.
@@ -66,4 +66,4 @@ export function initMap() {
     geodesic: false
   });
 }
-// [END maps_polygon_draggable_script_body]
+// [END maps_polygon_draggable]
diff --git a/samples/polygon-draggable/src/index.njk b/samples/polygon-draggable/src/index.njk
index 2d6437baf0..ae9713715d 100644
--- a/samples/polygon-draggable/src/index.njk
+++ b/samples/polygon-draggable/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polygon_draggable_html_body] -->
+<!-- [START maps_polygon_draggable] -->
 <div id="map"></div>
-<!-- [END maps_polygon_draggable_html_body] -->
+<!-- [END maps_polygon_draggable] -->
 {% endblock %}
diff --git a/samples/polygon-draggable/src/style.scss b/samples/polygon-draggable/src/style.scss
index 0eff5fda83..a99a3268b4 100644
--- a/samples/polygon-draggable/src/style.scss
+++ b/samples/polygon-draggable/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polygon_draggable_css] */
+/*! [START maps_polygon_draggable] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polygon_draggable_css] */
+/*! [END maps_polygon_draggable] */
diff --git a/samples/polygon-hole/src/index.js b/samples/polygon-hole/src/index.js
index a74b1dd7e4..9de1171d1f 100644
--- a/samples/polygon-hole/src/index.js
+++ b/samples/polygon-hole/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polygon_hole_script_body]
+// [START maps_polygon_hole]
 // This example creates a triangular polygon with a hole in it.
 
 export function initMap() {
@@ -50,4 +50,4 @@ export function initMap() {
   });
   bermudaTriangle.setMap(map);
 }
-// [END maps_polygon_hole_script_body]
+// [END maps_polygon_hole]
diff --git a/samples/polygon-hole/src/index.njk b/samples/polygon-hole/src/index.njk
index fa969381f4..f6a054abda 100644
--- a/samples/polygon-hole/src/index.njk
+++ b/samples/polygon-hole/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polygon_hole_html_body] -->
+<!-- [START maps_polygon_hole] -->
 <div id="map"></div>
-<!-- [END maps_polygon_hole_html_body] -->
+<!-- [END maps_polygon_hole] -->
 {% endblock %}
diff --git a/samples/polygon-hole/src/style.scss b/samples/polygon-hole/src/style.scss
index 62594925ca..075ade8cea 100644
--- a/samples/polygon-hole/src/style.scss
+++ b/samples/polygon-hole/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polygon_hole_css] */
+/*! [START maps_polygon_hole] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polygon_hole_css] */
+/*! [END maps_polygon_hole] */
diff --git a/samples/polygon-simple/src/index.js b/samples/polygon-simple/src/index.js
index 43185f5810..d355bc96c3 100644
--- a/samples/polygon-simple/src/index.js
+++ b/samples/polygon-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polygon_simple_script_body]
+// [START maps_polygon_simple]
 // This example creates a simple polygon representing the Bermuda Triangle.
 
 export function initMap() {
@@ -43,4 +43,4 @@ export function initMap() {
   });
   bermudaTriangle.setMap(map);
 }
-// [END maps_polygon_simple_script_body]
+// [END maps_polygon_simple]
diff --git a/samples/polygon-simple/src/index.njk b/samples/polygon-simple/src/index.njk
index 3d3350ae1a..93df04de6c 100644
--- a/samples/polygon-simple/src/index.njk
+++ b/samples/polygon-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polygon_simple_html_body] -->
+<!-- [START maps_polygon_simple] -->
 <div id="map"></div>
-<!-- [END maps_polygon_simple_html_body] -->
+<!-- [END maps_polygon_simple] -->
 {% endblock %}
diff --git a/samples/polygon-simple/src/style.scss b/samples/polygon-simple/src/style.scss
index c4a8bfa72c..6cde367bad 100644
--- a/samples/polygon-simple/src/style.scss
+++ b/samples/polygon-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polygon_simple_css] */
+/*! [START maps_polygon_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polygon_simple_css] */
+/*! [END maps_polygon_simple] */
diff --git a/samples/polyline-complex/src/index.js b/samples/polyline-complex/src/index.js
index 3243a24e48..df113fdb7c 100644
--- a/samples/polyline-complex/src/index.js
+++ b/samples/polyline-complex/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polyline_complex_script_body]
+// [START maps_polyline_complex]
 // This example creates an interactive map which constructs a polyline based on
 // user clicks. Note that the polyline only appears once its path property
 // contains two LatLng coordinates.
@@ -54,4 +54,4 @@ export function addLatLng(event) {
     map: map
   });
 }
-// [END maps_polyline_complex_script_body]
+// [END maps_polyline_complex]
diff --git a/samples/polyline-complex/src/index.njk b/samples/polyline-complex/src/index.njk
index 6a80cb442d..13309d2ac4 100644
--- a/samples/polyline-complex/src/index.njk
+++ b/samples/polyline-complex/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polyline_complex_html_body] -->
+<!-- [START maps_polyline_complex] -->
 <div id="map"></div>
-<!-- [END maps_polyline_complex_html_body] -->
+<!-- [END maps_polyline_complex] -->
 {% endblock %}
diff --git a/samples/polyline-complex/src/style.scss b/samples/polyline-complex/src/style.scss
index d83bcc47ab..a0308502ee 100644
--- a/samples/polyline-complex/src/style.scss
+++ b/samples/polyline-complex/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polyline_complex_css] */
+/*! [START maps_polyline_complex] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polyline_complex_css] */
+/*! [END maps_polyline_complex] */
diff --git a/samples/polyline-remove/src/index.js b/samples/polyline-remove/src/index.js
index 5bbf63626b..381b33effa 100644
--- a/samples/polyline-remove/src/index.js
+++ b/samples/polyline-remove/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polyline_remove_script_body]
+// [START maps_polyline_remove]
 // This example adds a UI control allowing users to remove the polyline from the
 // map.
 
@@ -52,4 +52,4 @@ export function addLine() {
 export function removeLine() {
   flightPath.setMap(null);
 }
-// [END maps_polyline_remove_script_body]
+// [END maps_polyline_remove]
diff --git a/samples/polyline-remove/src/index.njk b/samples/polyline-remove/src/index.njk
index 55d6504460..186d5bac22 100644
--- a/samples/polyline-remove/src/index.njk
+++ b/samples/polyline-remove/src/index.njk
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polyline_remove_html_body] -->
+<!-- [START maps_polyline_remove] -->
 <div id="floating-panel">
   <input onclick="removeLine();" type="button" value="Remove line" />
   <input onclick="addLine();" type="button" value="Restore line" />
 </div>
 <div id="map"></div>
-<!-- [END maps_polyline_remove_html_body] -->
+<!-- [END maps_polyline_remove] -->
 {% endblock %}
diff --git a/samples/polyline-remove/src/style.scss b/samples/polyline-remove/src/style.scss
index b0b107a3fa..38f4a06fd2 100644
--- a/samples/polyline-remove/src/style.scss
+++ b/samples/polyline-remove/src/style.scss
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-/*! [START maps_polyline_remove_css] */
+/*! [START maps_polyline_remove] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
-/*! [END maps_polyline_remove_css] */
+/*! [END maps_polyline_remove] */
diff --git a/samples/polyline-simple/src/index.js b/samples/polyline-simple/src/index.js
index b94005bb88..169982dda1 100644
--- a/samples/polyline-simple/src/index.js
+++ b/samples/polyline-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_polyline_simple_script_body]
+// [START maps_polyline_simple]
 // This example creates a 2-pixel-wide red polyline showing the path of
 // the first trans-Pacific flight between Oakland, CA, and Brisbane,
 // Australia which was made by Charles Kingsford Smith.
@@ -42,4 +42,4 @@ export function initMap() {
 
   flightPath.setMap(map);
 }
-// [END maps_polyline_simple_script_body]
+// [END maps_polyline_simple]
diff --git a/samples/polyline-simple/src/index.njk b/samples/polyline-simple/src/index.njk
index 3d693b2c22..53b6ab0a58 100644
--- a/samples/polyline-simple/src/index.njk
+++ b/samples/polyline-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_polyline_simple_html_body] -->
+<!-- [START maps_polyline_simple] -->
 <div id="map"></div>
-<!-- [END maps_polyline_simple_html_body] -->
+<!-- [END maps_polyline_simple] -->
 {% endblock %}
diff --git a/samples/polyline-simple/src/style.scss b/samples/polyline-simple/src/style.scss
index 41e499ba4e..36902be386 100644
--- a/samples/polyline-simple/src/style.scss
+++ b/samples/polyline-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_polyline_simple_css] */
+/*! [START maps_polyline_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_polyline_simple_css] */
+/*! [END maps_polyline_simple] */
diff --git a/samples/rectangle-event/src/index.js b/samples/rectangle-event/src/index.js
index 2f5da6d758..9afa816f59 100644
--- a/samples/rectangle-event/src/index.js
+++ b/samples/rectangle-event/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_rectangle_event_script_body]
+// [START maps_rectangle_event]
 // This example adds a user-editable rectangle to the map.
 // When the user changes the bounds of the rectangle,
 // an info window pops up displaying the new bounds.
@@ -76,4 +76,4 @@ export function showNewRect(event) {
 
   infoWindow.open(map);
 }
-// [END maps_rectangle_event_script_body]
+// [END maps_rectangle_event]
diff --git a/samples/rectangle-event/src/index.njk b/samples/rectangle-event/src/index.njk
index 5d762a2ded..10bd26be11 100644
--- a/samples/rectangle-event/src/index.njk
+++ b/samples/rectangle-event/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_rectangle_event_html_body] -->
+<!-- [START maps_rectangle_event] -->
 <div id="map"></div>
-<!-- [END maps_rectangle_event_html_body] -->
+<!-- [END maps_rectangle_event] -->
 {% endblock %}
diff --git a/samples/rectangle-event/src/style.scss b/samples/rectangle-event/src/style.scss
index d72fd639a0..a34b95b9ac 100644
--- a/samples/rectangle-event/src/style.scss
+++ b/samples/rectangle-event/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_rectangle_event_css] */
+/*! [START maps_rectangle_event] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_rectangle_event_css] */
+/*! [END maps_rectangle_event] */
diff --git a/samples/rectangle-simple/src/index.js b/samples/rectangle-simple/src/index.js
index 9453635561..475b804f1c 100644
--- a/samples/rectangle-simple/src/index.js
+++ b/samples/rectangle-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_rectangle_simple_script_body]
+// [START maps_rectangle_simple]
 // This example adds a red rectangle to a map.
 
 export function initMap() {
@@ -39,4 +39,4 @@ export function initMap() {
     }
   });
 }
-// [END maps_rectangle_simple_script_body]
+// [END maps_rectangle_simple]
diff --git a/samples/rectangle-simple/src/index.njk b/samples/rectangle-simple/src/index.njk
index 1bc068fff9..9ba3427015 100644
--- a/samples/rectangle-simple/src/index.njk
+++ b/samples/rectangle-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_rectangle_simple_html_body] -->
+<!-- [START maps_rectangle_simple] -->
 <div id="map"></div>
-<!-- [END maps_rectangle_simple_html_body] -->
+<!-- [END maps_rectangle_simple] -->
 {% endblock %}
diff --git a/samples/rectangle-simple/src/style.scss b/samples/rectangle-simple/src/style.scss
index ad60dff7bc..a182ded639 100644
--- a/samples/rectangle-simple/src/style.scss
+++ b/samples/rectangle-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_rectangle_simple_css] */
+/*! [START maps_rectangle_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_rectangle_simple_css] */
+/*! [END maps_rectangle_simple] */
diff --git a/samples/rectangle-zoom/src/index.js b/samples/rectangle-zoom/src/index.js
index d2b58e845a..4a0e0a08fb 100644
--- a/samples/rectangle-zoom/src/index.js
+++ b/samples/rectangle-zoom/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_rectangle_zoom_script_body]
+// [START maps_rectangle_zoom]
 // This example creates a rectangle based on the viewport
 // on any 'zoom-changed' event.
 
@@ -40,4 +40,4 @@ export function initMap() {
     });
   });
 }
-// [END maps_rectangle_zoom_script_body]
+// [END maps_rectangle_zoom]
diff --git a/samples/rectangle-zoom/src/index.njk b/samples/rectangle-zoom/src/index.njk
index 65d01076e9..5672690806 100644
--- a/samples/rectangle-zoom/src/index.njk
+++ b/samples/rectangle-zoom/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_rectangle_zoom_html_body] -->
+<!-- [START maps_rectangle_zoom] -->
 <div id="map"></div>
-<!-- [END maps_rectangle_zoom_html_body] -->
+<!-- [END maps_rectangle_zoom] -->
 {% endblock %}
diff --git a/samples/rectangle-zoom/src/style.scss b/samples/rectangle-zoom/src/style.scss
index d099254b7d..2e82fbea9b 100644
--- a/samples/rectangle-zoom/src/style.scss
+++ b/samples/rectangle-zoom/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_rectangle_zoom_css] */
+/*! [START maps_rectangle_zoom] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_rectangle_zoom_css] */
+/*! [END maps_rectangle_zoom] */
diff --git a/samples/streetview-controls/src/index.js b/samples/streetview-controls/src/index.js
index 0076f7d09c..028c12b384 100644
--- a/samples/streetview-controls/src/index.js
+++ b/samples/streetview-controls/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_controls_script_body]
+// [START maps_streetview_controls]
 export function initPano() {
   // Note: constructed panorama objects have visible: true
   // set by default.
@@ -31,4 +31,4 @@ export function initPano() {
     }
   );
 }
-// [END maps_streetview_controls_script_body]
+// [END maps_streetview_controls]
diff --git a/samples/streetview-controls/src/index.njk b/samples/streetview-controls/src/index.njk
index d4a3e23a1d..f718dfed30 100644
--- a/samples/streetview-controls/src/index.njk
+++ b/samples/streetview-controls/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_controls_html_body] -->
+<!-- [START maps_streetview_controls] -->
 <div id="map"></div>
-<!-- [END maps_streetview_controls_html_body] -->
+<!-- [END maps_streetview_controls] -->
 {% endblock %}
diff --git a/samples/streetview-controls/src/style.scss b/samples/streetview-controls/src/style.scss
index 8177fb27d8..1ebf69b205 100644
--- a/samples/streetview-controls/src/style.scss
+++ b/samples/streetview-controls/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_streetview_controls_css] */
+/*! [START maps_streetview_controls] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_streetview_controls_css] */
+/*! [END maps_streetview_controls] */
diff --git a/samples/streetview-custom-simple/src/index.js b/samples/streetview-custom-simple/src/index.js
index 8245942f04..71f7b67ff7 100644
--- a/samples/streetview-custom-simple/src/index.js
+++ b/samples/streetview-custom-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_custom_simple_script_body]
+// [START maps_streetview_custom_simple]
 export function initPano() {
   // Set up Street View and initially set it visible. Register the
   // custom panorama provider function. Set the StreetView to display
@@ -64,4 +64,4 @@ export function getCustomPanorama(pano) {
     };
   }
 }
-// [END maps_streetview_custom_simple_script_body]
+// [END maps_streetview_custom_simple]
diff --git a/samples/streetview-custom-simple/src/index.njk b/samples/streetview-custom-simple/src/index.njk
index 34f34457e0..8a836e2fd5 100644
--- a/samples/streetview-custom-simple/src/index.njk
+++ b/samples/streetview-custom-simple/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_custom_simple_html_body] -->
+<!-- [START maps_streetview_custom_simple] -->
 <div id="map"></div>
-<!-- [END maps_streetview_custom_simple_html_body] -->
+<!-- [END maps_streetview_custom_simple] -->
 {% endblock %}
diff --git a/samples/streetview-custom-simple/src/style.scss b/samples/streetview-custom-simple/src/style.scss
index b4d1ed4725..3d642408e1 100644
--- a/samples/streetview-custom-simple/src/style.scss
+++ b/samples/streetview-custom-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_streetview_custom_simple_css] */
+/*! [START maps_streetview_custom_simple] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_streetview_custom_simple_css] */
+/*! [END maps_streetview_custom_simple] */
diff --git a/samples/streetview-custom-tiles/src/index.js b/samples/streetview-custom-tiles/src/index.js
index 292ac78756..2b0a7a0f8e 100644
--- a/samples/streetview-custom-tiles/src/index.js
+++ b/samples/streetview-custom-tiles/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_custom_tiles_script_body]
+// [START maps_streetview_custom_tiles]
 export var panorama;
 
 // StreetViewPanoramaData of a panorama just outside the Google Sydney office.
@@ -95,4 +95,4 @@ export function initMap() {
     }
   );
 }
-// [END maps_streetview_custom_tiles_script_body]
+// [END maps_streetview_custom_tiles]
diff --git a/samples/streetview-custom-tiles/src/index.njk b/samples/streetview-custom-tiles/src/index.njk
index 4378f63c4c..6821731891 100644
--- a/samples/streetview-custom-tiles/src/index.njk
+++ b/samples/streetview-custom-tiles/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_custom_tiles_html_body] -->
+<!-- [START maps_streetview_custom_tiles] -->
 <div id="street-view"></div>
-<!-- [END maps_streetview_custom_tiles_html_body] -->
+<!-- [END maps_streetview_custom_tiles] -->
 {% endblock %}
diff --git a/samples/streetview-custom-tiles/src/style.scss b/samples/streetview-custom-tiles/src/style.scss
index 62c276d1d6..9cac22cb9f 100644
--- a/samples/streetview-custom-tiles/src/style.scss
+++ b/samples/streetview-custom-tiles/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_streetview_custom_tiles_css] */
+/* [START maps_streetview_custom_tiles] */
 
 html,
 body {
@@ -25,4 +25,4 @@ body {
 #street-view {
   height: 100%;
 }
-/* [END maps_streetview_custom_tiles_css] */
+/* [END maps_streetview_custom_tiles] */
diff --git a/samples/streetview-embed/src/index.js b/samples/streetview-embed/src/index.js
index 734b3de2a7..3d03b677cb 100644
--- a/samples/streetview-embed/src/index.js
+++ b/samples/streetview-embed/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_embed_script_body]
+// [START maps_streetview_embed]
 export var panorama;
 export function initialize() {
   panorama = new google.maps.StreetViewPanorama(
@@ -26,4 +26,4 @@ export function initialize() {
     }
   );
 }
-// [END maps_streetview_embed_script_body]
+// [END maps_streetview_embed]
diff --git a/samples/streetview-embed/src/index.njk b/samples/streetview-embed/src/index.njk
index 39abc9354b..71b1f2a9c9 100644
--- a/samples/streetview-embed/src/index.njk
+++ b/samples/streetview-embed/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_embed_html_body] -->
+<!-- [START maps_streetview_embed] -->
 <div id="street-view"></div>
-<!-- [END maps_streetview_embed_html_body] -->
+<!-- [END maps_streetview_embed] -->
 {% endblock %}
diff --git a/samples/streetview-embed/src/style.scss b/samples/streetview-embed/src/style.scss
index 2d846024a6..ebaa9a6c1f 100644
--- a/samples/streetview-embed/src/style.scss
+++ b/samples/streetview-embed/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_streetview_embed_css] */
+/* [START maps_streetview_embed] */
 
 html,
 body {
@@ -25,4 +25,4 @@ body {
 #street-view {
   height: 100%;
 }
-/* [END maps_streetview_embed_css] */
+/* [END maps_streetview_embed] */
diff --git a/samples/streetview-events/src/index.js b/samples/streetview-events/src/index.js
index de73c518c7..d1c8edb1c4 100644
--- a/samples/streetview-events/src/index.js
+++ b/samples/streetview-events/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_events_script_body]
+// [START maps_streetview_events]
 export function initPano() {
   var panorama = new google.maps.StreetViewPanorama(
     document.getElementById("pano"),
@@ -63,4 +63,4 @@ export function initPano() {
     pitchCell.firstChild.nodeValue = panorama.getPov().pitch + "";
   });
 }
-// [END maps_streetview_events_script_body]
+// [END maps_streetview_events]
diff --git a/samples/streetview-events/src/index.njk b/samples/streetview-events/src/index.njk
index d44f00a154..9ba96a71bc 100644
--- a/samples/streetview-events/src/index.njk
+++ b/samples/streetview-events/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_events_html_body] -->
+<!-- [START maps_streetview_events] -->
 <div id="pano"></div>
 <div id="floating-panel">
   <table>
@@ -37,5 +37,5 @@ limitations under the License.
     <table id="links_table"></table>
   </table>
 </div>
-<!-- [END maps_streetview_events_html_body] -->
+<!-- [END maps_streetview_events] -->
 {% endblock %}
diff --git a/samples/streetview-events/src/style.scss b/samples/streetview-events/src/style.scss
index a209fc3c31..7d1c3b0c18 100644
--- a/samples/streetview-events/src/style.scss
+++ b/samples/streetview-events/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_streetview_events_css] */
+/* [START maps_streetview_events] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
@@ -32,4 +32,4 @@
   position: static;
   border: 0px solid #999;
 }
-/* [END maps_streetview_events_css] */
+/* [END maps_streetview_events] */
diff --git a/samples/streetview-overlays/src/index.js b/samples/streetview-overlays/src/index.js
index 5afb040a5d..341586a0ff 100644
--- a/samples/streetview-overlays/src/index.js
+++ b/samples/streetview-overlays/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_overlays_script_body]
+// [START maps_streetview_overlays]
 export var panorama;
 
 export function initMap() {
@@ -72,4 +72,4 @@ export function toggleStreetView() {
     panorama.setVisible(false);
   }
 }
-// [END maps_streetview_overlays_script_body]
+// [END maps_streetview_overlays]
diff --git a/samples/streetview-overlays/src/index.njk b/samples/streetview-overlays/src/index.njk
index 45902658a3..66557478a9 100644
--- a/samples/streetview-overlays/src/index.njk
+++ b/samples/streetview-overlays/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_overlays_html_body] -->
+<!-- [START maps_streetview_overlays] -->
 <div id="floating-panel">
   <input
     type="button"
@@ -23,5 +23,5 @@ limitations under the License.
   />
 </div>
 <div id="map"></div>
-<!-- [END maps_streetview_overlays_html_body] -->
+<!-- [END maps_streetview_overlays] -->
 {% endblock %}
diff --git a/samples/streetview-overlays/src/style.scss b/samples/streetview-overlays/src/style.scss
index 7404c3ad8b..4a8e890b17 100644
--- a/samples/streetview-overlays/src/style.scss
+++ b/samples/streetview-overlays/src/style.scss
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-/* [START maps_streetview_overlays_css] */
+/* [START maps_streetview_overlays] */
 @import "../../../shared/scss/default.scss";
 @import "../../../shared/scss/floating-panel.scss";
 
 #floating-panel {
   margin-left: -100px;
 }
-/* [END maps_streetview_overlays_css] */
+/* [END maps_streetview_overlays] */
diff --git a/samples/streetview-service/src/index.js b/samples/streetview-service/src/index.js
index 45e8fcf1a1..bd709472d7 100755
--- a/samples/streetview-service/src/index.js
+++ b/samples/streetview-service/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_service_script_body]
+// [START maps_streetview_service]
 /*
  * Click the map to set a new location for the Street View camera.
  */
@@ -77,4 +77,4 @@ export function processSVData(data, status) {
     console.error("Street View data not found for this location.");
   }
 }
-// [END maps_streetview_service_script_body]
+// [END maps_streetview_service]
diff --git a/samples/streetview-service/src/index.njk b/samples/streetview-service/src/index.njk
index d6258b65c8..ee32825e54 100644
--- a/samples/streetview-service/src/index.njk
+++ b/samples/streetview-service/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_service_html_body] -->
+<!-- [START maps_streetview_service] -->
 <div id="map" style="width: 45%; height: 100%;float:left"></div>
 <div id="pano" style="width: 45%; height: 100%;float:left"></div>
-<!-- [END maps_streetview_service_html_body] -->
+<!-- [END maps_streetview_service] -->
 {% endblock %}
diff --git a/samples/streetview-service/src/style.scss b/samples/streetview-service/src/style.scss
index fde9bc99c7..fae67beb4f 100644
--- a/samples/streetview-service/src/style.scss
+++ b/samples/streetview-service/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_streetview_service_css] */
+/*! [START maps_streetview_service] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_streetview_service_css] */
+/*! [END maps_streetview_service] */
diff --git a/samples/streetview-simple/src/index.js b/samples/streetview-simple/src/index.js
index abea58906c..a1084f9669 100644
--- a/samples/streetview-simple/src/index.js
+++ b/samples/streetview-simple/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_streetview_simple_script_body]
+// [START maps_streetview_simple]
 export function initialize() {
   var fenway = { lat: 42.345573, lng: -71.098326 };
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -33,4 +33,4 @@ export function initialize() {
   );
   map.setStreetView(panorama);
 }
-// [END maps_streetview_simple_script_body]
+// [END maps_streetview_simple]
diff --git a/samples/streetview-simple/src/index.njk b/samples/streetview-simple/src/index.njk
index 9e860701c6..bf821ae633 100644
--- a/samples/streetview-simple/src/index.njk
+++ b/samples/streetview-simple/src/index.njk
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_streetview_simple_html_body] -->
+<!-- [START maps_streetview_simple] -->
 <div id="map"></div>
 <div id="pano"></div>
-<!-- [END maps_streetview_simple_html_body] -->
+<!-- [END maps_streetview_simple] -->
 {% endblock %}
diff --git a/samples/streetview-simple/src/style.scss b/samples/streetview-simple/src/style.scss
index 54327b7c9d..7d16ec9442 100644
--- a/samples/streetview-simple/src/style.scss
+++ b/samples/streetview-simple/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_streetview_simple_css] */
+/* [START maps_streetview_simple] */
 
 html,
 body {
@@ -28,4 +28,4 @@ body {
   height: 100%;
   width: 50%;
 }
-/* [END maps_streetview_simple_css] */
+/* [END maps_streetview_simple] */
diff --git a/samples/style-array/src/index.js b/samples/style-array/src/index.js
index 1036520d06..ca089271a9 100644
--- a/samples/style-array/src/index.js
+++ b/samples/style-array/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_style_array_script_body]
+// [START maps_style_array]
 export function initMap() {
   // Styles a map in night mode.
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -102,4 +102,4 @@ export function initMap() {
     ]
   });
 }
-// [END maps_style_array_script_body]
+// [END maps_style_array]
diff --git a/samples/style-array/src/index.njk b/samples/style-array/src/index.njk
index f1d478931d..4bac5003d9 100644
--- a/samples/style-array/src/index.njk
+++ b/samples/style-array/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_style_array_html_body] -->
+<!-- [START maps_style_array] -->
 <div id="map"></div>
-<!-- [END maps_style_array_html_body] -->
+<!-- [END maps_style_array] -->
 {% endblock %}
diff --git a/samples/style-array/src/style.scss b/samples/style-array/src/style.scss
index 897378422a..7eb7d22675 100644
--- a/samples/style-array/src/style.scss
+++ b/samples/style-array/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_style_array_css] */
+/*! [START maps_style_array] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_style_array_css] */
+/*! [END maps_style_array] */
diff --git a/samples/style-selector/src/index.js b/samples/style-selector/src/index.js
index 8aa2e97268..94f3dfcbee 100644
--- a/samples/style-selector/src/index.js
+++ b/samples/style-selector/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_style_selector_script_body]
+// [START maps_style_selector]
 export var map;
 export function initMap() {
   // Create the map with no initial style specified.
@@ -335,4 +335,4 @@ export var styles = {
   ]
 };
 
-// [END maps_style_selector_script_body]
+// [END maps_style_selector]
diff --git a/samples/style-selector/src/index.njk b/samples/style-selector/src/index.njk
index 5143332c19..723c7ed70e 100644
--- a/samples/style-selector/src/index.njk
+++ b/samples/style-selector/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_style_selector_html_body] -->
+<!-- [START maps_style_selector] -->
 <div id="style-selector-control" class="map-control">
   <select id="style-selector" class="selector-control">
     <option value="default">Default</option>
@@ -25,6 +25,6 @@ limitations under the License.
   </select>
 </div>
 <div id="map"></div>
-<!-- [END maps_style_selector_html_body] -->
+<!-- [END maps_style_selector] -->
 
 {% endblock %}
diff --git a/samples/style-selector/src/style.scss b/samples/style-selector/src/style.scss
index c920b9f436..a7e42d7545 100644
--- a/samples/style-selector/src/style.scss
+++ b/samples/style-selector/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* [START maps_style_selector_css] */
+/* [START maps_style_selector] */
 @import "../../../shared/scss/default.scss";
 
 .map-control {
@@ -38,4 +38,4 @@
   padding-left: 5px;
   padding-right: 5px;
 }
-/* [END maps_style_selector_css] */
+/* [END maps_style_selector] */
diff --git a/samples/user-editable-shapes/src/index.js b/samples/user-editable-shapes/src/index.js
index 2d6e6b4e76..fdcbc804ad 100644
--- a/samples/user-editable-shapes/src/index.js
+++ b/samples/user-editable-shapes/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-// [START maps_user_editable_shapes_script_body]
+// [START maps_user_editable_shapes]
 // This example adds a user-editable rectangle to the map.
 export function initMap() {
   var map = new google.maps.Map(document.getElementById("map"), {
@@ -38,4 +38,4 @@ export function initMap() {
   // [END region_rectangle]
   rectangle.setMap(map);
 }
-// [END maps_user_editable_shapes_script_body]
+// [END maps_user_editable_shapes]
diff --git a/samples/user-editable-shapes/src/index.njk b/samples/user-editable-shapes/src/index.njk
index 4c5ca3774d..74bb3df987 100644
--- a/samples/user-editable-shapes/src/index.njk
+++ b/samples/user-editable-shapes/src/index.njk
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 {% extends '../../../shared/layout.njk'%} {% block html %}
-<!-- [START maps_user_editable_shapes_html_body] -->
+<!-- [START maps_user_editable_shapes] -->
 <div id="map"></div>
-<!-- [END maps_user_editable_shapes_html_body] -->
+<!-- [END maps_user_editable_shapes] -->
 {% endblock %}
diff --git a/samples/user-editable-shapes/src/style.scss b/samples/user-editable-shapes/src/style.scss
index 4e1e2b8ed3..9a2a10bce9 100644
--- a/samples/user-editable-shapes/src/style.scss
+++ b/samples/user-editable-shapes/src/style.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/*! [START maps_user_editable_shapes_css] */
+/*! [START maps_user_editable_shapes] */
 @import "../../../shared/scss/default.scss";
 
-/*! [END maps_user_editable_shapes_css] */
+/*! [END maps_user_editable_shapes] */