diff --git a/samples/advanced-markers-draggable/index.ts b/samples/advanced-markers-draggable/index.ts
index 284325ede..9258a1021 100644
--- a/samples/advanced-markers-draggable/index.ts
+++ b/samples/advanced-markers-draggable/index.ts
@@ -25,7 +25,7 @@ async function init() {
     mapElement.append(draggableMarker);
     // [END maps_advanced_markers_draggable_marker]
 
-    draggableMarker.addListener('dragend', () => {
+    draggableMarker.addEventListener('gmp-dragend', () => {
         const position = draggableMarker.position!;
         infoWindow.close();
         infoWindow.setContent(`Pin dropped at: ${JSON.stringify(position)}`);
diff --git a/samples/advanced-markers-html/index.ts b/samples/advanced-markers-html/index.ts
index 91d55dbd0..6be164a4e 100644
--- a/samples/advanced-markers-html/index.ts
+++ b/samples/advanced-markers-html/index.ts
@@ -28,7 +28,7 @@ async function init() {
             title: property.description,
         });
 
-        advancedMarkerElement.addListener('click', () => {
+        advancedMarkerElement.addEventListener('gmp-click', () => {
             toggleHighlight(advancedMarkerElement);
         });
     }
diff --git a/samples/ai-powered-summaries-basic/index.ts b/samples/ai-powered-summaries-basic/index.ts
index 9dc0888bb..72550cbfc 100644
--- a/samples/ai-powered-summaries-basic/index.ts
+++ b/samples/ai-powered-summaries-basic/index.ts
@@ -84,7 +84,7 @@ async function getPlaceDetails() {
     innerMap.setCenter(place.location!);
 
     // Handle marker click.
-    marker.addListener('gmp-click', () => {
+    marker.addEventListener('gmp-click', () => {
         showInfoWindow(marker, place, content);
     });
 
diff --git a/samples/event-closure/index.ts b/samples/event-closure/index.ts
index cdfc63c40..abe531134 100644
--- a/samples/event-closure/index.ts
+++ b/samples/event-closure/index.ts
@@ -58,7 +58,7 @@ async function attachSecretMessage(
         content: secretMessage,
     });
 
-    marker.addListener('gmp-click', () => {
+    marker.addEventListener('gmp-click', () => {
         infoWindow.open(marker.map, marker);
     });
 }
diff --git a/samples/place-nearby-search/index.ts b/samples/place-nearby-search/index.ts
index 1c1283e8c..15912b73b 100644
--- a/samples/place-nearby-search/index.ts
+++ b/samples/place-nearby-search/index.ts
@@ -110,7 +110,7 @@ async function nearbySearch() {
                 content.appendChild(link);
             }
 
-            marker.addListener('gmp-click', () => {
+            marker.addEventListener('gmp-click', () => {
                 innerMap.panTo(place.location!);
                 updateInfoWindow(place.displayName!, content, marker);
             });
diff --git a/samples/place-text-search/index.ts b/samples/place-text-search/index.ts
index 416ca1188..a391f01ea 100644
--- a/samples/place-text-search/index.ts
+++ b/samples/place-text-search/index.ts
@@ -85,7 +85,7 @@ async function findPlaces(query: string) {
             });
             markers[place.id] = marker;
 
-            marker.addListener('gmp-click', () => {
+            marker.addEventListener('gmp-click', () => {
                 map.panTo(place.location!);
                 updateInfoWindow(place.displayName!, place.id, marker);
             });
diff --git a/samples/polyline-utility/index.ts b/samples/polyline-utility/index.ts
index be9fc94f6..3a67e1472 100644
--- a/samples/polyline-utility/index.ts
+++ b/samples/polyline-utility/index.ts
@@ -3,7 +3,7 @@ async function init(): Promise<void> {
     const [
         { Polyline },
         { AdvancedMarkerElement },
-        { LatLng, LatLngBounds, event },
+        { LatLng, LatLngBounds },
         { PlaceAutocompleteElement },
         geometryLibrary,
     ] = await Promise.all([
@@ -112,9 +112,7 @@ async function init(): Promise<void> {
             gmpDraggable: true,
         });
 
-        marker.addListener('dragend', () => {
-            rebuildPathFromMarkers();
-        });
+        marker.addEventListener('gmp-dragend', rebuildPathFromMarkers);
 
         markers.push(marker);
         updateOutputs();
@@ -133,7 +131,10 @@ async function init(): Promise<void> {
 
     function removePoint(index: number) {
         if (index >= 0 && index < markers.length) {
-            event.clearInstanceListeners(markers[index]);
+            markers[index].removeEventListener(
+                'gmp-dragend',
+                rebuildPathFromMarkers
+            );
             markers[index].map = null;
             markers.splice(index, 1);
             rebuildPathFromMarkers();
@@ -142,7 +143,7 @@ async function init(): Promise<void> {
 
     function clearAll() {
         markers.forEach((m) => {
-            event.clearInstanceListeners(m);
+            m.removeEventListener('gmp-dragend', rebuildPathFromMarkers);
             m.map = null;
         });
         markers = [];
diff --git a/samples/ui-kit-advanced-place-search-nearby/index.ts b/samples/ui-kit-advanced-place-search-nearby/index.ts
index 287295a08..5857221d7 100644
--- a/samples/ui-kit-advanced-place-search-nearby/index.ts
+++ b/samples/ui-kit-advanced-place-search-nearby/index.ts
@@ -121,7 +121,7 @@ async function addMarkers() {
         markers.set(place.id, marker);
         bounds.extend(place.location);
 
-        marker.addListener('click', () => {
+        marker.addEventListener('gmp-click', () => {
             placeRequest.place = place;
             infoWindow.open(map.innerMap, marker);
         });
diff --git a/samples/ui-kit-advanced-place-search-text/index.ts b/samples/ui-kit-advanced-place-search-text/index.ts
index 1d16690fc..b9babe62c 100644
--- a/samples/ui-kit-advanced-place-search-text/index.ts
+++ b/samples/ui-kit-advanced-place-search-text/index.ts
@@ -128,7 +128,7 @@ async function addMarkers() {
         markers.set(place.id, marker);
         bounds.extend(place.location);
 
-        marker.addListener('click', () => {
+        marker.addEventListener('gmp-click', () => {
             placeRequest.place = place;
             infoWindow.open(map.innerMap, marker);
         });
diff --git a/samples/ui-kit-place-search-nearby/index.ts b/samples/ui-kit-place-search-nearby/index.ts
index 61dc39066..712784389 100644
--- a/samples/ui-kit-place-search-nearby/index.ts
+++ b/samples/ui-kit-place-search-nearby/index.ts
@@ -106,7 +106,7 @@ async function addMarkers() {
         markers.set(place.id, marker);
         bounds.extend(place.location);
 
-        marker.addListener('click', () => {
+        marker.addEventListener('gmp-click', () => {
             placeRequest.place = place;
             infoWindow.open(map.innerMap, marker);
         });
diff --git a/samples/ui-kit-place-search-text/index.ts b/samples/ui-kit-place-search-text/index.ts
index 28325a12f..2ec024019 100644
--- a/samples/ui-kit-place-search-text/index.ts
+++ b/samples/ui-kit-place-search-text/index.ts
@@ -116,7 +116,7 @@ async function addMarkers() {
         markers.set(place.id, marker);
         bounds.extend(place.location);
 
-        marker.addListener('click', () => {
+        marker.addEventListener('gmp-click', () => {
             placeRequest.place = place;
             infoWindow.open(map.innerMap, marker);
         });