diff --git a/endpoints/getting-started/pom.xml b/endpoints/getting-started/pom.xml
index 9fdc7a70da5..9d79c4078b2 100644
--- a/endpoints/getting-started/pom.xml
+++ b/endpoints/getting-started/pom.xml
@@ -6,7 +6,7 @@
   <packaging>war</packaging>
   <version>1.0-SNAPSHOT</version>
   <groupId>com.example.flexible.endpoints</groupId>
-  <artifactId>managed-vms-endpoints</artifactId>
+  <artifactId>flexible-endpoints</artifactId>
 
   <parent>
     <artifactId>doc-samples</artifactId>
@@ -15,6 +15,16 @@
     <relativePath>../..</relativePath>
   </parent>
 
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
+    <appengine.maven.plugin>1.0.0</appengine.maven.plugin>
+    <jetty.maven.plugin>9.3.8.v20160314</jetty.maven.plugin>
+
+    <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -39,9 +49,8 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>0.1.2</version>
+        <version>${appengine.maven.plugin}</version>
         <configuration>
-          <gcloud_app_prefix>beta</gcloud_app_prefix>
         </configuration>
       </plugin>
       <plugin>
@@ -52,19 +61,10 @@
           <failOnMissingWebXml>false</failOnMissingWebXml>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.3.8.v20160314</version>
+        <version>${jetty.maven.plugin}</version>
       </plugin>
     </plugins>
   </build>
diff --git a/endpoints/getting-started/src/main/appengine/Dockerfile b/endpoints/getting-started/src/main/appengine/Dockerfile
index 49864ba44c8..063636ed556 100644
--- a/endpoints/getting-started/src/main/appengine/Dockerfile
+++ b/endpoints/getting-started/src/main/appengine/Dockerfile
@@ -1,4 +1,4 @@
 FROM gcr.io/google_appengine/jetty9
 
-ADD managed-vms-endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
+ADD endpoints-1.0-SNAPSHOT.war $JETTY_BASE/webapps/root.war
 ADD . /app
diff --git a/endpoints/getting-started/src/main/appengine/app.yaml b/endpoints/getting-started/src/main/appengine/app.yaml
index 6d375d8db22..5882f5a8952 100644
--- a/endpoints/getting-started/src/main/appengine/app.yaml
+++ b/endpoints/getting-started/src/main/appengine/app.yaml
@@ -1,5 +1,5 @@
 runtime: custom
-vm: true
+env: flex
 
 handlers:
 - url: /.*
diff --git a/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java b/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
index c5bc081040c..233ea414239 100644
--- a/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
+++ b/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/AuthInfoServlet.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package com.example.managedvms.endpoints;
+package com.example.endpoints;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.util.Base64;
 
 import javax.servlet.annotation.WebServlet;
@@ -25,9 +27,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-
 /**
  * A servlet that returns authentication information.
  * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
diff --git a/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/EchoServlet.java b/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
index e54da65bd43..40e0f1f5038 100644
--- a/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
+++ b/endpoints/getting-started/src/main/java/com/example/managedvms/endpoints/EchoServlet.java
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-package com.example.managedvms.endpoints;
+package com.example.endpoints;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.stream.JsonReader;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Map;
 
 import javax.servlet.annotation.WebServlet;
@@ -26,11 +29,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.stream.JsonReader;
-
 /**
  * A servlet that echoes JSON message bodies.
  */