diff --git a/appengine/standard/modules/main.py b/appengine/standard/modules/main.py
index 61ba8c4aa73..9934efaf400 100644
--- a/appengine/standard/modules/main.py
+++ b/appengine/standard/modules/main.py
@@ -19,25 +19,23 @@
 
 import urllib2
 
-# [START modules_import]
+# [START gae_standard_modules_import]
 from google.appengine.api import modules
+# [END gae_standard_modules_import]
 
-# [END modules_import]
 import webapp2
 
 
 class GetModuleInfoHandler(webapp2.RequestHandler):
     def get(self):
-        # [START module_info]
         module = modules.get_current_module_name()
         instance_id = modules.get_current_instance_id()
         self.response.write("module_id={}&instance_id={}".format(module, instance_id))
-        # [END module_info]
 
 
 class GetBackendHandler(webapp2.RequestHandler):
     def get(self):
-        # [START access_another_module]
+        # [START gae_standard_modules_access_another_module]
         backend_hostname = modules.get_hostname(module="my-backend")
         url = "http://{}/".format(backend_hostname)
         try:
@@ -45,7 +43,7 @@ def get(self):
             self.response.write("Got response {}".format(result))
         except urllib2.URLError:
             pass
-        # [END access_another_module]
+        # [END gae_standard_modules_access_another_module]
 
 
 app = webapp2.WSGIApplication(