diff --git a/endpoints/getting-started/src/main/appengine/app.yaml b/endpoints/getting-started/src/main/appengine/app.yaml
index 5882f5a8952..2f76f203522 100644
--- a/endpoints/getting-started/src/main/appengine/app.yaml
+++ b/endpoints/getting-started/src/main/appengine/app.yaml
@@ -9,5 +9,5 @@ handlers:
 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/src/main/appengine/swagger.yaml b/endpoints/getting-started/src/main/appengine/openapi.yaml
similarity index 100%
rename from endpoints/getting-started/src/main/appengine/swagger.yaml
rename to endpoints/getting-started/src/main/appengine/openapi.yaml
diff --git a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
index 233ea414239..4ed7ba4a813 100644
--- a/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
+++ b/endpoints/getting-started/src/main/java/com/example/endpoints/AuthInfoServlet.java
@@ -29,7 +29,7 @@
 
 /**
  * A servlet that returns authentication information.
- * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
+ * See openapi.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
  */
 @WebServlet("/auth/info/*")
 public class AuthInfoServlet extends HttpServlet {
diff --git a/flexible/endpoints/README.md b/flexible/endpoints/README.md
index 8ff97e71bde..ee6dd61a9eb 100644
--- a/flexible/endpoints/README.md
+++ b/flexible/endpoints/README.md
@@ -1,9 +1,9 @@
 # Google Cloud Endpoints on App Engine flexible environment
 This sample demonstrates how to use Google Cloud Endpoints on Google App Engine Flexible Environment using Java.
 
-## Edit the Swagger API specification
+## Edit the Open API specification
 
-Open the [src/main/appengine/swagger.yaml](src/main/appengine/swagger.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id.
+Open the [src/main/appengine/openapi.yaml](src/main/appengine/openapi.yaml) file in your favorite editor, and replace the YOUR-PROJECT-ID `host` line with your actual Google Cloud Platform project Id.
 
 ## Running locally
     $ mvn jetty:run
diff --git a/flexible/endpoints/src/main/appengine/app.yaml b/flexible/endpoints/src/main/appengine/app.yaml
index 5882f5a8952..2f76f203522 100644
--- a/flexible/endpoints/src/main/appengine/app.yaml
+++ b/flexible/endpoints/src/main/appengine/app.yaml
@@ -9,5 +9,5 @@ handlers:
 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/flexible/endpoints/src/main/appengine/swagger.yaml b/flexible/endpoints/src/main/appengine/openapi.yaml
similarity index 100%
rename from flexible/endpoints/src/main/appengine/swagger.yaml
rename to flexible/endpoints/src/main/appengine/openapi.yaml
diff --git a/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
index 233ea414239..4ed7ba4a813 100644
--- a/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
+++ b/flexible/endpoints/src/main/java/com/example/endpoints/AuthInfoServlet.java
@@ -29,7 +29,7 @@
 
 /**
  * A servlet that returns authentication information.
- * See swagger.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
+ * See openapi.yaml for authentication mechanisms (e.g. JWT tokens, Google ID token).
  */
 @WebServlet("/auth/info/*")
 public class AuthInfoServlet extends HttpServlet {