diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.graph.explore.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/graph.explore.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.graph.explore.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/graph.explore.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.delete.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.delete.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.delete.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.get.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get_basic_status.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get_basic_status.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get_basic_status.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.get_basic_status.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get_trial_status.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.get_trial_status.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.get_trial_status.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.get_trial_status.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.post.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.post.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post_start_basic.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.post_start_basic.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post_start_basic.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.post_start_basic.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post_start_trial.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/license.post_start_trial.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.license.post_start_trial.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/license.post_start_trial.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.deprecations.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/migration.deprecations.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.deprecations.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/migration.deprecations.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.get_assistance.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/migration.get_assistance.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.get_assistance.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/migration.get_assistance.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.upgrade.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/migration.upgrade.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.migration.upgrade.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/migration.upgrade.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.delete_job.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.delete_job.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.delete_job.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.delete_job.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_jobs.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_jobs.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_jobs.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_jobs.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_caps.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_rollup_caps.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_caps.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_rollup_caps.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_index_caps.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.get_rollup_index_caps.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.get_rollup_index_caps.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.put_job.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.put_job.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.put_job.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.put_job.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.rollup_search.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.rollup_search.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.rollup_search.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.rollup_search.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.start_job.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.start_job.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.start_job.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.start_job.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.stop_job.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.stop_job.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.rollup.stop_job.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/rollup.stop_job.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.clear_cursor.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.clear_cursor.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/sql.clear_cursor.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.query.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.query.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/sql.query.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.translate.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.sql.translate.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/sql.translate.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.ack_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.ack_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.ack_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.activate_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.activate_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.activate_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.deactivate_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.delete_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.delete_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.delete_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.execute_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.execute_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.execute_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.get_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.get_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.get_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.put_watch.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.put_watch.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.put_watch.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.start.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.start.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.start.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.start.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.stats.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.stats.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.stats.json
diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json b/x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.stop.json
similarity index 100%
rename from x-pack/plugin/src/test/resources/rest-api-spec/api/xpack.watcher.stop.json
rename to x-pack/plugin/src/test/resources/rest-api-spec/api/watcher.stop.json