diff --git a/appengine-java8/twilio/pom.xml b/appengine-java8/twilio/pom.xml
index 5a505c3e1c5..97935a51fa2 100644
--- a/appengine-java8/twilio/pom.xml
+++ b/appengine-java8/twilio/pom.xml
@@ -37,13 +37,11 @@ Copyright 2015 Google Inc.
 
 
   <dependencies>
-    <!-- [START dependencies] -->
     <dependency>
       <groupId>com.twilio.sdk</groupId>
       <artifactId>twilio-java-sdk</artifactId>
       <version>6.3.0</version>
     </dependency>
-    <!-- [END dependencies] -->
 
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
index d75906550c0..918a3ce71f3 100644
--- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
+++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
 @SuppressWarnings("serial")
 public class ReceiveCallServlet extends HttpServlet {
 
@@ -44,4 +43,3 @@ public void service(HttpServletRequest req, HttpServletResponse resp)
     resp.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
index 88446602c42..0a996e6c360 100644
--- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
+++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
 @SuppressWarnings("serial")
 public class ReceiveSmsServlet extends HttpServlet {
 
@@ -48,4 +47,3 @@ public void service(HttpServletRequest request, HttpServletResponse response)
     response.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
index c5b9eb7f744..fcc40a4d9f7 100644
--- a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
+++ b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
@@ -31,7 +31,6 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
-// [START example]
 @SuppressWarnings("serial")
 public class SendSmsServlet extends HttpServlet {
 
@@ -62,4 +61,3 @@ public void service(HttpServletRequest req, HttpServletResponse resp)
     }
   }
 }
-// [END example]
diff --git a/appengine-java8/twilio/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/twilio/src/main/webapp/WEB-INF/appengine-web.xml
index 97cc58ce650..81fd237ad0e 100644
--- a/appengine-java8/twilio/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine-java8/twilio/src/main/webapp/WEB-INF/appengine-web.xml
@@ -11,7 +11,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START config] -->
+<!-- [START gae_java8_twilio_config] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java8</runtime>
   <threadsafe>true</threadsafe>
@@ -21,4 +21,4 @@
     <env-var name="TWILIO_NUMBER" value="YOUR-TWILIO-NUMBER" />
   </env-variables>
 </appengine-web-app>
-<!-- [END config] -->
+<!-- [END gae_java8_twilio_config] -->
diff --git a/appengine/twilio/pom.xml b/appengine/twilio/pom.xml
index 108d7d8692b..b149611525c 100644
--- a/appengine/twilio/pom.xml
+++ b/appengine/twilio/pom.xml
@@ -36,13 +36,13 @@ Copyright 2015 Google Inc.
   </properties>
 
   <dependencies>
-    <!-- [START dependencies] -->
+    <!-- [START gae_twilio_dependencies] -->
     <dependency>
       <groupId>com.twilio.sdk</groupId>
       <artifactId>twilio-java-sdk</artifactId>
       <version>6.3.0</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_twilio_dependencies] -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
diff --git a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
index 024d74a57c7..b9cc750e074 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
@@ -25,7 +25,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
+// [START gae_twilio_receive_call]
 @SuppressWarnings("serial")
 public class ReceiveCallServlet extends HttpServlet {
 
@@ -44,4 +44,4 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws IOE
     resp.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
+// [END gae_twilio_receive_call]
diff --git a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
index 5188f44de2d..6ae5b2b4a56 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
@@ -26,7 +26,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [START example]
+// [START gae_twilio_receive_sms]
 @SuppressWarnings("serial")
 public class ReceiveSmsServlet extends HttpServlet {
 
@@ -49,4 +49,4 @@ public void service(HttpServletRequest request, HttpServletResponse response) th
     response.getWriter().print(twiml.toXML());
   }
 }
-// [END example]
+// [END gae_twilio_receive_sms]
diff --git a/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
index 67c686999cc..1aba1063f06 100644
--- a/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
+++ b/appengine/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
@@ -31,7 +31,7 @@
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 
-// [START example]
+// [START gae_twilio_send_sms]
 @SuppressWarnings("serial")
 public class SendSmsServlet extends HttpServlet {
 
@@ -62,4 +62,4 @@ public void service(HttpServletRequest req, HttpServletResponse resp) throws IOE
     }
   }
 }
-// [END example]
+// [END gae_twilio_send_sms]
diff --git a/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
index ffb8546d95f..eea8fea7a27 100644
--- a/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/twilio/src/main/webapp/WEB-INF/appengine-web.xml
@@ -11,7 +11,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- [START config] -->
+<!-- [START gae_twilio_config] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
@@ -22,4 +22,4 @@
     <env-var name="TWILIO_NUMBER" value="YOUR-TWILIO-NUMBER" />
   </env-variables>
 </appengine-web-app>
-<!-- [END config] -->
+<!-- [END gae_twilio_config] -->
diff --git a/flexible/cloudstorage/pom.xml b/flexible/cloudstorage/pom.xml
index 4c9a39fb70b..e2ba8c2e103 100644
--- a/flexible/cloudstorage/pom.xml
+++ b/flexible/cloudstorage/pom.xml
@@ -48,13 +48,13 @@
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
-    <!-- [START dependencies] -->
+    <!-- [START gae_flex_storage_dependencies] -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
       <version>1.38.0</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_flex_storage_dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->