diff --git a/plugin/src/test/resources/rest-api-spec/api/xpack.deprecation.info.json b/plugin/src/test/resources/rest-api-spec/api/xpack.migration.deprecations.json
similarity index 92%
rename from plugin/src/test/resources/rest-api-spec/api/xpack.deprecation.info.json
rename to plugin/src/test/resources/rest-api-spec/api/xpack.migration.deprecations.json
index cd4e3cac339..f639880f510 100644
--- a/plugin/src/test/resources/rest-api-spec/api/xpack.deprecation.info.json
+++ b/plugin/src/test/resources/rest-api-spec/api/xpack.migration.deprecations.json
@@ -1,5 +1,5 @@
 {
-  "xpack.deprecation.info": {
+  "xpack.migration.deprecations": {
     "documentation": "http://www.elastic.co/guide/en/migration/current/migration-api-deprecation.html",
     "methods": [ "GET" ],
     "url": {
diff --git a/plugin/src/test/resources/rest-api-spec/api/xpack.ml.get_model_snapshots.json b/plugin/src/test/resources/rest-api-spec/api/xpack.ml.get_model_snapshots.json
index 4bb94546200..f820bf43562 100644
--- a/plugin/src/test/resources/rest-api-spec/api/xpack.ml.get_model_snapshots.json
+++ b/plugin/src/test/resources/rest-api-spec/api/xpack.ml.get_model_snapshots.json
@@ -21,11 +21,11 @@
       },
       "params": {
         "from": {
-          "type": "integer",
+          "type": "int",
           "description": "Skips a number of documents"
         },
         "size": {
-          "type": "integer",
+          "type": "int",
           "description": "The default number of documents returned in queries as a string."
         },
         "start": {
diff --git a/plugin/src/test/resources/rest-api-spec/test/deprecation/10_basic.yml b/plugin/src/test/resources/rest-api-spec/test/deprecation/10_basic.yml
index 705ca9f9692..dad0c3b08eb 100644
--- a/plugin/src/test/resources/rest-api-spec/test/deprecation/10_basic.yml
+++ b/plugin/src/test/resources/rest-api-spec/test/deprecation/10_basic.yml
@@ -7,7 +7,7 @@ setup:
 ---
 "Test Deprecations":
   - do:
-      xpack.deprecation.info:
+      xpack.migration.deprecations:
         index: "*"
   - length: { cluster_settings: 0 }
   - length: { node_settings: 0 }
diff --git a/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml b/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
index d5d5edd96e3..cf374db6a3b 100644
--- a/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
+++ b/qa/multi-cluster-search-security/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
@@ -36,7 +36,7 @@ teardown:
 
   - do:
       headers: { Authorization: "Basic am9lOnMza3JpdA==" }
-      remote.info: {}
+      cluster.remote_info: {}
   - match: { my_remote_cluster.connected: true }
   - match: { my_remote_cluster.num_nodes_connected: 1}
   - match: { my_remote_cluster.max_connections_per_cluster: 1}
@@ -69,7 +69,7 @@ teardown:
 
   - do:
       headers: { Authorization: "Basic am9lOnMza3JpdA==" }
-      remote.info: {}
+      cluster.remote_info: {}
   - set: { my_remote_cluster.http_addresses.0: remote_http }
   - match: { test_remote_cluster.http_addresses.0: $remote_http }