diff --git a/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
index 9d026e1ce..82d84abad 100644
--- a/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
index f93787fb5..dfe7ac4d5 100644
--- a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
index ca8587338..914df6906 100644
--- a/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
index bef98ba66..eb0e5a938 100644
--- a/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
index 47aa68a9a..e6070b5f0 100644
--- a/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
index 7ddffbd5d..fe8cff576 100644
--- a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
index 47a7f6edf..c6c738bae 100644
--- a/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
index de738b6cd..065d3624d 100644
--- a/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
index dc2f284d1..2cad41736 100644
--- a/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
index ab0a2ccac..361ba13e9 100644
--- a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
index a26210a8a..39bae1a9c 100644
--- a/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
index 620019593..037d5769c 100644
--- a/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
index 244c1f043..d19733cd6 100644
--- a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
index ef28324b7..4e444a23f 100644
--- a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
index 5a6ea5c8e..d99ecf96a 100644
--- a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
index 1d02a70a7..8ce6932fa 100644
--- a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
index e75dfe585..f83f825b3 100644
--- a/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml b/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
index c79f718ab..0eeb4341c 100644
--- a/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>F4_1G</instance-class>
diff --git a/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
index 136afec07..10fb323de 100644
--- a/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
index 1e48c3e22..778d623e9 100644
--- a/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
index 16cb0dd71..468720dbf 100644
--- a/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>backend</module>
+  <service>backend</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
index c5ed1090a..5a8f92fb9 100644
--- a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>default</module>
+  <service>default</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
index cde9e57a8..e3881c7ce 100644
--- a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>pubapi</module>
+  <service>pubapi</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4_1G</instance-class>
diff --git a/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
index eaa2469fd..55a950088 100644
--- a/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
 
-  <application>domain-registry</application>
-  <version>1</version>
   <runtime>java8</runtime>
-  <module>tools</module>
+  <service>tools</service>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
   <instance-class>B4</instance-class>