diff --git a/appengine-java8/cloudsql-postgres/pom.xml b/appengine-java8/cloudsql-postgres/pom.xml
index af43b249873..34b1de98412 100644
--- a/appengine-java8/cloudsql-postgres/pom.xml
+++ b/appengine-java8/cloudsql-postgres/pom.xml
@@ -69,7 +69,7 @@
       <version>1.27.0</version>
     </dependency>
 
-    <!-- [START dependencies] -->
+    <!-- [START gae_java8_postgres_dependencies] -->
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
@@ -81,14 +81,14 @@
       <artifactId>postgres-socket-factory</artifactId>
       <version>1.0.11</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_java8_postgres_dependencies] -->
   </dependencies>
 
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <!-- [START plugins] -->
+      <!-- [START gae_java8_postgres_plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -114,7 +114,7 @@
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
-      <!-- [END plugins] -->
+      <!-- [END gae_java8_postgres_plugins] -->
     </plugins>
   </build>
 </project>
diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml
index 3520c3f3f27..dcd50e5ccb7 100644
--- a/appengine-java8/cloudsql/pom.xml
+++ b/appengine-java8/cloudsql/pom.xml
@@ -71,7 +71,7 @@
       <version>1.27.0</version>
     </dependency>
 
-    <!-- [START dependencies] -->
+    <!-- [START gae_java8_mysql_dependencies] -->
     <dependency> <!-- Only used locally -->
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -82,13 +82,13 @@
       <artifactId>mysql-socket-factory</artifactId>
       <version>1.0.11</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_java8_mysql_dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <!-- [START plugins] -->
+      <!-- [START gae_java8_mysql_plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -114,7 +114,7 @@
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
-      <!-- [END plugins] -->
+      <!-- [END gae_java8_mysql_plugins] -->
     </plugins>
   </build>
 </project>
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
index f821d696c37..2a1b91684b6 100644
--- a/appengine/cloudsql/pom.xml
+++ b/appengine/cloudsql/pom.xml
@@ -30,7 +30,7 @@
     <version>1.0.9</version>
   </parent>
 
-  <!-- [START properties] -->
+  <!-- [START gae_java_mysql_properties] -->
   <properties>
 <!-- INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
      or gcloud sql instances describe <instance>
@@ -48,7 +48,7 @@
     <maven.compiler.source>1.7</maven.compiler.source>
 <!-- [END_EXCLUDE] -->
   </properties>
-<!-- [END properties] -->
+<!-- [END gae_java_mysql_properties] -->
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -71,7 +71,7 @@
     </dependency>
 
 
-    <!-- [START dependencies] -->
+    <!-- [START gae_java_mysql_dependencies] -->
     <dependency> <!-- ONLY USED LOCALY -->
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
@@ -82,13 +82,13 @@
       <artifactId>mysql-socket-factory</artifactId>
       <version>1.0.11</version>
     </dependency>
-    <!-- [END dependencies] -->
+    <!-- [END gae_java_mysql_dependencies] -->
   </dependencies>
   <build>
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <!-- [START plugins] -->
+      <!-- [START gae_java_mysql_plugins] -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -114,7 +114,7 @@
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
         </configuration>
       </plugin>
-      <!-- [END plugins] -->
+      <!-- [END gae_java_mysql_plugins] -->
     </plugins>
   </build>
 </project>