diff --git a/appengine/endpoints/README.md b/appengine/endpoints/README.md
index 0334812803..5d2355d5a1 100644
--- a/appengine/endpoints/README.md
+++ b/appengine/endpoints/README.md
@@ -9,7 +9,7 @@ running locally.
 
 ## Deploying to Google App Engine
 
-Open the `swagger.yaml` file and in the `host` property, replace
+Open the `openapi.yaml` file and in the `host` property, replace
 `YOUR-PROJECT-ID` with your project's ID.
 
 Then, deploy the sample using `gcloud`:
diff --git a/appengine/endpoints/app.yaml b/appengine/endpoints/app.yaml
index bc322c076c..eee89cbea4 100644
--- a/appengine/endpoints/app.yaml
+++ b/appengine/endpoints/app.yaml
@@ -17,5 +17,5 @@ env: flex
 beta_settings:
   # Enable Google Cloud Endpoints API management.
   use_endpoints_api_management: true
-  # Specify the Swagger API specification.
-  endpoints_swagger_spec_file: swagger.yaml
+  # Specify the Open API specification.
+  endpoints_swagger_spec_file: openapi.yaml
diff --git a/appengine/endpoints/swagger.yaml b/appengine/endpoints/openapi.yaml
similarity index 100%
rename from appengine/endpoints/swagger.yaml
rename to appengine/endpoints/openapi.yaml
diff --git a/endpoints/getting-started/app.yaml b/endpoints/getting-started/app.yaml
index 6a22da0518..f8016a2833 100644
--- a/endpoints/getting-started/app.yaml
+++ b/endpoints/getting-started/app.yaml
@@ -17,5 +17,5 @@ vm: true
 beta_settings:
   # Enable Google Cloud Endpoints API management.
   use_endpoints_api_management: true
-  # Specify the Swagger API specification.
-  endpoints_swagger_spec_file: swagger.yaml
+  # Specify the Open API specification.
+  endpoints_swagger_spec_file: openapi.yaml
diff --git a/endpoints/getting-started/swagger.yaml b/endpoints/getting-started/openapi.yaml
similarity index 100%
rename from endpoints/getting-started/swagger.yaml
rename to endpoints/getting-started/openapi.yaml