diff --git a/examples/nav-with-service-worker.html b/examples/nav-with-service-worker.html
index 6d5184d..185f851 100644
--- a/examples/nav-with-service-worker.html
+++ b/examples/nav-with-service-worker.html
@@ -10,7 +10,7 @@
     </nav>
   </header>
   <main>
-    <div id="content" marker="content"><?start>Loading...</div>
+    <div id="content"><?start name="content">Loading...</div>
   </main>
 </body>
 <script>
diff --git a/examples/out-of-order-streaming-range.html b/examples/out-of-order-streaming-range.html
index 22f46cf..a60dbdb 100644
--- a/examples/out-of-order-streaming-range.html
+++ b/examples/out-of-order-streaming-range.html
@@ -10,11 +10,11 @@
     <h1>Out of order streaming with start/end markers</h1>
 
     <table>
-      <tbody marker="data">
+      <tbody>
         <tr>
           <td>Before</td>
         </tr>
-        <?marker>
+        <?marker name="data">
         <tr>
           <td>After</td>
         </tr>
@@ -22,7 +22,7 @@ <h1>Out of order streaming with start/end markers</h1>
     </table>
 
     <template for="data">
-      <?start>
+      <?start name="data">
       <tr>
         <td>Data</td>
       </tr>
@@ -33,7 +33,7 @@ <h1>Out of order streaming with start/end markers</h1>
       <tr>
         <td>Data 1</td>
       </tr>
-      <?marker>
+      <?marker name="data">
     </template>
 
     <template for="data">
diff --git a/examples/out-of-order-streaming.html b/examples/out-of-order-streaming.html
index 6e56056..50c71e7 100644
--- a/examples/out-of-order-streaming.html
+++ b/examples/out-of-order-streaming.html
@@ -9,11 +9,12 @@
   <body>
     <h1>Out of order streaming</h1>
 
-    <div marker="placeholder"><?start>Loading...</div>
+    <div><?start name="placeholder">Loading...</div>
 
     <template for="placeholder">
       <p>Result 1</p>
-      <?marker></template>
+      <?marker name="placeholder">
+    </template>
 
     <template for="placeholder">
       <p>Result 2</p>
diff --git a/examples/stream-html-with-out-of-order.html b/examples/stream-html-with-out-of-order.html
index 83d188d..afa1e47 100644
--- a/examples/stream-html-with-out-of-order.html
+++ b/examples/stream-html-with-out-of-order.html
@@ -8,7 +8,7 @@
   </head>
   <body>
     <h1>Stream HTML with out of order patches</h1>
-    <div id="root" marker="data"><?start>Loading...</div>
+    <div id="root"><?start name="data">Loading...</div>
 
     <script>
       const root = document.getElementById("root");
@@ -20,7 +20,7 @@ <h1>Stream HTML with out of order patches</h1>
         for (let i = 0; i < 100; ++i) {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           await writer.write(
-            `<template for=data><?start>${i}</template>`,
+            `<template for=data><?start name="data">${i}</template>`,
           );
         }
         writer.close();
diff --git a/examples/sw.js b/examples/sw.js
index 21d5253..7c69015 100644
--- a/examples/sw.js
+++ b/examples/sw.js
@@ -1,6 +1,6 @@
 self.onfetch = (e) => {
   const url = new URL(e.request.url);
   if (url.searchParams.get("page") && url.pathname === "/content") {
-    e.respondWith(new Response("<template for=content><?start>Page " + url.searchParams.get("page") + "</template>"));
+    e.respondWith(new Response("<template for=content><?start name=content>Page " + url.searchParams.get("page") + "</template>"));
   }
 };
