diff --git a/test/intl402/Collator/10.1_L15.js b/test/intl402/Collator/builtin.js
similarity index 100%
rename from test/intl402/Collator/10.1_L15.js
rename to test/intl402/Collator/builtin.js
diff --git a/test/intl402/Collator/10.2.3_b.js b/test/intl402/Collator/ignore-invalid-unicode-ext-values.js
similarity index 100%
rename from test/intl402/Collator/10.2.3_b.js
rename to test/intl402/Collator/ignore-invalid-unicode-ext-values.js
diff --git a/test/intl402/Collator/10.4_a.js b/test/intl402/Collator/instance-class.js
similarity index 100%
rename from test/intl402/Collator/10.4_a.js
rename to test/intl402/Collator/instance-class.js
diff --git a/test/intl402/Collator/10.1.3.js b/test/intl402/Collator/instance-proto-and-extensible.js
similarity index 100%
rename from test/intl402/Collator/10.1.3.js
rename to test/intl402/Collator/instance-proto-and-extensible.js
diff --git a/test/intl402/Collator/10.1.1_a.js b/test/intl402/Collator/legacy-regexp-statics-not-modified.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_a.js
rename to test/intl402/Collator/legacy-regexp-statics-not-modified.js
diff --git a/test/intl402/Collator/9.2.5_11_g_ii_2.js b/test/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
similarity index 100%
rename from test/intl402/Collator/9.2.5_11_g_ii_2.js
rename to test/intl402/Collator/missing-unicode-ext-value-defaults-to-true.js
diff --git a/test/intl402/Collator/10.1.1_19_c.js b/test/intl402/Collator/numeric-and-caseFirst.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_19_c.js
rename to test/intl402/Collator/numeric-and-caseFirst.js
diff --git a/test/intl402/Collator/prototype/10.3_L15.js b/test/intl402/Collator/prototype/builtin.js
similarity index 100%
rename from test/intl402/Collator/prototype/10.3_L15.js
rename to test/intl402/Collator/prototype/builtin.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_1_c.js b/test/intl402/Collator/prototype/compare/bound-to-collator-instance.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_1_c.js
rename to test/intl402/Collator/prototype/compare/bound-to-collator-instance.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_L15.js b/test/intl402/Collator/prototype/compare/builtin.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_L15.js
rename to test/intl402/Collator/prototype/compare/builtin.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_CS_a.js b/test/intl402/Collator/prototype/compare/canonically-equivalent-strings.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_CS_a.js
rename to test/intl402/Collator/prototype/compare/canonically-equivalent-strings.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_1_a_L15.js b/test/intl402/Collator/prototype/compare/compare-function-builtin.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_1_a_L15.js
rename to test/intl402/Collator/prototype/compare/compare-function-builtin.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_CS_b_NN.js b/test/intl402/Collator/prototype/compare/non-normative-basic.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_CS_b_NN.js
rename to test/intl402/Collator/prototype/compare/non-normative-basic.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_CS_c_NN.js b/test/intl402/Collator/prototype/compare/non-normative-phonebook.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_CS_c_NN.js
rename to test/intl402/Collator/prototype/compare/non-normative-phonebook.js
diff --git a/test/intl402/Collator/prototype/compare/10.3.2_CS_d_NN.js b/test/intl402/Collator/prototype/compare/non-normative-sensitivity.js
similarity index 100%
rename from test/intl402/Collator/prototype/compare/10.3.2_CS_d_NN.js
rename to test/intl402/Collator/prototype/compare/non-normative-sensitivity.js
diff --git a/test/intl402/Collator/prototype/constructor/10.3.1.js b/test/intl402/Collator/prototype/constructor/value.js
similarity index 100%
rename from test/intl402/Collator/prototype/constructor/10.3.1.js
rename to test/intl402/Collator/prototype/constructor/value.js
diff --git a/test/intl402/Collator/prototype/10.2.1.js b/test/intl402/Collator/prototype/prop-desc.js
similarity index 100%
rename from test/intl402/Collator/prototype/10.2.1.js
rename to test/intl402/Collator/prototype/prop-desc.js
diff --git a/test/intl402/Collator/prototype/resolvedOptions/10.3.3.js b/test/intl402/Collator/prototype/resolvedOptions/basic.js
similarity index 100%
rename from test/intl402/Collator/prototype/resolvedOptions/10.3.3.js
rename to test/intl402/Collator/prototype/resolvedOptions/basic.js
diff --git a/test/intl402/Collator/prototype/resolvedOptions/10.3.3_L15.js b/test/intl402/Collator/prototype/resolvedOptions/builtin.js
similarity index 100%
rename from test/intl402/Collator/prototype/resolvedOptions/10.3.3_L15.js
rename to test/intl402/Collator/prototype/resolvedOptions/builtin.js
diff --git a/test/intl402/Collator/prototype/10.3_a.js b/test/intl402/Collator/prototype/this-value-collator-prototype.js
similarity index 100%
rename from test/intl402/Collator/prototype/10.3_a.js
rename to test/intl402/Collator/prototype/this-value-collator-prototype.js
diff --git a/test/intl402/Collator/prototype/10.3_b.js b/test/intl402/Collator/prototype/this-value-not-collator.js
similarity index 100%
rename from test/intl402/Collator/prototype/10.3_b.js
rename to test/intl402/Collator/prototype/this-value-not-collator.js
diff --git a/test/intl402/Collator/10.1.2_a.js b/test/intl402/Collator/subclassing.js
similarity index 100%
rename from test/intl402/Collator/10.1.2_a.js
rename to test/intl402/Collator/subclassing.js
diff --git a/test/intl402/Collator/supportedLocalesOf/10.2.2_a.js b/test/intl402/Collator/supportedLocalesOf/basic.js
similarity index 100%
rename from test/intl402/Collator/supportedLocalesOf/10.2.2_a.js
rename to test/intl402/Collator/supportedLocalesOf/basic.js
diff --git a/test/intl402/Collator/supportedLocalesOf/10.2.2_L15.js b/test/intl402/Collator/supportedLocalesOf/builtin.js
similarity index 100%
rename from test/intl402/Collator/supportedLocalesOf/10.2.2_L15.js
rename to test/intl402/Collator/supportedLocalesOf/builtin.js
diff --git a/test/intl402/Collator/supportedLocalesOf/10.2.2_b.js b/test/intl402/Collator/supportedLocalesOf/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/Collator/supportedLocalesOf/10.2.2_b.js
rename to test/intl402/Collator/supportedLocalesOf/taint-Object-prototype.js
diff --git a/test/intl402/Collator/10.1.1_10.js b/test/intl402/Collator/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_10.js
rename to test/intl402/Collator/taint-Object-prototype.js
diff --git a/test/intl402/Collator/10.1.1_23.js b/test/intl402/Collator/test-option-ignorePunctuation.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_23.js
rename to test/intl402/Collator/test-option-ignorePunctuation.js
diff --git a/test/intl402/Collator/10.1.1_11.js b/test/intl402/Collator/test-option-localeMatcher.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_11.js
rename to test/intl402/Collator/test-option-localeMatcher.js
diff --git a/test/intl402/Collator/10.1.1_13.js b/test/intl402/Collator/test-option-numeric-and-caseFirst.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_13.js
rename to test/intl402/Collator/test-option-numeric-and-caseFirst.js
diff --git a/test/intl402/Collator/10.1.1_20.js b/test/intl402/Collator/test-option-sensitivity.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_20.js
rename to test/intl402/Collator/test-option-sensitivity.js
diff --git a/test/intl402/Collator/10.1.1_6.js b/test/intl402/Collator/test-option-usage.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_6.js
rename to test/intl402/Collator/test-option-usage.js
diff --git a/test/intl402/Collator/10.1.1_1.js b/test/intl402/Collator/this-value-ignored.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_1.js
rename to test/intl402/Collator/this-value-ignored.js
diff --git a/test/intl402/Collator/10.1.1_19_b.js b/test/intl402/Collator/unicode-ext-value-collation.js
similarity index 100%
rename from test/intl402/Collator/10.1.1_19_b.js
rename to test/intl402/Collator/unicode-ext-value-collation.js
diff --git a/test/intl402/Date/prototype/13.3.0_7.js b/test/intl402/Date/prototype/returns-same-results-as-DateTimeFormat.js
similarity index 100%
rename from test/intl402/Date/prototype/13.3.0_7.js
rename to test/intl402/Date/prototype/returns-same-results-as-DateTimeFormat.js
diff --git a/test/intl402/Date/prototype/13.3.0_6_2.js b/test/intl402/Date/prototype/taint-Intl-DateTimeFormat.js
similarity index 100%
rename from test/intl402/Date/prototype/13.3.0_6_2.js
rename to test/intl402/Date/prototype/taint-Intl-DateTimeFormat.js
diff --git a/test/intl402/Date/prototype/13.3.0_2.js b/test/intl402/Date/prototype/this-value-invalid-date.js
similarity index 100%
rename from test/intl402/Date/prototype/13.3.0_2.js
rename to test/intl402/Date/prototype/this-value-invalid-date.js
diff --git a/test/intl402/Date/prototype/13.3.0_1.js b/test/intl402/Date/prototype/this-value-non-date.js
similarity index 100%
rename from test/intl402/Date/prototype/13.3.0_1.js
rename to test/intl402/Date/prototype/this-value-non-date.js
diff --git a/test/intl402/Date/prototype/13.3.0_6_1.js b/test/intl402/Date/prototype/throws-same-exceptions-as-DateTimeFormat.js
similarity index 100%
rename from test/intl402/Date/prototype/13.3.0_6_1.js
rename to test/intl402/Date/prototype/throws-same-exceptions-as-DateTimeFormat.js
diff --git a/test/intl402/Date/prototype/toLocaleDateString/13.3.2_L15.js b/test/intl402/Date/prototype/toLocaleDateString/builtin.js
similarity index 100%
rename from test/intl402/Date/prototype/toLocaleDateString/13.3.2_L15.js
rename to test/intl402/Date/prototype/toLocaleDateString/builtin.js
diff --git a/test/intl402/Date/prototype/toLocaleString/13.3.1_L15.js b/test/intl402/Date/prototype/toLocaleString/builtin.js
similarity index 100%
rename from test/intl402/Date/prototype/toLocaleString/13.3.1_L15.js
rename to test/intl402/Date/prototype/toLocaleString/builtin.js
diff --git a/test/intl402/Date/prototype/toLocaleTimeString/13.3.3_L15.js b/test/intl402/Date/prototype/toLocaleTimeString/builtin.js
similarity index 100%
rename from test/intl402/Date/prototype/toLocaleTimeString/13.3.3_L15.js
rename to test/intl402/Date/prototype/toLocaleTimeString/builtin.js
diff --git a/test/intl402/DateTimeFormat/12.1_L15.js b/test/intl402/DateTimeFormat/builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1_L15.js
rename to test/intl402/DateTimeFormat/builtin.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_TDTO.js b/test/intl402/DateTimeFormat/date-time-options.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_TDTO.js
rename to test/intl402/DateTimeFormat/date-time-options.js
diff --git a/test/intl402/DateTimeFormat/12.2.3_b.js b/test/intl402/DateTimeFormat/ignore-invalid-unicode-ext-values.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.2.3_b.js
rename to test/intl402/DateTimeFormat/ignore-invalid-unicode-ext-values.js
diff --git a/test/intl402/DateTimeFormat/12.4_a.js b/test/intl402/DateTimeFormat/instance-class.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.4_a.js
rename to test/intl402/DateTimeFormat/instance-class.js
diff --git a/test/intl402/DateTimeFormat/12.1.3.js b/test/intl402/DateTimeFormat/instance-proto-and-extensible.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.3.js
rename to test/intl402/DateTimeFormat/instance-proto-and-extensible.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_a.js b/test/intl402/DateTimeFormat/legacy-regexp-statics-not-modified.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_a.js
rename to test/intl402/DateTimeFormat/legacy-regexp-statics-not-modified.js
diff --git a/test/intl402/DateTimeFormat/prototype/12.3_L15.js b/test/intl402/DateTimeFormat/prototype/builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/12.3_L15.js
rename to test/intl402/DateTimeFormat/prototype/builtin.js
diff --git a/test/intl402/DateTimeFormat/prototype/constructor/12.3.1.js b/test/intl402/DateTimeFormat/prototype/constructor/value.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/constructor/12.3.1.js
rename to test/intl402/DateTimeFormat/prototype/constructor/value.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_1_c.js b/test/intl402/DateTimeFormat/prototype/format/bound-to-datetimeformat-instance.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_1_c.js
rename to test/intl402/DateTimeFormat/prototype/format/bound-to-datetimeformat-instance.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_L15.js b/test/intl402/DateTimeFormat/prototype/format/builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_L15.js
rename to test/intl402/DateTimeFormat/prototype/format/builtin.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_1_a_L15.js b/test/intl402/DateTimeFormat/prototype/format/format-function-builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_1_a_L15.js
rename to test/intl402/DateTimeFormat/prototype/format/format-function-builtin.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_7_a_iv.js b/test/intl402/DateTimeFormat/prototype/format/proleptic-gregorian-calendar.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_7_a_iv.js
rename to test/intl402/DateTimeFormat/prototype/format/proleptic-gregorian-calendar.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_TLT_2.js b/test/intl402/DateTimeFormat/prototype/format/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_TLT_2.js
rename to test/intl402/DateTimeFormat/prototype/format/taint-Object-prototype.js
diff --git a/test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_1.js b/test/intl402/DateTimeFormat/prototype/format/throws-value-non-finite.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/format/12.3.2_FDT_1.js
rename to test/intl402/DateTimeFormat/prototype/format/throws-value-non-finite.js
diff --git a/test/intl402/DateTimeFormat/prototype/12.2.1.js b/test/intl402/DateTimeFormat/prototype/prop-desc.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/12.2.1.js
rename to test/intl402/DateTimeFormat/prototype/prop-desc.js
diff --git a/test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/basic.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3.js
rename to test/intl402/DateTimeFormat/prototype/resolvedOptions/basic.js
diff --git a/test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3_L15.js b/test/intl402/DateTimeFormat/prototype/resolvedOptions/builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/resolvedOptions/12.3.3_L15.js
rename to test/intl402/DateTimeFormat/prototype/resolvedOptions/builtin.js
diff --git a/test/intl402/DateTimeFormat/prototype/12.3_a.js b/test/intl402/DateTimeFormat/prototype/this-value-datetimeformat-prototype.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/12.3_a.js
rename to test/intl402/DateTimeFormat/prototype/this-value-datetimeformat-prototype.js
diff --git a/test/intl402/DateTimeFormat/prototype/12.3_b.js b/test/intl402/DateTimeFormat/prototype/this-value-not-datetimeformat.js
similarity index 100%
rename from test/intl402/DateTimeFormat/prototype/12.3_b.js
rename to test/intl402/DateTimeFormat/prototype/this-value-not-datetimeformat.js
diff --git a/test/intl402/DateTimeFormat/12.2.3_c.js b/test/intl402/DateTimeFormat/required-date-time-formats.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.2.3_c.js
rename to test/intl402/DateTimeFormat/required-date-time-formats.js
diff --git a/test/intl402/DateTimeFormat/12.1.2.js b/test/intl402/DateTimeFormat/subclassing.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.2.js
rename to test/intl402/DateTimeFormat/subclassing.js
diff --git a/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_a.js b/test/intl402/DateTimeFormat/supportedLocalesOf/basic.js
similarity index 100%
rename from test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_a.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/basic.js
diff --git a/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_L15.js b/test/intl402/DateTimeFormat/supportedLocalesOf/builtin.js
similarity index 100%
rename from test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_L15.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/builtin.js
diff --git a/test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_b.js b/test/intl402/DateTimeFormat/supportedLocalesOf/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/DateTimeFormat/supportedLocalesOf/12.2.2_b.js
rename to test/intl402/DateTimeFormat/supportedLocalesOf/taint-Object-prototype.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_22.js b/test/intl402/DateTimeFormat/taint-Object-prototype-date-time-components.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_22.js
rename to test/intl402/DateTimeFormat/taint-Object-prototype-date-time-components.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_5.js b/test/intl402/DateTimeFormat/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_5.js
rename to test/intl402/DateTimeFormat/taint-Object-prototype.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_23.js b/test/intl402/DateTimeFormat/test-option-date-time-components.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_23.js
rename to test/intl402/DateTimeFormat/test-option-date-time-components.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_25.js b/test/intl402/DateTimeFormat/test-option-formatMatcher.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_25.js
rename to test/intl402/DateTimeFormat/test-option-formatMatcher.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_18.js b/test/intl402/DateTimeFormat/test-option-hour12.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_18.js
rename to test/intl402/DateTimeFormat/test-option-hour12.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_6.js b/test/intl402/DateTimeFormat/test-option-localeMatcher.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_6.js
rename to test/intl402/DateTimeFormat/test-option-localeMatcher.js
diff --git a/test/intl402/DateTimeFormat/12.1.1_1.js b/test/intl402/DateTimeFormat/this-value-ignored.js
similarity index 100%
rename from test/intl402/DateTimeFormat/12.1.1_1.js
rename to test/intl402/DateTimeFormat/this-value-ignored.js
diff --git a/test/intl402/DateTimeFormat/6.4_c.js b/test/intl402/DateTimeFormat/timezone-canonicalized.js
similarity index 100%
rename from test/intl402/DateTimeFormat/6.4_c.js
rename to test/intl402/DateTimeFormat/timezone-canonicalized.js
diff --git a/test/intl402/DateTimeFormat/6.4_b.js b/test/intl402/DateTimeFormat/timezone-invalid.js
similarity index 100%
rename from test/intl402/DateTimeFormat/6.4_b.js
rename to test/intl402/DateTimeFormat/timezone-invalid.js
diff --git a/test/intl402/DateTimeFormat/6.4_a.js b/test/intl402/DateTimeFormat/timezone-utc.js
similarity index 100%
rename from test/intl402/DateTimeFormat/6.4_a.js
rename to test/intl402/DateTimeFormat/timezone-utc.js
diff --git a/test/intl402/Intl/8.0_L15.js b/test/intl402/Intl/builtin.js
similarity index 100%
rename from test/intl402/Intl/8.0_L15.js
rename to test/intl402/Intl/builtin.js
diff --git a/test/intl402/Intl/8.0.js b/test/intl402/Intl/proto.js
similarity index 100%
rename from test/intl402/Intl/8.0.js
rename to test/intl402/Intl/proto.js
diff --git a/test/intl402/Number/prototype/toLocaleString/13.2.1_L15.js b/test/intl402/Number/prototype/toLocaleString/builtin.js
similarity index 100%
rename from test/intl402/Number/prototype/toLocaleString/13.2.1_L15.js
rename to test/intl402/Number/prototype/toLocaleString/builtin.js
diff --git a/test/intl402/Number/prototype/toLocaleString/13.2.1_5.js b/test/intl402/Number/prototype/toLocaleString/returns-same-results-as-NumberFormat.js
similarity index 100%
rename from test/intl402/Number/prototype/toLocaleString/13.2.1_5.js
rename to test/intl402/Number/prototype/toLocaleString/returns-same-results-as-NumberFormat.js
diff --git a/test/intl402/Number/prototype/toLocaleString/13.2.1_4_2.js b/test/intl402/Number/prototype/toLocaleString/taint-Intl-NumberFormat.js
similarity index 100%
rename from test/intl402/Number/prototype/toLocaleString/13.2.1_4_2.js
rename to test/intl402/Number/prototype/toLocaleString/taint-Intl-NumberFormat.js
diff --git a/test/intl402/Number/prototype/toLocaleString/13.2.1_1.js b/test/intl402/Number/prototype/toLocaleString/this-number-value.js
similarity index 100%
rename from test/intl402/Number/prototype/toLocaleString/13.2.1_1.js
rename to test/intl402/Number/prototype/toLocaleString/this-number-value.js
diff --git a/test/intl402/Number/prototype/toLocaleString/13.2.1_4_1.js b/test/intl402/Number/prototype/toLocaleString/throws-same-exceptions-as-NumberFormat.js
similarity index 100%
rename from test/intl402/Number/prototype/toLocaleString/13.2.1_4_1.js
rename to test/intl402/Number/prototype/toLocaleString/throws-same-exceptions-as-NumberFormat.js
diff --git a/test/intl402/NumberFormat/11.1_L15.js b/test/intl402/NumberFormat/builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1_L15.js
rename to test/intl402/NumberFormat/builtin.js
diff --git a/test/intl402/NumberFormat/6.3.1_b.js b/test/intl402/NumberFormat/currency-code-invalid.js
similarity index 100%
rename from test/intl402/NumberFormat/6.3.1_b.js
rename to test/intl402/NumberFormat/currency-code-invalid.js
diff --git a/test/intl402/NumberFormat/6.3.1_a.js b/test/intl402/NumberFormat/currency-code-well-formed.js
similarity index 100%
rename from test/intl402/NumberFormat/6.3.1_a.js
rename to test/intl402/NumberFormat/currency-code-well-formed.js
diff --git a/test/intl402/NumberFormat/11.1.1_20_c.js b/test/intl402/NumberFormat/currency-digits.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_20_c.js
rename to test/intl402/NumberFormat/currency-digits.js
diff --git a/test/intl402/NumberFormat/11.2.3_b.js b/test/intl402/NumberFormat/ignore-invalid-unicode-ext-values.js
similarity index 100%
rename from test/intl402/NumberFormat/11.2.3_b.js
rename to test/intl402/NumberFormat/ignore-invalid-unicode-ext-values.js
diff --git a/test/intl402/NumberFormat/11.4_a.js b/test/intl402/NumberFormat/instance-class.js
similarity index 100%
rename from test/intl402/NumberFormat/11.4_a.js
rename to test/intl402/NumberFormat/instance-class.js
diff --git a/test/intl402/NumberFormat/11.1.3.js b/test/intl402/NumberFormat/instance-proto-and-extensible.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.3.js
rename to test/intl402/NumberFormat/instance-proto-and-extensible.js
diff --git a/test/intl402/NumberFormat/11.1.1_a.js b/test/intl402/NumberFormat/legacy-regexp-statics-not-modified.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_a.js
rename to test/intl402/NumberFormat/legacy-regexp-statics-not-modified.js
diff --git a/test/intl402/NumberFormat/prototype/11.3_L15.js b/test/intl402/NumberFormat/prototype/builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/11.3_L15.js
rename to test/intl402/NumberFormat/prototype/builtin.js
diff --git a/test/intl402/NumberFormat/prototype/constructor/11.3.1.js b/test/intl402/NumberFormat/prototype/constructor/value.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/constructor/11.3.1.js
rename to test/intl402/NumberFormat/prototype/constructor/value.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_1_c.js b/test/intl402/NumberFormat/prototype/format/bound-to-numberformat-instance.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_1_c.js
rename to test/intl402/NumberFormat/prototype/format/bound-to-numberformat-instance.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_L15.js b/test/intl402/NumberFormat/prototype/format/builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_L15.js
rename to test/intl402/NumberFormat/prototype/format/builtin.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_TRF.js b/test/intl402/NumberFormat/prototype/format/format-fraction-digits.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_TRF.js
rename to test/intl402/NumberFormat/prototype/format/format-fraction-digits.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_1_a_L15.js b/test/intl402/NumberFormat/prototype/format/format-function-builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_1_a_L15.js
rename to test/intl402/NumberFormat/prototype/format/format-function-builtin.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_FN_1.js b/test/intl402/NumberFormat/prototype/format/format-negative-numbers.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_FN_1.js
rename to test/intl402/NumberFormat/prototype/format/format-negative-numbers.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_FN_2.js b/test/intl402/NumberFormat/prototype/format/format-non-finite-numbers.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_FN_2.js
rename to test/intl402/NumberFormat/prototype/format/format-non-finite-numbers.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_TRP.js b/test/intl402/NumberFormat/prototype/format/format-significant-digits.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_TRP.js
rename to test/intl402/NumberFormat/prototype/format/format-significant-digits.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_e.js b/test/intl402/NumberFormat/prototype/format/numbering-systems.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_e.js
rename to test/intl402/NumberFormat/prototype/format/numbering-systems.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_b.js b/test/intl402/NumberFormat/prototype/format/percent-formatter.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_FN_3_b.js
rename to test/intl402/NumberFormat/prototype/format/percent-formatter.js
diff --git a/test/intl402/NumberFormat/prototype/format/11.3.2_1_a_ii.js b/test/intl402/NumberFormat/prototype/format/value-arg-coerced-to-number.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/format/11.3.2_1_a_ii.js
rename to test/intl402/NumberFormat/prototype/format/value-arg-coerced-to-number.js
diff --git a/test/intl402/NumberFormat/prototype/11.2.1.js b/test/intl402/NumberFormat/prototype/prop-desc.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/11.2.1.js
rename to test/intl402/NumberFormat/prototype/prop-desc.js
diff --git a/test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3.js b/test/intl402/NumberFormat/prototype/resolvedOptions/basic.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3.js
rename to test/intl402/NumberFormat/prototype/resolvedOptions/basic.js
diff --git a/test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3_L15.js b/test/intl402/NumberFormat/prototype/resolvedOptions/builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/resolvedOptions/11.3.3_L15.js
rename to test/intl402/NumberFormat/prototype/resolvedOptions/builtin.js
diff --git a/test/intl402/NumberFormat/prototype/11.3_b.js b/test/intl402/NumberFormat/prototype/this-value-not-numberformat.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/11.3_b.js
rename to test/intl402/NumberFormat/prototype/this-value-not-numberformat.js
diff --git a/test/intl402/NumberFormat/prototype/11.3_a.js b/test/intl402/NumberFormat/prototype/this-value-numberformat-prototype.js
similarity index 100%
rename from test/intl402/NumberFormat/prototype/11.3_a.js
rename to test/intl402/NumberFormat/prototype/this-value-numberformat-prototype.js
diff --git a/test/intl402/NumberFormat/11.1.1_32.js b/test/intl402/NumberFormat/significant-digits-options-get-sequence.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_32.js
rename to test/intl402/NumberFormat/significant-digits-options-get-sequence.js
diff --git a/test/intl402/NumberFormat/11.1.2.js b/test/intl402/NumberFormat/subclassing.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.2.js
rename to test/intl402/NumberFormat/subclassing.js
diff --git a/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_a.js b/test/intl402/NumberFormat/supportedLocalesOf/basic.js
similarity index 100%
rename from test/intl402/NumberFormat/supportedLocalesOf/11.2.2_a.js
rename to test/intl402/NumberFormat/supportedLocalesOf/basic.js
diff --git a/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_L15.js b/test/intl402/NumberFormat/supportedLocalesOf/builtin.js
similarity index 100%
rename from test/intl402/NumberFormat/supportedLocalesOf/11.2.2_L15.js
rename to test/intl402/NumberFormat/supportedLocalesOf/builtin.js
diff --git a/test/intl402/NumberFormat/supportedLocalesOf/11.2.2_b.js b/test/intl402/NumberFormat/supportedLocalesOf/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/NumberFormat/supportedLocalesOf/11.2.2_b.js
rename to test/intl402/NumberFormat/supportedLocalesOf/taint-Object-prototype.js
diff --git a/test/intl402/NumberFormat/11.1.1_6.js b/test/intl402/NumberFormat/taint-Object-prototype.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_6.js
rename to test/intl402/NumberFormat/taint-Object-prototype.js
diff --git a/test/intl402/NumberFormat/11.1.1_17.js b/test/intl402/NumberFormat/test-option-currency.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_17.js
rename to test/intl402/NumberFormat/test-option-currency.js
diff --git a/test/intl402/NumberFormat/11.1.1_21.js b/test/intl402/NumberFormat/test-option-currencyDisplay.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_21.js
rename to test/intl402/NumberFormat/test-option-currencyDisplay.js
diff --git a/test/intl402/NumberFormat/11.1.1_7.js b/test/intl402/NumberFormat/test-option-localeMatcher.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_7.js
rename to test/intl402/NumberFormat/test-option-localeMatcher.js
diff --git a/test/intl402/NumberFormat/11.1.1_15.js b/test/intl402/NumberFormat/test-option-style.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_15.js
rename to test/intl402/NumberFormat/test-option-style.js
diff --git a/test/intl402/NumberFormat/11.1.1_34.js b/test/intl402/NumberFormat/test-option-useGrouping.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_34.js
rename to test/intl402/NumberFormat/test-option-useGrouping.js
diff --git a/test/intl402/NumberFormat/11.1.1_1.js b/test/intl402/NumberFormat/this-value-ignored.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_1.js
rename to test/intl402/NumberFormat/this-value-ignored.js
diff --git a/test/intl402/NumberFormat/11.1.1_19.js b/test/intl402/NumberFormat/throws-for-currency-style-without-currency-option.js
similarity index 100%
rename from test/intl402/NumberFormat/11.1.1_19.js
rename to test/intl402/NumberFormat/throws-for-currency-style-without-currency-option.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_L15.js b/test/intl402/String/prototype/localeCompare/builtin.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_L15.js
rename to test/intl402/String/prototype/localeCompare/builtin.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_3_2.js b/test/intl402/String/prototype/localeCompare/missing-arguments-coerced-to-undefined.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_3_2.js
rename to test/intl402/String/prototype/localeCompare/missing-arguments-coerced-to-undefined.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_1.js b/test/intl402/String/prototype/localeCompare/return-abrupt-this-value.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_1.js
rename to test/intl402/String/prototype/localeCompare/return-abrupt-this-value.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_7.js b/test/intl402/String/prototype/localeCompare/returns-same-results-as-Collator.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_7.js
rename to test/intl402/String/prototype/localeCompare/returns-same-results-as-Collator.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_6_2.js b/test/intl402/String/prototype/localeCompare/taint-Intl-Collator.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_6_2.js
rename to test/intl402/String/prototype/localeCompare/taint-Intl-Collator.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_3_1.js b/test/intl402/String/prototype/localeCompare/that-arg-coerced-to-string.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_3_1.js
rename to test/intl402/String/prototype/localeCompare/that-arg-coerced-to-string.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_2.js b/test/intl402/String/prototype/localeCompare/this-value-coerced-to-string.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_2.js
rename to test/intl402/String/prototype/localeCompare/this-value-coerced-to-string.js
diff --git a/test/intl402/String/prototype/localeCompare/13.1.1_6_1.js b/test/intl402/String/prototype/localeCompare/throws-same-exceptions-as-Collator.js
similarity index 100%
rename from test/intl402/String/prototype/localeCompare/13.1.1_6_1.js
rename to test/intl402/String/prototype/localeCompare/throws-same-exceptions-as-Collator.js
diff --git a/test/intl402/9.2.1_3.js b/test/intl402/constructors-string-and-single-element-array.js
similarity index 100%
rename from test/intl402/9.2.1_3.js
rename to test/intl402/constructors-string-and-single-element-array.js
diff --git a/test/intl402/9.2.5_6.js b/test/intl402/constructors-taint-Object-prototype-2.js
similarity index 100%
rename from test/intl402/9.2.5_6.js
rename to test/intl402/constructors-taint-Object-prototype-2.js
diff --git a/test/intl402/9.2.3_5.js b/test/intl402/constructors-taint-Object-prototype.js
similarity index 100%
rename from test/intl402/9.2.3_5.js
rename to test/intl402/constructors-taint-Object-prototype.js
diff --git a/test/intl402/6.2.4.js b/test/intl402/default-locale-is-canonicalized.js
similarity index 100%
rename from test/intl402/6.2.4.js
rename to test/intl402/default-locale-is-canonicalized.js
diff --git a/test/intl402/9.1_a.js b/test/intl402/default-locale-is-supported.js
similarity index 100%
rename from test/intl402/9.1_a.js
rename to test/intl402/default-locale-is-supported.js
diff --git a/test/intl402/9.1_b.js b/test/intl402/fallback-locales-are-supported.js
similarity index 100%
rename from test/intl402/9.1_b.js
rename to test/intl402/fallback-locales-are-supported.js
diff --git a/test/intl402/6.2.3_a.js b/test/intl402/language-tags-canonicalized.js
similarity index 100%
rename from test/intl402/6.2.3_a.js
rename to test/intl402/language-tags-canonicalized.js
diff --git a/test/intl402/6.2.2_c.js b/test/intl402/language-tags-invalid.js
similarity index 100%
rename from test/intl402/6.2.2_c.js
rename to test/intl402/language-tags-invalid.js
diff --git a/test/intl402/6.2.2_a.js b/test/intl402/language-tags-valid.js
similarity index 100%
rename from test/intl402/6.2.2_a.js
rename to test/intl402/language-tags-valid.js
diff --git a/test/intl402/6.2.2_b.js b/test/intl402/language-tags-with-underscore.js
similarity index 100%
rename from test/intl402/6.2.2_b.js
rename to test/intl402/language-tags-with-underscore.js
diff --git a/test/intl402/9.2.2.js b/test/intl402/supportedLocalesOf-consistent-with-resolvedOptions.js
similarity index 100%
rename from test/intl402/9.2.2.js
rename to test/intl402/supportedLocalesOf-consistent-with-resolvedOptions.js
diff --git a/test/intl402/9.2.6_4_c.js b/test/intl402/supportedLocalesOf-default-locale-and-zxx-locale.js
similarity index 100%
rename from test/intl402/9.2.6_4_c.js
rename to test/intl402/supportedLocalesOf-default-locale-and-zxx-locale.js
diff --git a/test/intl402/9.2.1_8_c_vi.js b/test/intl402/supportedLocalesOf-duplicate-elements-removed.js
similarity index 100%
rename from test/intl402/9.2.1_8_c_vi.js
rename to test/intl402/supportedLocalesOf-duplicate-elements-removed.js
diff --git a/test/intl402/9.2.1_1.js b/test/intl402/supportedLocalesOf-empty-and-undefined.js
similarity index 100%
rename from test/intl402/9.2.1_1.js
rename to test/intl402/supportedLocalesOf-empty-and-undefined.js
diff --git a/test/intl402/9.2.1_4.js b/test/intl402/supportedLocalesOf-locales-arg-coered-to-object.js
similarity index 100%
rename from test/intl402/9.2.1_4.js
rename to test/intl402/supportedLocalesOf-locales-arg-coered-to-object.js
diff --git a/test/intl402/9.2.6_4.js b/test/intl402/supportedLocalesOf-locales-arg-empty-array.js
similarity index 100%
rename from test/intl402/9.2.6_4.js
rename to test/intl402/supportedLocalesOf-locales-arg-empty-array.js
diff --git a/test/intl402/9.2.8_4.js b/test/intl402/supportedLocalesOf-returned-array-elements-are-frozen.js
similarity index 100%
rename from test/intl402/9.2.8_4.js
rename to test/intl402/supportedLocalesOf-returned-array-elements-are-frozen.js
diff --git a/test/intl402/9.2.6_2.js b/test/intl402/supportedLocalesOf-taint-Array-2.js
similarity index 100%
rename from test/intl402/9.2.6_2.js
rename to test/intl402/supportedLocalesOf-taint-Array-2.js
diff --git a/test/intl402/9.2.1_2.js b/test/intl402/supportedLocalesOf-taint-Array.js
similarity index 100%
rename from test/intl402/9.2.1_2.js
rename to test/intl402/supportedLocalesOf-taint-Array.js
diff --git a/test/intl402/9.2.8_1_c.js b/test/intl402/supportedLocalesOf-test-option-localeMatcher.js
similarity index 100%
rename from test/intl402/9.2.8_1_c.js
rename to test/intl402/supportedLocalesOf-test-option-localeMatcher.js
diff --git a/test/intl402/9.2.1_8_c_ii.js b/test/intl402/supportedLocalesOf-throws-if-element-not-string-or-object.js
similarity index 100%
rename from test/intl402/9.2.1_8_c_ii.js
rename to test/intl402/supportedLocalesOf-throws-if-element-not-string-or-object.js
diff --git a/test/intl402/9.2.6_4_b.js b/test/intl402/supportedLocalesOf-unicode-extensions-ignored.js
similarity index 100%
rename from test/intl402/9.2.6_4_b.js
rename to test/intl402/supportedLocalesOf-unicode-extensions-ignored.js