From 2a65bed243a0387bdf1175c0ca4b73ed863d9792 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 16 May 2017 17:24:35 -0700
Subject: [PATCH] Tests: Change rest test extension from .yaml to .yml (#24659)

This commit renames all rest test files to use the .yml extension
instead of .yaml. This way the extension used within all of
elasticsearch for yaml is consistent.
---
 .../doc/RestTestsFromSnippetsTask.groovy      |  2 +-
 .../{10_modules.yaml => 10_modules.yml}       |  0
 .../{10_modules.yaml => 10_modules.yml}       |  0
 .../{10_modules.yaml => 10_modules.yml}       |  0
 .../plugins/InstallPluginCommandTests.java    | 12 +++++------
 .../{10_modules.yaml => 10_modules.yml}       |  0
 .../stats/{10_basic.yaml => 10_basic.yml}     |  0
 ..._empty_bucket.yaml => 20_empty_bucket.yml} |  0
 ...e_field.yaml => 30_single_value_field.yml} |  0
 ...ue_field.yaml => 40_multi_value_field.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_analyzers.yaml => 20_analyzers.yml}   |  0
 .../{30_tokenizers.yaml => 30_tokenizers.yml} |  0
 ...oken_filters.yaml => 40_token_filters.yml} |  0
 ..._char_filters.yaml => 50_char_filters.yml} |  0
 ...yaml => 100_date_index_name_processor.yml} |  0
 .../ingest/{10_basic.yaml => 10_basic.yml}    |  0
 .../ingest/{110_sort.yaml => 110_sort.yml}    |  0
 .../ingest/{120_grok.yaml => 120_grok.yml}    |  0
 ...130_escape_dot.yaml => 130_escape_dot.yml} |  0
 .../ingest/{140_json.yaml => 140_json.yml}    |  0
 .../test/ingest/{150_kv.yaml => 150_kv.yml}   |  0
 .../test/ingest/{20_crud.yaml => 20_crud.yml} |  0
 ...e_processor.yaml => 30_date_processor.yml} |  0
 .../ingest/{40_mutate.yaml => 40_mutate.yml}  |  0
 .../{50_on_failure.yaml => 50_on_failure.yml} |  0
 .../test/ingest/{60_fail.yaml => 60_fail.yml} |  0
 .../test/ingest/{70_bulk.yaml => 70_bulk.yml} |  0
 .../{80_foreach.yaml => 80_foreach.yml}       |  0
 .../{90_simulate.yaml => 90_simulate.yml}     |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...ate.yaml => 20_render_search_template.yml} |  0
 ...functions.yaml => 25_custom_functions.yml} |  0
 ...h_template.yaml => 30_search_template.yml} |  0
 ...late.yaml => 50_multi_search_template.yml} |  0
 .../{60_typed_keys.yaml => 60_typed_keys.yml} |  0
 .../painless/{10_basic.yaml => 10_basic.yml}  |  0
 .../{15_update.yaml => 15_update.yml}         |  0
 .../{16_update2.yaml => 16_update2.yml}       |  0
 ...20_scriptfield.yaml => 20_scriptfield.yml} |  0
 ...cript_upsert.yaml => 25_script_upsert.yml} |  0
 .../{30_search.yaml => 30_search.yml}         |  0
 .../{40_disabled.yaml => 40_disabled.yml}     |  0
 ...c_values.yaml => 50_script_doc_values.yml} |  0
 ...y.yaml => 60_script_doc_values_binary.yml} |  0
 .../test/{10_basic.yaml => 10_basic.yml}      |  0
 .../test/{10_basic.yaml => 10_basic.yml}      |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_validation.yaml => 20_validation.yml} |  0
 .../{30_by_type.yaml => 30_by_type.yml}       |  0
 .../{40_versioning.yaml => 40_versioning.yml} |  0
 ...rds.yaml => 50_wait_for_active_shards.yml} |  0
 .../{70_throttle.yaml => 70_throttle.yml}     |  0
 .../{80_slices.yaml => 80_slices.yml}         |  0
 .../reindex/{10_basic.yaml => 10_basic.yml}   |  0
 .../{20_validation.yaml => 20_validation.yml} |  0
 ...auto_create.yaml => 25_no_auto_create.yml} |  0
 .../reindex/{30_search.yaml => 30_search.yml} |  0
 .../{40_versioning.yaml => 40_versioning.yml} |  0
 .../{50_routing.yaml => 50_routing.yml}       |  0
 ...rds.yaml => 60_wait_for_active_shards.yml} |  0
 .../{70_throttle.yaml => 70_throttle.yml}     |  0
 .../reindex/{80_slices.yaml => 80_slices.yml} |  0
 .../reindex/{90_remote.yaml => 90_remote.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_validation.yaml => 20_validation.yml} |  0
 .../{30_new_fields.yaml => 30_new_fields.yml} |  0
 .../{40_versioning.yaml => 40_versioning.yml} |  0
 ...50_consistency.yaml => 50_consistency.yml} |  0
 .../{60_throttle.yaml => 60_throttle.yml}     |  0
 .../{70_slices.yaml => 70_slices.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_repository.yaml => 20_repository.yml} |  0
 .../test/{10_basic.yaml => 10_basic.yml}      |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_metaphone.yaml => 10_metaphone.yml}   |  0
 ...metaphone.yaml => 20_double_metaphone.yml} |  0
 ..._beider_morse.yaml => 30_beider_morse.yml} |  0
 .../{40_search.yaml => 40_search.yml}         |  0
 ...h_mokotoff.yaml => 50_daitch_mokotoff.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_search.yaml => 20_search.yml}         |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_score.yaml => 20_score.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...essor.yaml => 20_attachment_processor.yml} |  0
 ..._supported.yaml => 30_files_supported.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ..._processor.yaml => 20_geoip_processor.yml} |  0
 plugins/ingest-user-agent/build.gradle        |  2 +-
 .../useragent/IngestUserAgentPlugin.java      |  4 ++--
 .../resources/{regexes.yaml => regexes.yml}   |  0
 .../UserAgentProcessorFactoryTests.java       |  8 ++++----
 .../useragent/UserAgentProcessorTests.java    |  2 +-
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...cessor.yaml => 20_useragent_processor.yml} |  0
 ..._custom_regex.yaml => 30_custom_regex.yml} |  2 +-
 .../{test-regexes.yaml => test-regexes.yml}   |  0
 .../main/config/{example.yaml => example.yml} |  0
 .../example/ExamplePluginConfiguration.java   |  2 +-
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...example.yaml => 20_configured_example.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_repository.yaml => 20_repository.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...y_create.yaml => 20_repository_create.yml} |  0
 ...y_delete.yaml => 20_repository_delete.yml} |  0
 ...y_verify.yaml => 20_repository_verify.yml} |  0
 .../{30_snapshot.yaml => 30_snapshot.yml}     |  0
 ..._snapshot_get.yaml => 30_snapshot_get.yml} |  0
 .../{40_restore.yaml => 40_restore.yml}       |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...y_create.yaml => 20_repository_create.yml} |  0
 ...y_delete.yaml => 20_repository_delete.yml} |  0
 ...y_verify.yaml => 20_repository_verify.yml} |  0
 .../{30_snapshot.yaml => 30_snapshot.yml}     |  0
 ..._snapshot_get.yaml => 30_snapshot_get.yml} |  0
 .../{40_restore.yaml => 40_restore.yml}       |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_repository.yaml => 20_repository.yml} |  0
 .../store_smb/{10_basic.yaml => 10_basic.yml} |  0
 ...ex_creation.yaml => 15_index_creation.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_info.yaml => 20_info.yml}             |  0
 .../{30_field_caps.yaml => 30_field_caps.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...t_disabled.yaml => 10_ingest_disabled.yml} |  0
 ...> 10_pipeline_with_mustache_templates.yml} |  0
 ...cessors.yaml => 20_combine_processors.yml} |  0
 ...aml => 30_update_by_query_with_ingest.yml} |  0
 ...ingest.yaml => 40_reindex_with_ingest.yml} |  0
 ...=> 50_script_processor_using_painless.yml} |  0
 ...=> 60_pipeline_timestamp_date_mapping.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../reindex/{10_script.yaml => 10_script.yml} |  0
 .../reindex/{20_broken.yaml => 20_broken.yml} |  0
 .../{30_timeout.yaml => 30_timeout.yml}       |  0
 ...h_failures.yaml => 40_search_failures.yml} |  0
 ...d.yaml => 50_reindex_with_parentchild.yml} |  0
 .../{10_script.yaml => 10_script.yml}         |  0
 .../{20_broken.yaml => 20_broken.yml}         |  0
 .../{30_timeout.yaml => 30_timeout.yml}       |  0
 ...rch_failure.yaml => 40_search_failure.yml} |  0
 .../tribe/{10_basic.yaml => 10_basic.yml}     |  0
 .../test/bulk/{10_basic.yaml => 10_basic.yml} |  0
 ...of_strings.yaml => 20_list_of_strings.yml} |  0
 .../{30_big_string.yaml => 30_big_string.yml} |  0
 .../bulk/{40_source.yaml => 40_source.yml}    |  0
 .../bulk/{50_refresh.yaml => 50_refresh.yml}  |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_headers.yaml => 20_headers.yml}       |  0
 .../cat.aliases/{30_json.yaml => 30_json.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../cat.count/{10_basic.yaml => 10_basic.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../cat.nodes/{10_basic.yaml => 10_basic.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../cat.tasks/{10_basic.yaml => 10_basic.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...st_timeout.yaml => 20_request_timeout.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{11_explain.yaml => 11_explain.yml}       |  0
 ...ltering.yaml => 20_response_filtering.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_filtering.yaml => 20_filtering.yml}   |  0
 ...wildcards.yaml => 30_expand_wildcards.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../count/{10_basic.yaml => 10_basic.yml}     |  0
 ..._query_string.yaml => 20_query_string.yml} |  0
 .../{10_with_id.yaml => 10_with_id.yml}       |  0
 .../{15_without_id.yaml => 15_without_id.yml} |  0
 ...l_version.yaml => 30_internal_version.yml} |  0
 ...l_version.yaml => 35_external_version.yml} |  0
 .../{40_routing.yaml => 40_routing.yml}       |  0
 .../create/{50_parent.yaml => 50_parent.yml}  |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 .../{60_refresh.yaml => 60_refresh.yml}       |  0
 .../delete/{10_basic.yaml => 10_basic.yml}    |  0
 ..._shard_header.yaml => 11_shard_header.yml} |  0
 .../delete/{12_result.yaml => 12_result.yml}  |  0
 ...l_version.yaml => 20_internal_version.yml} |  0
 ...l_version.yaml => 25_external_version.yml} |  0
 ...rsion.yaml => 26_external_gte_version.yml} |  0
 .../{30_routing.yaml => 30_routing.yml}       |  0
 .../delete/{40_parent.yaml => 40_parent.yml}  |  0
 ...outing.yaml => 45_parent_with_routing.yml} |  0
 .../{50_refresh.yaml => 50_refresh.yml}       |  0
 .../{60_missing.yaml => 60_missing.yml}       |  0
 .../exists/{10_basic.yaml => 10_basic.yml}    |  0
 .../exists/{30_parent.yaml => 30_parent.yml}  |  0
 .../{40_routing.yaml => 40_routing.yml}       |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 ...e_refresh.yaml => 60_realtime_refresh.yml} |  0
 .../{70_defaults.yaml => 70_defaults.yml}     |  0
 .../explain/{10_basic.yaml => 10_basic.yml}   |  0
 ...filtering.yaml => 20_source_filtering.yml} |  0
 ..._query_string.yaml => 30_query_string.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basics.yaml => 10_basics.yml}         |  0
 .../test/get/{10_basic.yaml => 10_basic.yml}  |  0
 ...ault_values.yaml => 15_default_values.yml} |  0
 ...tored_fields.yaml => 20_stored_fields.yml} |  0
 .../get/{30_parent.yaml => 30_parent.yml}     |  0
 .../get/{40_routing.yaml => 40_routing.yml}   |  0
 ..._with_headers.yaml => 50_with_headers.yml} |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 ...e_refresh.yaml => 60_realtime_refresh.yml} |  0
 ...filtering.yaml => 70_source_filtering.yml} |  0
 .../get/{80_missing.yaml => 80_missing.yml}   |  0
 .../get/{90_versions.yaml => 90_versions.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...ault_values.yaml => 15_default_values.yml} |  0
 .../{30_parent.yaml => 30_parent.yml}         |  0
 .../{40_routing.yaml => 40_routing.yml}       |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 ...e_refresh.yaml => 60_realtime_refresh.yml} |  0
 ...filtering.yaml => 70_source_filtering.yml} |  0
 .../{80_missing.yaml => 80_missing.yml}       |  0
 ...rce_missing.yaml => 85_source_missing.yml} |  0
 .../index/{10_with_id.yaml => 10_with_id.yml} |  0
 .../index/{12_result.yaml => 12_result.yml}   |  0
 .../{15_without_id.yaml => 15_without_id.yml} |  0
 .../index/{20_optype.yaml => 20_optype.yml}   |  0
 ...l_version.yaml => 30_internal_version.yml} |  0
 ...l_version.yaml => 35_external_version.yml} |  0
 ...rsion.yaml => 36_external_gte_version.yml} |  0
 .../index/{40_routing.yaml => 40_routing.yml} |  0
 .../index/{50_parent.yaml => 50_parent.yml}   |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 .../index/{60_refresh.yaml => 60_refresh.yml} |  0
 .../{10_analyze.yaml => 10_analyze.yml}       |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...path_options.yaml => all_path_options.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...only_index.yaml => 20_read_only_index.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_empty.yaml => 20_empty.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...issing_field.yaml => 20_missing_field.yml} |  0
 ..._missing_type.yaml => 30_missing_type.yml} |  0
 ...issing_index.yaml => 40_missing_index.yml} |  0
 ..._wildcards.yaml => 50_field_wildcards.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ..._missing_type.yaml => 20_missing_type.yml} |  0
 ...issing_index.yaml => 30_missing_index.yml} |  0
 .../{40_aliases.yaml => 40_aliases.yml}       |  0
 ...pansion.yaml => 50_wildcard_expansion.yml} |  0
 .../{60_empty.yaml => 60_empty.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_aliases.yaml => 20_aliases.yml}       |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...20_get_missing.yaml => 20_get_missing.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...e_indices.yaml => 20_multiple_indices.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...path_options.yaml => all_path_options.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...path_options.yaml => all_path_options.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{11_reset.yaml => 11_reset.yml}           |  0
 ...path_options.yaml => all_path_options.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_index.yaml => 10_index.yml}           |  0
 .../{11_metric.yaml => 11_metric.yml}         |  0
 .../{12_level.yaml => 12_level.yml}           |  0
 .../{13_fields.yaml => 13_fields.yml}         |  0
 .../{14_groups.yaml => 14_groups.yml}         |  0
 .../{15_types.yaml => 15_types.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_routing.yaml => 20_routing.yml}       |  0
 ...0_remove_index_and_replace_with_alias.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ..._query_string.yaml => 20_query_string.yml} |  0
 .../test/info/{10_info.yaml => 10_info.yml}   |  0
 ...ene_version.yaml => 20_lucene_version.yml} |  0
 .../ingest/{10_basic.yaml => 10_basic.yml}    |  0
 .../test/mget/{10_basic.yaml => 10_basic.yml} |  0
 ...ex_type.yaml => 11_default_index_type.yml} |  0
 ...t_index.yaml => 12_non_existent_index.yml} |  0
 ..._metadata.yaml => 13_missing_metadata.yml} |  0
 ....yaml => 14_alias_to_multiple_indices.yml} |  0
 .../test/mget/{15_ids.yaml => 15_ids.yml}     |  0
 ...tored_fields.yaml => 20_stored_fields.yml} |  0
 .../mget/{30_parent.yaml => 30_parent.yml}    |  0
 .../mget/{40_routing.yaml => 40_routing.yml}  |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 ...e_refresh.yaml => 60_realtime_refresh.yml} |  0
 ...filtering.yaml => 70_source_filtering.yml} |  0
 .../test/mlt/{10_basic.yaml => 10_basic.yml}  |  0
 .../test/mlt/{20_docs.yaml => 20_docs.yml}    |  0
 .../mlt/{30_unlike.yaml => 30_unlike.yml}     |  0
 .../msearch/{10_basic.yaml => 10_basic.yml}   |  0
 .../msearch/{11_status.yaml => 11_status.yml} |  0
 .../{20_typed_keys.yaml => 20_typed_keys.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_transport.yaml => 20_transport.yml}   |  0
 .../{30_settings.yaml => 30_settings.yml}     |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...es_metrics.yaml => 11_indices_metrics.yml} |  0
 ...ltering.yaml => 20_response_filtering.yml} |  0
 .../{30_discovery.yaml => 30_discovery.yml}   |  0
 .../test/ping/{10_ping.yaml => 10_ping.yml}   |  0
 .../remote.info/{10_info.yaml => 10_info.yml} |  0
 .../scroll/{10_basic.yaml => 10_basic.yml}    |  0
 .../scroll/{11_clear.yaml => 11_clear.yml}    |  0
 .../scroll/{12_slices.yaml => 12_slices.yml}  |  0
 .../{10_histogram.yaml => 10_histogram.yml}   |  0
 .../{20_terms.yaml => 20_terms.yml}           |  0
 .../{30_sig_terms.yaml => 30_sig_terms.yml}   |  0
 .../{40_range.yaml => 40_range.yml}           |  0
 .../{50_filter.yaml => 50_filter.yml}         |  0
 ...cy_matrix.yaml => 70_adjacency_matrix.yml} |  0
 .../{80_typed_keys.yaml => 80_typed_keys.yml} |  0
 .../{10_unified.yaml => 10_unified.yml}       |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 ...ored_fields.yaml => 100_stored_fields.yml} |  0
 ...filtering.yaml => 10_source_filtering.yml} |  0
 ...llapsing.yaml => 110_field_collapsing.yml} |  0
 ...ce_size.yaml => 120_batch_reduce_size.yml} |  0
 ...ault_values.yaml => 20_default_values.yml} |  0
 .../search/{30_limits.yaml => 30_limits.yml}  |  0
 ...ndices_boost.yaml => 40_indices_boost.yml} |  0
 ..._query_string.yaml => 60_query_string.yml} |  0
 ...ltering.yaml => 70_response_filtering.yml} |  0
 ...es_options.yaml => 80_indices_options.yml} |  0
 ..._search_after.yaml => 90_search_after.yml} |  0
 .../search/{issue4895.yaml => issue4895.yml}  |  0
 .../search/{issue9606.yaml => issue9606.yml}  |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../suggest/{10_basic.yaml => 10_basic.yml}   |  0
 .../{20_completion.yaml => 20_completion.yml} |  0
 .../{30_context.yaml => 30_context.yml}       |  0
 .../{40_typed_keys.yaml => 40_typed_keys.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../tasks.get/{10_basic.yaml => 10_basic.yml} |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{10_basic.yaml => 10_basic.yml}           |  0
 .../{20_issue7121.yaml => 20_issue7121.yml}   |  0
 .../{30_realtime.yaml => 30_realtime.yml}     |  0
 .../{40_versions.yaml => 40_versions.yml}     |  0
 .../test/update/{10_doc.yaml => 10_doc.yml}   |  0
 ..._shard_header.yaml => 11_shard_header.yml} |  0
 .../update/{12_result.yaml => 12_result.yml}  |  0
 .../{20_doc_upsert.yaml => 20_doc_upsert.yml} |  0
 ...oc_as_upsert.yaml => 22_doc_as_upsert.yml} |  0
 ...l_version.yaml => 30_internal_version.yml} |  0
 ...er_versions.yaml => 35_other_versions.yml} |  0
 .../{40_routing.yaml => 40_routing.yml}       |  0
 .../update/{50_parent.yaml => 50_parent.yml}  |  0
 ...outing.yaml => 55_parent_with_routing.yml} |  0
 .../{60_refresh.yaml => 60_refresh.yml}       |  0
 ...filtering.yaml => 80_source_filtering.yml} |  0
 ...85_fields_meta.yaml => 85_fields_meta.yml} |  0
 .../rest/yaml/ESClientYamlSuiteTestCase.java  | 14 ++++++-------
 .../yaml/ESClientYamlSuiteTestCaseTests.java  | 20 +++++++++----------
 .../suite1/{10_basic.yaml => 10_basic.yml}    |  0
 ..._another_test.yaml => 20_another_test.yml} |  0
 .../suite2/{10_basic.yaml => 10_basic.yml}    |  0
 .../suite2/{15_test2.yaml => 15_test2.yml}    |  0
 414 files changed, 34 insertions(+), 34 deletions(-)
 rename distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/{10_modules.yaml => 10_modules.yml} (100%)
 rename distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/{10_modules.yaml => 10_modules.yml} (100%)
 rename distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/{10_modules.yaml => 10_modules.yml} (100%)
 rename distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/{10_modules.yaml => 10_modules.yml} (100%)
 rename modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/{20_empty_bucket.yaml => 20_empty_bucket.yml} (100%)
 rename modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/{30_single_value_field.yaml => 30_single_value_field.yml} (100%)
 rename modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/{40_multi_value_field.yaml => 40_multi_value_field.yml} (100%)
 rename modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/{20_analyzers.yaml => 20_analyzers.yml} (100%)
 rename modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/{30_tokenizers.yaml => 30_tokenizers.yml} (100%)
 rename modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/{40_token_filters.yaml => 40_token_filters.yml} (100%)
 rename modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/{50_char_filters.yaml => 50_char_filters.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{100_date_index_name_processor.yaml => 100_date_index_name_processor.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{110_sort.yaml => 110_sort.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{120_grok.yaml => 120_grok.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{130_escape_dot.yaml => 130_escape_dot.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{140_json.yaml => 140_json.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{150_kv.yaml => 150_kv.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{20_crud.yaml => 20_crud.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{30_date_processor.yaml => 30_date_processor.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{40_mutate.yaml => 40_mutate.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{50_on_failure.yaml => 50_on_failure.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{60_fail.yaml => 60_fail.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{70_bulk.yaml => 70_bulk.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{80_foreach.yaml => 80_foreach.yml} (100%)
 rename modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/{90_simulate.yaml => 90_simulate.yml} (100%)
 rename modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/{20_search.yaml => 20_search.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{20_render_search_template.yaml => 20_render_search_template.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{25_custom_functions.yaml => 25_custom_functions.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{30_search_template.yaml => 30_search_template.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{50_multi_search_template.yaml => 50_multi_search_template.yml} (100%)
 rename modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/{60_typed_keys.yaml => 60_typed_keys.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{15_update.yaml => 15_update.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{16_update2.yaml => 16_update2.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{20_scriptfield.yaml => 20_scriptfield.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{25_script_upsert.yaml => 25_script_upsert.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{30_search.yaml => 30_search.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{40_disabled.yaml => 40_disabled.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{50_script_doc_values.yaml => 50_script_doc_values.yml} (100%)
 rename modules/lang-painless/src/test/resources/rest-api-spec/test/painless/{60_script_doc_values_binary.yaml => 60_script_doc_values_binary.yml} (100%)
 rename modules/parent-join/src/test/resources/rest-api-spec/test/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/percolator/src/test/resources/rest-api-spec/test/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{20_validation.yaml => 20_validation.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{30_by_type.yaml => 30_by_type.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{40_versioning.yaml => 40_versioning.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{50_wait_for_active_shards.yaml => 50_wait_for_active_shards.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{70_throttle.yaml => 70_throttle.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/{80_slices.yaml => 80_slices.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{20_validation.yaml => 20_validation.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{25_no_auto_create.yaml => 25_no_auto_create.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{30_search.yaml => 30_search.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{40_versioning.yaml => 40_versioning.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{50_routing.yaml => 50_routing.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{60_wait_for_active_shards.yaml => 60_wait_for_active_shards.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{70_throttle.yaml => 70_throttle.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{80_slices.yaml => 80_slices.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/reindex/{90_remote.yaml => 90_remote.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{20_validation.yaml => 20_validation.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{30_new_fields.yaml => 30_new_fields.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{40_versioning.yaml => 40_versioning.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{50_consistency.yaml => 50_consistency.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{60_throttle.yaml => 60_throttle.yml} (100%)
 rename modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/{70_slices.yaml => 70_slices.yml} (100%)
 rename modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/{10_basic.yaml => 10_basic.yml} (100%)
 rename modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/{20_repository.yaml => 20_repository.yml} (100%)
 rename modules/transport-netty4/src/test/resources/rest-api-spec/test/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/{20_search.yaml => 20_search.yml} (100%)
 rename plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/{20_search.yaml => 20_search.yml} (100%)
 rename plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/{10_metaphone.yaml => 10_metaphone.yml} (100%)
 rename plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/{20_double_metaphone.yaml => 20_double_metaphone.yml} (100%)
 rename plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/{30_beider_morse.yaml => 30_beider_morse.yml} (100%)
 rename plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/{40_search.yaml => 40_search.yml} (100%)
 rename plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/{50_daitch_mokotoff.yaml => 50_daitch_mokotoff.yml} (100%)
 rename plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/{20_search.yaml => 20_search.yml} (100%)
 rename plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/{20_search.yaml => 20_search.yml} (100%)
 rename plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/{20_search.yaml => 20_search.yml} (100%)
 rename plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/{20_score.yaml => 20_score.yml} (100%)
 rename plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/{20_attachment_processor.yaml => 20_attachment_processor.yml} (100%)
 rename plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/{30_files_supported.yaml => 30_files_supported.yml} (100%)
 rename plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/{20_geoip_processor.yaml => 20_geoip_processor.yml} (100%)
 rename plugins/ingest-user-agent/src/main/resources/{regexes.yaml => regexes.yml} (100%)
 rename plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/{20_useragent_processor.yaml => 20_useragent_processor.yml} (100%)
 rename plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/{30_custom_regex.yaml => 30_custom_regex.yml} (95%)
 rename plugins/ingest-user-agent/test/{test-regexes.yaml => test-regexes.yml} (100%)
 rename plugins/jvm-example/src/main/config/{example.yaml => example.yml} (100%)
 rename plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/{20_configured_example.yaml => 20_configured_example.yml} (100%)
 rename plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/{20_repository.yaml => 20_repository.yml} (100%)
 rename plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{20_repository_create.yaml => 20_repository_create.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{20_repository_delete.yaml => 20_repository_delete.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{20_repository_verify.yaml => 20_repository_verify.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{30_snapshot.yaml => 30_snapshot.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{30_snapshot_get.yaml => 30_snapshot_get.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/{40_restore.yaml => 40_restore.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{20_repository_create.yaml => 20_repository_create.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{20_repository_delete.yaml => 20_repository_delete.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{20_repository_verify.yaml => 20_repository_verify.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{30_snapshot.yaml => 30_snapshot.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{30_snapshot_get.yaml => 30_snapshot_get.yml} (100%)
 rename plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/{40_restore.yaml => 40_restore.yml} (100%)
 rename plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/{20_repository.yaml => 20_repository.yml} (100%)
 rename plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/{10_basic.yaml => 10_basic.yml} (100%)
 rename plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/{15_index_creation.yaml => 15_index_creation.yml} (100%)
 rename qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/{20_info.yaml => 20_info.yml} (100%)
 rename qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/{30_field_caps.yaml => 30_field_caps.yml} (100%)
 rename qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/smoke-test-ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/{10_ingest_disabled.yaml => 10_ingest_disabled.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{10_pipeline_with_mustache_templates.yaml => 10_pipeline_with_mustache_templates.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{20_combine_processors.yaml => 20_combine_processors.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{30_update_by_query_with_ingest.yaml => 30_update_by_query_with_ingest.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{40_reindex_with_ingest.yaml => 40_reindex_with_ingest.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{50_script_processor_using_painless.yaml => 50_script_processor_using_painless.yml} (100%)
 rename qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/{60_pipeline_timestamp_date_mapping.yaml => 60_pipeline_timestamp_date_mapping.yml} (100%)
 rename qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/{10_basic.yaml => 10_basic.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/{10_script.yaml => 10_script.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/{20_broken.yaml => 20_broken.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/{30_timeout.yaml => 30_timeout.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/{40_search_failures.yaml => 40_search_failures.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/{50_reindex_with_parentchild.yaml => 50_reindex_with_parentchild.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/{10_script.yaml => 10_script.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/{20_broken.yaml => 20_broken.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/{30_timeout.yaml => 30_timeout.yml} (100%)
 rename qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/{40_search_failure.yaml => 40_search_failure.yml} (100%)
 rename qa/smoke-test-tribe-node/src/test/resources/rest-api-spec/test/tribe/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/bulk/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/bulk/{20_list_of_strings.yaml => 20_list_of_strings.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/bulk/{30_big_string.yaml => 30_big_string.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/bulk/{40_source.yaml => 40_source.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/bulk/{50_refresh.yaml => 50_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/{20_headers.yaml => 20_headers.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/{30_json.yaml => 30_json.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.plugins/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.tasks/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/{20_request_timeout.yaml => 20_request_timeout.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.pending_tasks/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/{11_explain.yaml => 11_explain.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/{20_response_filtering.yaml => 20_response_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/{20_filtering.yaml => 20_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/{30_expand_wildcards.yaml => 30_expand_wildcards.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/count/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/count/{20_query_string.yaml => 20_query_string.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{10_with_id.yaml => 10_with_id.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{15_without_id.yaml => 15_without_id.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{30_internal_version.yaml => 30_internal_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{35_external_version.yaml => 35_external_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{50_parent.yaml => 50_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/create/{60_refresh.yaml => 60_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{11_shard_header.yaml => 11_shard_header.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{12_result.yaml => 12_result.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{20_internal_version.yaml => 20_internal_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{25_external_version.yaml => 25_external_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{26_external_gte_version.yaml => 26_external_gte_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{30_routing.yaml => 30_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{40_parent.yaml => 40_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{45_parent_with_routing.yaml => 45_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{50_refresh.yaml => 50_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/delete/{60_missing.yaml => 60_missing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{30_parent.yaml => 30_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{60_realtime_refresh.yaml => 60_realtime_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/exists/{70_defaults.yaml => 70_defaults.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/explain/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/explain/{20_source_filtering.yaml => 20_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/explain/{30_query_string.yaml => 30_query_string.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/field_stats/{10_basics.yaml => 10_basics.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{15_default_values.yaml => 15_default_values.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{20_stored_fields.yaml => 20_stored_fields.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{30_parent.yaml => 30_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{50_with_headers.yaml => 50_with_headers.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{60_realtime_refresh.yaml => 60_realtime_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{70_source_filtering.yaml => 70_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{80_missing.yaml => 80_missing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get/{90_versions.yaml => 90_versions.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{15_default_values.yaml => 15_default_values.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{30_parent.yaml => 30_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{60_realtime_refresh.yaml => 60_realtime_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{70_source_filtering.yaml => 70_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{80_missing.yaml => 80_missing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/get_source/{85_source_missing.yaml => 85_source_missing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{10_with_id.yaml => 10_with_id.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{12_result.yaml => 12_result.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{15_without_id.yaml => 15_without_id.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{20_optype.yaml => 20_optype.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{30_internal_version.yaml => 30_internal_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{35_external_version.yaml => 35_external_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{36_external_gte_version.yaml => 36_external_gte_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{50_parent.yaml => 50_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/index/{60_refresh.yaml => 60_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/{10_analyze.yaml => 10_analyze.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/{all_path_options.yaml => all_path_options.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/{20_read_only_index.yaml => 20_read_only_index.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_alias/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/{20_empty.yaml => 20_empty.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/{20_missing_field.yaml => 20_missing_field.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/{30_missing_type.yaml => 30_missing_type.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/{40_missing_index.yaml => 40_missing_index.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/{50_field_wildcards.yaml => 50_field_wildcards.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{20_missing_type.yaml => 20_missing_type.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{30_missing_index.yaml => 30_missing_index.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{40_aliases.yaml => 40_aliases.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{50_wildcard_expansion.yaml => 50_wildcard_expansion.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/{60_empty.yaml => 60_empty.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/{20_aliases.yaml => 20_aliases.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/{20_get_missing.yaml => 20_get_missing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/{20_multiple_indices.yaml => 20_multiple_indices.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/{all_path_options.yaml => all_path_options.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/{all_path_options.yaml => all_path_options.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/{11_reset.yaml => 11_reset.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/{all_path_options.yaml => all_path_options.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.refresh/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.shard_stores/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{10_index.yaml => 10_index.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{11_metric.yaml => 11_metric.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{12_level.yaml => 12_level.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{13_fields.yaml => 13_fields.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{14_groups.yaml => 14_groups.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/{15_types.yaml => 15_types.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/{20_routing.yaml => 20_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/{30_remove_index_and_replace_with_alias.yaml => 30_remove_index_and_replace_with_alias.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/{20_query_string.yaml => 20_query_string.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/info/{10_info.yaml => 10_info.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/info/{20_lucene_version.yaml => 20_lucene_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/ingest/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{11_default_index_type.yaml => 11_default_index_type.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{12_non_existent_index.yaml => 12_non_existent_index.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{13_missing_metadata.yaml => 13_missing_metadata.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{14_alias_to_multiple_indices.yaml => 14_alias_to_multiple_indices.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{15_ids.yaml => 15_ids.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{20_stored_fields.yaml => 20_stored_fields.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{30_parent.yaml => 30_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{60_realtime_refresh.yaml => 60_realtime_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mget/{70_source_filtering.yaml => 70_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mlt/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mlt/{20_docs.yaml => 20_docs.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mlt/{30_unlike.yaml => 30_unlike.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/msearch/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/msearch/{11_status.yaml => 11_status.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/msearch/{20_typed_keys.yaml => 20_typed_keys.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/{20_transport.yaml => 20_transport.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/{30_settings.yaml => 30_settings.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/{11_indices_metrics.yaml => 11_indices_metrics.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/{20_response_filtering.yaml => 20_response_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/{30_discovery.yaml => 30_discovery.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/ping/{10_ping.yaml => 10_ping.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/{10_info.yaml => 10_info.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/scroll/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/scroll/{11_clear.yaml => 11_clear.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/scroll/{12_slices.yaml => 12_slices.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{10_histogram.yaml => 10_histogram.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{20_terms.yaml => 20_terms.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{30_sig_terms.yaml => 30_sig_terms.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{40_range.yaml => 40_range.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{50_filter.yaml => 50_filter.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{70_adjacency_matrix.yaml => 70_adjacency_matrix.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/{80_typed_keys.yaml => 80_typed_keys.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/{10_unified.yaml => 10_unified.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{100_stored_fields.yaml => 100_stored_fields.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{10_source_filtering.yaml => 10_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{110_field_collapsing.yaml => 110_field_collapsing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{120_batch_reduce_size.yaml => 120_batch_reduce_size.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{20_default_values.yaml => 20_default_values.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{30_limits.yaml => 30_limits.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{40_indices_boost.yaml => 40_indices_boost.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{60_query_string.yaml => 60_query_string.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{70_response_filtering.yaml => 70_response_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{80_indices_options.yaml => 80_indices_options.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{90_search_after.yaml => 90_search_after.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{issue4895.yaml => issue4895.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search/{issue9606.yaml => issue9606.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.status/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/suggest/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/suggest/{20_completion.yaml => 20_completion.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/suggest/{30_context.yaml => 30_context.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/suggest/{40_typed_keys.yaml => 40_typed_keys.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/tasks.cancel/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/{10_basic.yaml => 10_basic.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/{20_issue7121.yaml => 20_issue7121.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/{30_realtime.yaml => 30_realtime.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/{40_versions.yaml => 40_versions.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{10_doc.yaml => 10_doc.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{11_shard_header.yaml => 11_shard_header.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{12_result.yaml => 12_result.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{20_doc_upsert.yaml => 20_doc_upsert.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{22_doc_as_upsert.yaml => 22_doc_as_upsert.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{30_internal_version.yaml => 30_internal_version.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{35_other_versions.yaml => 35_other_versions.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{40_routing.yaml => 40_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{50_parent.yaml => 50_parent.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{55_parent_with_routing.yaml => 55_parent_with_routing.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{60_refresh.yaml => 60_refresh.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{80_source_filtering.yaml => 80_source_filtering.yml} (100%)
 rename rest-api-spec/src/main/resources/rest-api-spec/test/update/{85_fields_meta.yaml => 85_fields_meta.yml} (100%)
 rename test/framework/src/test/resources/rest-api-spec/test/suite1/{10_basic.yaml => 10_basic.yml} (100%)
 rename test/framework/src/test/resources/rest-api-spec/test/suite1/{20_another_test.yaml => 20_another_test.yml} (100%)
 rename test/framework/src/test/resources/rest-api-spec/test/suite2/{10_basic.yaml => 10_basic.yml} (100%)
 rename test/framework/src/test/resources/rest-api-spec/test/suite2/{15_test2.yaml => 15_test2.yml} (100%)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
index af637267d11..60e50a97ad0 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy
@@ -296,7 +296,7 @@ public class RestTestsFromSnippetsTask extends SnippetsTask {
             Path dest = outputRoot().toPath().resolve(test.path)
             // Replace the extension
             String fileName = dest.getName(dest.nameCount - 1)
-            dest = dest.parent.resolve(fileName.replace('.asciidoc', '.yaml'))
+            dest = dest.parent.resolve(fileName.replace('.asciidoc', '.yml'))
 
             // Now setup the writer
             Files.createDirectories(dest.parent)
diff --git a/distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml b/distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
similarity index 100%
rename from distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml
rename to distribution/deb/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
diff --git a/distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml b/distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
similarity index 100%
rename from distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml
rename to distribution/rpm/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
diff --git a/distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml b/distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
similarity index 100%
rename from distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml
rename to distribution/tar/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
index 67ccfd210a0..e631ee31a24 100644
--- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
+++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java
@@ -535,7 +535,7 @@ public class InstallPluginCommandTests extends ESTestCase {
         Path pluginDir = createPluginDir(temp);
         Path configDir = pluginDir.resolve("config");
         Files.createDirectory(configDir);
-        Files.createFile(configDir.resolve("custom.yaml"));
+        Files.createFile(configDir.resolve("custom.yml"));
         String pluginZip = createPluginUrl("fake", pluginDir);
         installPlugin(pluginZip, env.v1());
         assertPlugin("fake", pluginDir, env.v2());
@@ -545,19 +545,19 @@ public class InstallPluginCommandTests extends ESTestCase {
         Tuple<Path, Environment> env = createEnv(fs, temp);
         Path envConfigDir = env.v2().configFile().resolve("fake");
         Files.createDirectories(envConfigDir);
-        Files.write(envConfigDir.resolve("custom.yaml"), "existing config".getBytes(StandardCharsets.UTF_8));
+        Files.write(envConfigDir.resolve("custom.yml"), "existing config".getBytes(StandardCharsets.UTF_8));
         Path pluginDir = createPluginDir(temp);
         Path configDir = pluginDir.resolve("config");
         Files.createDirectory(configDir);
-        Files.write(configDir.resolve("custom.yaml"), "new config".getBytes(StandardCharsets.UTF_8));
-        Files.createFile(configDir.resolve("other.yaml"));
+        Files.write(configDir.resolve("custom.yml"), "new config".getBytes(StandardCharsets.UTF_8));
+        Files.createFile(configDir.resolve("other.yml"));
         String pluginZip = createPluginUrl("fake", pluginDir);
         installPlugin(pluginZip, env.v1());
         assertPlugin("fake", pluginDir, env.v2());
-        List<String> configLines = Files.readAllLines(envConfigDir.resolve("custom.yaml"), StandardCharsets.UTF_8);
+        List<String> configLines = Files.readAllLines(envConfigDir.resolve("custom.yml"), StandardCharsets.UTF_8);
         assertEquals(1, configLines.size());
         assertEquals("existing config", configLines.get(0));
-        assertTrue(Files.exists(envConfigDir.resolve("other.yaml")));
+        assertTrue(Files.exists(envConfigDir.resolve("other.yml")));
     }
 
     public void testConfigNotDir() throws Exception {
diff --git a/distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml b/distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
similarity index 100%
rename from distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yaml
rename to distribution/zip/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_modules.yml
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yaml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml
similarity index 100%
rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yaml
rename to modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yaml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml
similarity index 100%
rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yaml
rename to modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yaml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml
similarity index 100%
rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yaml
rename to modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml
diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yaml b/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml
similarity index 100%
rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yaml
rename to modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yaml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml
similarity index 100%
rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yaml
rename to modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yaml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
similarity index 100%
rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yaml
rename to modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yaml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
similarity index 100%
rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yaml
rename to modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yaml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
similarity index 100%
rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yaml
rename to modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml
diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yaml b/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yml
similarity index 100%
rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yaml
rename to modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yml
diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yaml b/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yml
similarity index 100%
rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yaml
rename to modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yml
diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yaml b/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml
similarity index 100%
rename from modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yaml
rename to modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml
diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yaml b/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml
similarity index 100%
rename from modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yaml
rename to modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml
diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yaml b/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml
similarity index 100%
rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yaml
rename to modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml
diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yaml b/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml
similarity index 100%
rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yaml
rename to modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml
diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/10_basic.yaml b/modules/parent-join/src/test/resources/rest-api-spec/test/10_basic.yml
similarity index 100%
rename from modules/parent-join/src/test/resources/rest-api-spec/test/10_basic.yaml
rename to modules/parent-join/src/test/resources/rest-api-spec/test/10_basic.yml
diff --git a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yaml b/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
similarity index 100%
rename from modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yaml
rename to modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/30_by_type.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/30_by_type.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/30_by_type.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/30_by_type.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yml
diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yaml b/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yml
similarity index 100%
rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yaml
rename to modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yml
diff --git a/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yaml b/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml
similarity index 100%
rename from modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yaml
rename to modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml
diff --git a/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yaml b/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yml
similarity index 100%
rename from modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yaml
rename to modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yml
diff --git a/modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yaml b/modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml
similarity index 100%
rename from modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yaml
rename to modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml
diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
similarity index 100%
rename from plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
rename to plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yml
diff --git a/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yaml b/plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yml
similarity index 100%
rename from plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yaml
rename to plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yml
diff --git a/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml b/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yml
similarity index 100%
rename from plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
rename to plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yml
diff --git a/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yaml b/plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yml
similarity index 100%
rename from plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yaml
rename to plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yml
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yml
similarity index 100%
rename from plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
rename to plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yml
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yml
similarity index 100%
rename from plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
rename to plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yml
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yml
similarity index 100%
rename from plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
rename to plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yml
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yml
similarity index 100%
rename from plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yaml
rename to plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yml
diff --git a/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml b/plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yml
similarity index 100%
rename from plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yaml
rename to plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/50_daitch_mokotoff.yml
diff --git a/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml b/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yml
similarity index 100%
rename from plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
rename to plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yml
diff --git a/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yaml b/plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yml
similarity index 100%
rename from plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yaml
rename to plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yml
diff --git a/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml b/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yml
similarity index 100%
rename from plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
rename to plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yml
diff --git a/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yaml b/plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yml
similarity index 100%
rename from plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yaml
rename to plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yml
diff --git a/plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/10_basic.yaml b/plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/10_basic.yml
similarity index 100%
rename from plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/10_basic.yaml
rename to plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/10_basic.yml
diff --git a/plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yaml b/plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yml
similarity index 100%
rename from plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yaml
rename to plugins/analysis-ukrainian/src/test/resources/rest-api-spec/test/analysis_ukrainian/20_search.yml
diff --git a/plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yaml b/plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
similarity index 100%
rename from plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yaml
rename to plugins/discovery-azure-classic/src/test/resources/rest-api-spec/test/discovery_azure_classic/10_basic.yml
diff --git a/plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yaml b/plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
similarity index 100%
rename from plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yaml
rename to plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yml
diff --git a/plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/10_basic.yaml b/plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/10_basic.yml
similarity index 100%
rename from plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/10_basic.yaml
rename to plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/10_basic.yml
diff --git a/plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yaml b/plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yml
similarity index 100%
rename from plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yaml
rename to plugins/discovery-gce/src/test/resources/rest-api-spec/test/discovery_gce/10_basic.yml
diff --git a/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yaml b/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
similarity index 100%
rename from plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yaml
rename to plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/10_basic.yml
diff --git a/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/20_score.yaml b/plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/20_score.yml
similarity index 100%
rename from plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/20_score.yaml
rename to plugins/examples/script-expert-scoring/src/test/resources/rest-api-spec/test/script_expert_scoring/20_score.yml
diff --git a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yaml b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
similarity index 100%
rename from plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yaml
rename to plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/10_basic.yml
diff --git a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yaml b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml
similarity index 100%
rename from plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yaml
rename to plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/20_attachment_processor.yml
diff --git a/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml b/plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml
similarity index 100%
rename from plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yaml
rename to plugins/ingest-attachment/src/test/resources/rest-api-spec/test/ingest_attachment/30_files_supported.yml
diff --git a/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yaml b/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml
similarity index 100%
rename from plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yaml
rename to plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml
diff --git a/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yaml b/plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml
similarity index 100%
rename from plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yaml
rename to plugins/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml
diff --git a/plugins/ingest-user-agent/build.gradle b/plugins/ingest-user-agent/build.gradle
index 2b2669a4004..b78e8aa4c9d 100644
--- a/plugins/ingest-user-agent/build.gradle
+++ b/plugins/ingest-user-agent/build.gradle
@@ -23,5 +23,5 @@ esplugin {
 }
 
 integTestCluster {
-  extraConfigFile 'ingest-user-agent/test-regexes.yaml', 'test/test-regexes.yaml'
+  extraConfigFile 'ingest-user-agent/test-regexes.yml', 'test/test-regexes.yml'
 }
diff --git a/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/IngestUserAgentPlugin.java b/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/IngestUserAgentPlugin.java
index ce82d6e1c4d..899b3eb721c 100644
--- a/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/IngestUserAgentPlugin.java
+++ b/plugins/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/IngestUserAgentPlugin.java
@@ -65,11 +65,11 @@ public class IngestUserAgentPlugin extends Plugin implements IngestPlugin {
         Map<String, UserAgentParser> userAgentParsers = new HashMap<>();
 
         UserAgentParser defaultParser = new UserAgentParser(DEFAULT_PARSER_NAME,
-                IngestUserAgentPlugin.class.getResourceAsStream("/regexes.yaml"), cache);
+                IngestUserAgentPlugin.class.getResourceAsStream("/regexes.yml"), cache);
         userAgentParsers.put(DEFAULT_PARSER_NAME, defaultParser);
 
         if (Files.exists(userAgentConfigDirectory) && Files.isDirectory(userAgentConfigDirectory)) {
-            PathMatcher pathMatcher = userAgentConfigDirectory.getFileSystem().getPathMatcher("glob:**.yaml");
+            PathMatcher pathMatcher = userAgentConfigDirectory.getFileSystem().getPathMatcher("glob:**.yml");
 
             try (Stream<Path> regexFiles = Files.find(userAgentConfigDirectory, 1,
                     (path, attr) -> attr.isRegularFile() && pathMatcher.matches(path))) {
diff --git a/plugins/ingest-user-agent/src/main/resources/regexes.yaml b/plugins/ingest-user-agent/src/main/resources/regexes.yml
similarity index 100%
rename from plugins/ingest-user-agent/src/main/resources/regexes.yaml
rename to plugins/ingest-user-agent/src/main/resources/regexes.yml
diff --git a/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorFactoryTests.java b/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorFactoryTests.java
index 4e0d0fb3695..d9c6fc17620 100644
--- a/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorFactoryTests.java
+++ b/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorFactoryTests.java
@@ -46,7 +46,7 @@ public class UserAgentProcessorFactoryTests extends ESTestCase {
 
     private static Map<String, UserAgentParser> userAgentParsers;
 
-    private static String regexWithoutDevicesFilename = "regexes_without_devices.yaml";
+    private static String regexWithoutDevicesFilename = "regexes_without_devices.yml";
     private static Path userAgentConfigDir;
 
     @BeforeClass
@@ -57,7 +57,7 @@ public class UserAgentProcessorFactoryTests extends ESTestCase {
 
         // Copy file, leaving out the device parsers at the end
         try (BufferedReader reader = new BufferedReader(
-                new InputStreamReader(UserAgentProcessor.class.getResourceAsStream("/regexes.yaml"), StandardCharsets.UTF_8));
+                new InputStreamReader(UserAgentProcessor.class.getResourceAsStream("/regexes.yml"), StandardCharsets.UTF_8));
                 BufferedWriter writer = Files.newBufferedWriter(userAgentConfigDir.resolve(regexWithoutDevicesFilename));) {
             String line;
             while ((line = reader.readLine()) != null) {
@@ -143,10 +143,10 @@ public class UserAgentProcessorFactoryTests extends ESTestCase {
 
         Map<String, Object> config = new HashMap<>();
         config.put("field", "_field");
-        config.put("regex_file", "does-not-exist.yaml");
+        config.put("regex_file", "does-not-exist.yml");
 
         ElasticsearchParseException e = expectThrows(ElasticsearchParseException.class, () -> factory.create(null, null, config));
-        assertThat(e.getMessage(), equalTo("[regex_file] regex file [does-not-exist.yaml] doesn't exist (has to exist at node startup)"));
+        assertThat(e.getMessage(), equalTo("[regex_file] regex file [does-not-exist.yml] doesn't exist (has to exist at node startup)"));
     }
 
     public void testBuildFields() throws Exception {
diff --git a/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorTests.java b/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorTests.java
index 92e94434ccd..020daa5a1c7 100644
--- a/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorTests.java
+++ b/plugins/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorTests.java
@@ -42,7 +42,7 @@ public class UserAgentProcessorTests extends ESTestCase {
 
     @BeforeClass
     public static void setupProcessor() throws IOException {
-        InputStream regexStream = UserAgentProcessor.class.getResourceAsStream("/regexes.yaml");
+        InputStream regexStream = UserAgentProcessor.class.getResourceAsStream("/regexes.yml");
         assertNotNull(regexStream);
 
         UserAgentParser parser = new UserAgentParser(randomAlphaOfLength(10), regexStream, new UserAgentCache(1000));
diff --git a/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yaml b/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml
similarity index 100%
rename from plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yaml
rename to plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml
diff --git a/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yaml b/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml
similarity index 100%
rename from plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yaml
rename to plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml
diff --git a/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yaml b/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml
similarity index 95%
rename from plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yaml
rename to plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml
index 5613145b664..5a6cd8f7a86 100644
--- a/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yaml
+++ b/plugins/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml
@@ -10,7 +10,7 @@
               {
                 "user_agent" : {
                   "field": "field1",
-                  "regex_file": "test-regexes.yaml"  
+                  "regex_file": "test-regexes.yml"
                 }
               }
             ]
diff --git a/plugins/ingest-user-agent/test/test-regexes.yaml b/plugins/ingest-user-agent/test/test-regexes.yml
similarity index 100%
rename from plugins/ingest-user-agent/test/test-regexes.yaml
rename to plugins/ingest-user-agent/test/test-regexes.yml
diff --git a/plugins/jvm-example/src/main/config/example.yaml b/plugins/jvm-example/src/main/config/example.yml
similarity index 100%
rename from plugins/jvm-example/src/main/config/example.yaml
rename to plugins/jvm-example/src/main/config/example.yml
diff --git a/plugins/jvm-example/src/main/java/org/elasticsearch/plugin/example/ExamplePluginConfiguration.java b/plugins/jvm-example/src/main/java/org/elasticsearch/plugin/example/ExamplePluginConfiguration.java
index de8cb091156..802c2fc67a6 100644
--- a/plugins/jvm-example/src/main/java/org/elasticsearch/plugin/example/ExamplePluginConfiguration.java
+++ b/plugins/jvm-example/src/main/java/org/elasticsearch/plugin/example/ExamplePluginConfiguration.java
@@ -38,7 +38,7 @@ public class ExamplePluginConfiguration {
 
     public ExamplePluginConfiguration(Environment env) {
         // The directory part of the location matches the artifactId of this plugin
-        Path path = env.configFile().resolve("jvm-example/example.yaml");
+        Path path = env.configFile().resolve("jvm-example/example.yml");
         try {
             customSettings = Settings.builder().loadFromPath(path).build();
         } catch (IOException e) {
diff --git a/plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yaml b/plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yml
similarity index 100%
rename from plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yaml
rename to plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yml
diff --git a/plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yaml b/plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yml
similarity index 100%
rename from plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yaml
rename to plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yml
diff --git a/plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yaml b/plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yml
similarity index 100%
rename from plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yaml
rename to plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yml
diff --git a/plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yaml b/plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yml
similarity index 100%
rename from plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yaml
rename to plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yml
diff --git a/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yaml b/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yml
similarity index 100%
rename from plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yaml
rename to plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/10_basic.yml
diff --git a/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/20_repository.yaml b/plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/20_repository.yml
similarity index 100%
rename from plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/20_repository.yaml
rename to plugins/repository-azure/src/test/resources/rest-api-spec/test/repository_azure/20_repository.yml
diff --git a/plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yaml b/plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yml
similarity index 100%
rename from plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yaml
rename to plugins/repository-gcs/src/test/resources/rest-api-spec/test/repository_gcs/10_basic.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/10_basic.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_create.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_create.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_create.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_create.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_delete.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_delete.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_delete.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_delete.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_verify.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_verify.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_verify.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/20_repository_verify.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot_get.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot_get.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot_get.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/30_snapshot_get.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/hdfs_repository/40_restore.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/10_basic.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yaml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
similarity index 100%
rename from plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yaml
rename to plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
diff --git a/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yaml b/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yml
similarity index 100%
rename from plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yaml
rename to plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yml
diff --git a/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yaml b/plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yml
similarity index 100%
rename from plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yaml
rename to plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yml
diff --git a/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yaml b/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yml
similarity index 100%
rename from plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yaml
rename to plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/10_basic.yml
diff --git a/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/15_index_creation.yaml b/plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/15_index_creation.yml
similarity index 100%
rename from plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/15_index_creation.yaml
rename to plugins/store-smb/src/test/resources/rest-api-spec/test/store_smb/15_index_creation.yml
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yaml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml
similarity index 100%
rename from qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yaml
rename to qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/10_basic.yml
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yaml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
similarity index 100%
rename from qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yaml
rename to qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/20_info.yml
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yaml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml
similarity index 100%
rename from qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yaml
rename to qa/multi-cluster-search/src/test/resources/rest-api-spec/test/multi_cluster/30_field_caps.yml
diff --git a/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yaml b/qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml
similarity index 100%
rename from qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yaml
rename to qa/multi-cluster-search/src/test/resources/rest-api-spec/test/remote_cluster/10_basic.yml
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml
similarity index 100%
rename from qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yaml
rename to qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml
similarity index 100%
rename from qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yaml
rename to qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml
diff --git a/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml b/qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml
similarity index 100%
rename from qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yaml
rename to qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml
diff --git a/qa/smoke-test-ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml b/qa/smoke-test-ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yml
similarity index 100%
rename from qa/smoke-test-ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yaml
rename to qa/smoke-test-ingest-disabled/src/test/resources/rest-api-spec/test/ingest_mustache/10_ingest_disabled.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/10_pipeline_with_mustache_templates.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/10_pipeline_with_mustache_templates.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/10_pipeline_with_mustache_templates.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/10_pipeline_with_mustache_templates.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/20_combine_processors.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/30_update_by_query_with_ingest.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/30_update_by_query_with_ingest.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/30_update_by_query_with_ingest.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/30_update_by_query_with_ingest.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/40_reindex_with_ingest.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/40_reindex_with_ingest.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/40_reindex_with_ingest.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/40_reindex_with_ingest.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/50_script_processor_using_painless.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/50_script_processor_using_painless.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/50_script_processor_using_painless.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/50_script_processor_using_painless.yml
diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yaml b/qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml
similarity index 100%
rename from qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yaml
rename to qa/smoke-test-ingest-with-all-dependencies/src/test/resources/rest-api-spec/test/ingest/60_pipeline_timestamp_date_mapping.yml
diff --git a/qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yaml b/qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yml
similarity index 100%
rename from qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yaml
rename to qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yml
diff --git a/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml b/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml
similarity index 100%
rename from qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
rename to qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/10_script.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/10_script.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/10_script.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/10_script.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/20_broken.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/20_broken.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/20_broken.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/20_broken.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/30_timeout.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/30_timeout.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/30_timeout.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/30_timeout.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/40_search_failures.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/40_search_failures.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/40_search_failures.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/40_search_failures.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/50_reindex_with_parentchild.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/50_reindex_with_parentchild.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/50_reindex_with_parentchild.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/reindex/50_reindex_with_parentchild.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/10_script.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/10_script.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/10_script.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/10_script.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/20_broken.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/30_timeout.yml
diff --git a/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yaml b/qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yml
similarity index 100%
rename from qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yaml
rename to qa/smoke-test-reindex-with-all-modules/src/test/resources/rest-api-spec/test/update_by_query/40_search_failure.yml
diff --git a/qa/smoke-test-tribe-node/src/test/resources/rest-api-spec/test/tribe/10_basic.yaml b/qa/smoke-test-tribe-node/src/test/resources/rest-api-spec/test/tribe/10_basic.yml
similarity index 100%
rename from qa/smoke-test-tribe-node/src/test/resources/rest-api-spec/test/tribe/10_basic.yaml
rename to qa/smoke-test-tribe-node/src/test/resources/rest-api-spec/test/tribe/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/bulk/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/bulk/20_list_of_strings.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/bulk/30_big_string.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/bulk/40_source.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/bulk/50_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/20_headers.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/30_json.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.plugins/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.plugins/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.plugins/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.plugins/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.recovery/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.repositories/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.segments/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.snapshots/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.tasks/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.tasks/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.tasks/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.tasks/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.templates/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cat.thread_pool/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.allocation_explain/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/20_request_timeout.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/20_request_timeout.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/20_request_timeout.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.health/20_request_timeout.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.pending_tasks/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.pending_tasks/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.pending_tasks/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.pending_tasks/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/11_explain.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/11_explain.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/11_explain.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/11_explain.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/20_response_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/20_response_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/20_response_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.reroute/20_response_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/20_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.state/30_expand_wildcards.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/count/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/count/20_query_string.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/10_with_id.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/15_without_id.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/30_internal_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/35_external_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/50_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/50_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/50_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/50_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/create/60_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/11_shard_header.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/12_result.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_internal_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_internal_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_internal_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/20_internal_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/25_external_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/26_external_gte_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/30_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/40_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/40_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/40_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/40_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/45_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/45_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/45_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/45_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/50_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/delete/60_missing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/30_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/60_realtime_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/exists/70_defaults.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/explain/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/explain/20_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/explain/30_query_string.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/field_caps/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/field_stats/10_basics.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/field_stats/10_basics.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/field_stats/10_basics.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/field_stats/10_basics.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/15_default_values.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/20_stored_fields.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/30_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/50_with_headers.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/60_realtime_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/80_missing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get/90_versions.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/15_default_values.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/30_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/60_realtime_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/70_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/80_missing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/get_source/85_source_missing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/10_with_id.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/12_result.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/15_without_id.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/20_optype.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_internal_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/30_internal_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/30_internal_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/30_internal_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/35_external_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/36_external_gte_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/50_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/50_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/50_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/50_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/index/60_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.analyze/10_analyze.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.clear_cache/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.create/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/all_path_options.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/20_read_only_index.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/20_read_only_index.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/20_read_only_index.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists/20_read_only_index.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_alias/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_alias/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_alias/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_alias/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_template/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.exists_type/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.flush/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.forcemerge/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/20_empty.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/20_empty.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/20_empty.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/20_empty.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/30_missing_type.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/40_missing_index.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/50_field_wildcards.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/20_missing_type.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/30_missing_index.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/40_aliases.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/40_aliases.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/40_aliases.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/40_aliases.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/50_wildcard_expansion.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/60_empty.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/60_empty.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/60_empty.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_mapping/60_empty.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/20_aliases.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/20_aliases.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/20_aliases.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_settings/20_aliases.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/20_get_missing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/20_get_missing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/20_get_missing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_template/20_get_missing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.open/20_multiple_indices.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_alias/all_path_options.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_mapping/all_path_options.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/11_reset.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/11_reset.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/11_reset.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/11_reset.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/all_path_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/all_path_options.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/all_path_options.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_settings/all_path_options.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.put_template/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.recovery/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.refresh/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.refresh/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.refresh/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.refresh/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.rollover/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.segments/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shard_stores/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shard_stores/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.shard_stores/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.shard_stores/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.shrink/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.sort/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/10_index.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/11_metric.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/12_level.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/12_level.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/12_level.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/12_level.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/13_fields.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/13_fields.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/13_fields.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/13_fields.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/14_groups.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/14_groups.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/14_groups.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/14_groups.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/15_types.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/15_types.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/15_types.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.stats/15_types.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/20_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/20_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/20_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/20_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/30_remove_index_and_replace_with_alias.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/30_remove_index_and_replace_with_alias.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/30_remove_index_and_replace_with_alias.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.update_aliases/30_remove_index_and_replace_with_alias.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.upgrade/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/20_query_string.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/info/10_info.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/info/10_info.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/info/10_info.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/info/10_info.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/info/20_lucene_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/info/20_lucene_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/info/20_lucene_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/info/20_lucene_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/ingest/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/11_default_index_type.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/11_default_index_type.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/11_default_index_type.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/11_default_index_type.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/12_non_existent_index.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/13_missing_metadata.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/14_alias_to_multiple_indices.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/15_ids.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/20_stored_fields.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/30_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/30_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/30_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/30_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/60_realtime_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mget/70_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mlt/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mlt/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/20_docs.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/20_docs.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mlt/20_docs.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mlt/20_docs.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/30_unlike.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mlt/30_unlike.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mlt/30_unlike.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mlt/30_unlike.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/msearch/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/11_status.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/11_status.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/msearch/11_status.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/msearch/11_status.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/msearch/20_typed_keys.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/mtermvectors/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/20_transport.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/20_transport.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/20_transport.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/20_transport.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/30_settings.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/30_settings.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/30_settings.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.info/30_settings.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/20_response_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/20_response_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/20_response_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/20_response_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/30_discovery.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/30_discovery.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/30_discovery.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/nodes.stats/30_discovery.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/ping/10_ping.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/ping/10_ping.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/ping/10_ping.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/ping/10_ping.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/remote.info/10_info.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/scroll/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/scroll/11_clear.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/scroll/12_slices.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/10_histogram.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/20_terms.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/30_sig_terms.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/50_filter.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/70_adjacency_matrix.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/80_typed_keys.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/10_unified.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search.inner_hits/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/100_stored_fields.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/100_stored_fields.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/100_stored_fields.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/100_stored_fields.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/120_batch_reduce_size.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/20_default_values.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/30_limits.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/40_indices_boost.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/60_query_string.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/60_query_string.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/60_query_string.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/60_query_string.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/70_response_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/70_response_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/70_response_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/70_response_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/80_indices_options.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/90_search_after.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/issue4895.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search/issue9606.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/search_shards/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.create/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.get_repository/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.restore/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.status/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.status/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.status/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/snapshot.status/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/suggest/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/suggest/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/suggest/40_typed_keys.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.cancel/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.cancel/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/tasks.cancel/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/tasks.cancel/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/tasks.get/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/10_basic.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/20_issue7121.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/30_realtime.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/40_versions.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/40_versions.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/40_versions.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/termvectors/40_versions.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/10_doc.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/11_shard_header.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/12_result.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/20_doc_upsert.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/22_doc_as_upsert.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/30_internal_version.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_other_versions.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/35_other_versions.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/35_other_versions.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/35_other_versions.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/40_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/50_parent.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/55_parent_with_routing.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/60_refresh.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/80_source_filtering.yml
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/update/85_fields_meta.yaml b/rest-api-spec/src/main/resources/rest-api-spec/test/update/85_fields_meta.yml
similarity index 100%
rename from rest-api-spec/src/main/resources/rest-api-spec/test/update/85_fields_meta.yaml
rename to rest-api-spec/src/main/resources/rest-api-spec/test/update/85_fields_meta.yml
diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
index 17ecff32653..28bfa80cf27 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java
@@ -171,7 +171,7 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
     public static Iterable<Object[]> createParameters() throws Exception {
         String[] paths = resolvePathsProperty(REST_TESTS_SUITE, ""); // default to all tests under the test root
         List<Object[]> tests = new ArrayList<>();
-        Map<String, Set<Path>> yamlSuites = loadYamlSuites(paths);
+        Map<String, Set<Path>> yamlSuites = loadSuites(paths);
         // yaml suites are grouped by directory (effectively by api)
         for (String api : yamlSuites.keySet()) {
             List<Path> yamlFiles = new ArrayList<>(yamlSuites.get(api));
@@ -191,28 +191,28 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase {
 
     /** Find all yaml suites that match the given list of paths from the root test path. */
     // pkg private for tests
-    static Map<String, Set<Path>> loadYamlSuites(String... paths) throws Exception {
+    static Map<String, Set<Path>> loadSuites(String... paths) throws Exception {
         Map<String, Set<Path>> files = new HashMap<>();
         Path root = PathUtils.get(ESClientYamlSuiteTestCase.class.getResource(TESTS_PATH).toURI());
         for (String strPath : paths) {
             Path path = root.resolve(strPath);
             if (Files.isDirectory(path)) {
                 Files.walk(path).forEach(file -> {
-                    if (file.toString().endsWith(".yaml")) {
-                        addYamlSuite(root, file, files);
+                    if (file.toString().endsWith(".yml")) {
+                        addSuite(root, file, files);
                     }
                 });
             } else {
-                path = root.resolve(strPath + ".yaml");
+                path = root.resolve(strPath + ".yml");
                 assert Files.exists(path);
-                addYamlSuite(root, path, files);
+                addSuite(root, path, files);
             }
         }
         return files;
     }
 
     /** Add a single suite file to the set of suites. */
-    private static void addYamlSuite(Path root, Path file, Map<String, Set<Path>> files) {
+    private static void addSuite(Path root, Path file, Map<String, Set<Path>> files) {
         String groupName = root.relativize(file.getParent()).toString();
         Set<Path> filesSet = files.get(groupName);
         if (filesSet == null) {
diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java
index ee76ad351a6..ae64dbc893d 100644
--- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java
+++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java
@@ -32,29 +32,29 @@ import static org.hamcrest.Matchers.greaterThan;
 public class ESClientYamlSuiteTestCaseTests extends ESTestCase {
 
     public void testLoadAllYamlSuites() throws Exception {
-        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("");
+        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadSuites("");
         assertEquals(2, yamlSuites.size());
     }
 
     public void testLoadSingleYamlSuite() throws Exception {
-        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("suite1/10_basic");
-        assertSingleFile(yamlSuites, "suite1", "10_basic.yaml");
+        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1/10_basic");
+        assertSingleFile(yamlSuites, "suite1", "10_basic.yml");
 
         //extension .yaml is optional
-        yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("suite1/10_basic");
-        assertSingleFile(yamlSuites, "suite1", "10_basic.yaml");
+        yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1/10_basic");
+        assertSingleFile(yamlSuites, "suite1", "10_basic.yml");
     }
 
     public void testLoadMultipleYamlSuites() throws Exception {
         //single directory
-        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("suite1");
+        Map<String,Set<Path>> yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1");
         assertThat(yamlSuites, notNullValue());
         assertThat(yamlSuites.size(), equalTo(1));
         assertThat(yamlSuites.containsKey("suite1"), equalTo(true));
         assertThat(yamlSuites.get("suite1").size(), greaterThan(1));
 
         //multiple directories
-        yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("suite1", "suite2");
+        yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1", "suite2");
         assertThat(yamlSuites, notNullValue());
         assertThat(yamlSuites.size(), equalTo(2));
         assertThat(yamlSuites.containsKey("suite1"), equalTo(true));
@@ -63,18 +63,18 @@ public class ESClientYamlSuiteTestCaseTests extends ESTestCase {
         assertEquals(2, yamlSuites.get("suite2").size());
 
         //multiple paths, which can be both directories or yaml test suites (with optional file extension)
-        yamlSuites = ESClientYamlSuiteTestCase.loadYamlSuites("suite2/10_basic", "suite1");
+        yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite2/10_basic", "suite1");
         assertThat(yamlSuites, notNullValue());
         assertThat(yamlSuites.size(), equalTo(2));
         assertThat(yamlSuites.containsKey("suite2"), equalTo(true));
         assertThat(yamlSuites.get("suite2").size(), equalTo(1));
-        assertSingleFile(yamlSuites.get("suite2"), "suite2", "10_basic.yaml");
+        assertSingleFile(yamlSuites.get("suite2"), "suite2", "10_basic.yml");
         assertThat(yamlSuites.containsKey("suite1"), equalTo(true));
         assertThat(yamlSuites.get("suite1").size(), greaterThan(1));
 
         //files can be loaded from classpath and from file system too
         Path dir = createTempDir();
-        Path file = dir.resolve("test_loading.yaml");
+        Path file = dir.resolve("test_loading.yml");
         Files.createFile(file);
     }
 
diff --git a/test/framework/src/test/resources/rest-api-spec/test/suite1/10_basic.yaml b/test/framework/src/test/resources/rest-api-spec/test/suite1/10_basic.yml
similarity index 100%
rename from test/framework/src/test/resources/rest-api-spec/test/suite1/10_basic.yaml
rename to test/framework/src/test/resources/rest-api-spec/test/suite1/10_basic.yml
diff --git a/test/framework/src/test/resources/rest-api-spec/test/suite1/20_another_test.yaml b/test/framework/src/test/resources/rest-api-spec/test/suite1/20_another_test.yml
similarity index 100%
rename from test/framework/src/test/resources/rest-api-spec/test/suite1/20_another_test.yaml
rename to test/framework/src/test/resources/rest-api-spec/test/suite1/20_another_test.yml
diff --git a/test/framework/src/test/resources/rest-api-spec/test/suite2/10_basic.yaml b/test/framework/src/test/resources/rest-api-spec/test/suite2/10_basic.yml
similarity index 100%
rename from test/framework/src/test/resources/rest-api-spec/test/suite2/10_basic.yaml
rename to test/framework/src/test/resources/rest-api-spec/test/suite2/10_basic.yml
diff --git a/test/framework/src/test/resources/rest-api-spec/test/suite2/15_test2.yaml b/test/framework/src/test/resources/rest-api-spec/test/suite2/15_test2.yml
similarity index 100%
rename from test/framework/src/test/resources/rest-api-spec/test/suite2/15_test2.yaml
rename to test/framework/src/test/resources/rest-api-spec/test/suite2/15_test2.yml