diff --git a/appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml b/appengine/standard/endpoints-frameworks-v2/backend/app.yaml
similarity index 70%
rename from appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml
rename to appengine/standard/endpoints-frameworks-v2/backend/app.yaml
index 0ed58d006d2..bb8714d13b6 100644
--- a/appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml
+++ b/appengine/standard/endpoints-frameworks-v2/backend/app.yaml
@@ -10,18 +10,16 @@ handlers:
 libraries:
 - name: pycrypto
   version: 2.6
+- name: ssl
+  version: latest
 
 # Endpoints Frameworks 2.0 uses background threads for caching and reporting to
 # service management and service control.
 manual_scaling:
   instances: 1
 
-beta_settings:
-  use_endpoints_api_management: true
-  endpoints_swagger_spec_file: echo-v1_swagger.json
-
 env_variables:
   # Replace with your endpoints service name.
-  ENDPOINTS_SERVICE_NAME: your-service.appspot.com
+  ENDPOINTS_SERVICE_NAME: my-service.appspot.com
   # Replace with the version Id of your uploaded Endpoints service.
-  ENDPOINTS_SERVICE_VERSION: 2016-08-01r01
+  ENDPOINTS_SERVICE_VERSION: 2016-08-01r0
diff --git a/appengine/standard/endpoints-frameworks-v2.0/backend/appengine_config.py b/appengine/standard/endpoints-frameworks-v2/backend/appengine_config.py
similarity index 100%
rename from appengine/standard/endpoints-frameworks-v2.0/backend/appengine_config.py
rename to appengine/standard/endpoints-frameworks-v2/backend/appengine_config.py
diff --git a/appengine/standard/endpoints-frameworks-v2/backend/echo-v1_swagger.json b/appengine/standard/endpoints-frameworks-v2/backend/echo-v1_swagger.json
new file mode 100644
index 00000000000..b627d0d23c3
--- /dev/null
+++ b/appengine/standard/endpoints-frameworks-v2/backend/echo-v1_swagger.json
@@ -0,0 +1,76 @@
+{
+  "host": "my-service.appspot.com",
+  "basePath": "/_ah/api",
+  "consumes": [
+    "application/json"
+  ],
+  "definitions": {
+    "MainEcho": {
+      "properties": {
+        "message": {
+          "type": "string"
+        }
+      },
+      "type": "object"
+    }
+  },
+  "info": {
+    "title": "echo",
+    "version": "v1"
+  },
+  "paths": {
+    "/echo/v1/echo": {
+      "post": {
+        "operationId": "EchoApi_echo",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "200_response",
+            "schema": {
+              "$ref": "#/definitions/MainEcho"
+            }
+          }
+        }
+      }
+    },
+    "/echo/v1/echo/getUserEmail": {
+      "get": {
+        "operationId": "EchoApi_getUserEmail",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "description": "200_response",
+            "schema": {
+              "$ref": "#/definitions/MainEcho"
+            }
+          }
+        }
+      }
+    }
+  },
+  "produces": [
+    "application/json"
+  ],
+  "schemes": [
+    "https"
+  ],
+  "swagger": "2.0",
+  "x-security": [
+    {
+      "google_id_token": {
+        "audiences": [
+          "407408718192.apps.googleusercontent.com"
+        ]
+      }
+    }
+  ],
+  "securityDefinitions": {
+    "google_id_token": {
+      "authorizationUrl": "",
+      "flow": "implicit",
+      "type": "oauth2",
+      "x-issuer": "https://accounts.google.com",
+      "x-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs"
+    }
+  }
+}
diff --git a/appengine/standard/endpoints-frameworks-v2.0/backend/main.py b/appengine/standard/endpoints-frameworks-v2/backend/main.py
similarity index 90%
rename from appengine/standard/endpoints-frameworks-v2.0/backend/main.py
rename to appengine/standard/endpoints-frameworks-v2/backend/main.py
index 2348e1f6edc..073f38ce43f 100644
--- a/appengine/standard/endpoints-frameworks-v2.0/backend/main.py
+++ b/appengine/standard/endpoints-frameworks-v2/backend/main.py
@@ -31,7 +31,12 @@ class Echo(messages.Message):
 
 
 # [START echo_api]
-@endpoints.api(name='echo', version='v1')
+@endpoints.api(name='echo',
+               version='v1',
+               allowed_client_ids=[
+                   endpoints.API_EXPLORER_CLIENT_ID,
+                   '407408718192.apps.googleusercontent.com'
+               ])
 class EchoApi(remote.Service):
 
     @endpoints.method(
diff --git a/appengine/standard/endpoints-frameworks-v2.0/backend/main_test.py b/appengine/standard/endpoints-frameworks-v2/backend/main_test.py
similarity index 100%
rename from appengine/standard/endpoints-frameworks-v2.0/backend/main_test.py
rename to appengine/standard/endpoints-frameworks-v2/backend/main_test.py