diff --git a/appengine/standard/endpoints-v1.1/backend/app.yaml b/appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml
similarity index 82%
rename from appengine/standard/endpoints-v1.1/backend/app.yaml
rename to appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml
index 0dd9abd9ce0..0ed58d006d2 100644
--- a/appengine/standard/endpoints-v1.1/backend/app.yaml
+++ b/appengine/standard/endpoints-frameworks-v2.0/backend/app.yaml
@@ -11,8 +11,8 @@ libraries:
 - name: pycrypto
   version: 2.6
 
-# Endpoints 1.1 uses background threads for caching and reporting to service
-# management and service control.
+# Endpoints Frameworks 2.0 uses background threads for caching and reporting to
+# service management and service control.
 manual_scaling:
   instances: 1
 
diff --git a/appengine/standard/endpoints-v1.1/backend/appengine_config.py b/appengine/standard/endpoints-frameworks-v2.0/backend/appengine_config.py
similarity index 100%
rename from appengine/standard/endpoints-v1.1/backend/appengine_config.py
rename to appengine/standard/endpoints-frameworks-v2.0/backend/appengine_config.py
diff --git a/appengine/standard/endpoints-v1.1/backend/main.py b/appengine/standard/endpoints-frameworks-v2.0/backend/main.py
similarity index 100%
rename from appengine/standard/endpoints-v1.1/backend/main.py
rename to appengine/standard/endpoints-frameworks-v2.0/backend/main.py
diff --git a/appengine/standard/endpoints-v1.1/backend/main_test.py b/appengine/standard/endpoints-frameworks-v2.0/backend/main_test.py
similarity index 100%
rename from appengine/standard/endpoints-v1.1/backend/main_test.py
rename to appengine/standard/endpoints-frameworks-v2.0/backend/main_test.py
diff --git a/appengine/standard/endpoints-v1.1/backend/echo-v1_swagger.json b/appengine/standard/endpoints-v1.1/backend/echo-v1_swagger.json
deleted file mode 100644
index 260fb33b06d..00000000000
--- a/appengine/standard/endpoints-v1.1/backend/echo-v1_swagger.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "basePath": "/_ah/api",
-  "consumes": [
-    "application/json"
-  ],
-  "definitions": {
-    "MainEcho": {
-      "properties": {
-        "content": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    }
-  },
-  "host": null,
-  "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"
-}
\ No newline at end of file