diff --git a/test/language/expressions/dynamic-import/ns/await-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/namespace/await-ns-Symbol-toStringTag.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-Symbol-toStringTag.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-Symbol-toStringTag.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-define-own-property.js b/test/language/expressions/dynamic-import/namespace/await-ns-define-own-property.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-define-own-property.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-define-own-property.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-delete-exported-init-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-exported-init-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-delete-non-exported-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-delete-non-exported-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-extensible.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-extensible.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-direct.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-direct.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-direct.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-indirect.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-dflt-indirect.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-dflt-indirect.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-props-nrml.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-nested-namespace-props-nrml.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-nested-namespace-props-nrml.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-found-init.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-found-init.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-found-init.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-own-property-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-sym.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-own-property-sym.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-own-property-sym.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-str-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-str-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-str-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-str-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-sym-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-sym-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-sym-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-sym-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-get-sym-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-get-sym-not-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-get-sym-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-found-init.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-has-property-str-found-init.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-found-init.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-has-property-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-has-property-sym-not-found.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-has-property-sym-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-no-iterator.js b/test/language/expressions/dynamic-import/namespace/await-ns-no-iterator.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-no-iterator.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-no-iterator.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/namespace/await-ns-own-property-keys-sort.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-own-property-keys-sort.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-own-property-keys-sort.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-object.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-object.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-object.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-reflect.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-prevent-extensions-reflect.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-prevent-extensions-reflect.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-prop-descs.js b/test/language/expressions/dynamic-import/namespace/await-ns-prop-descs.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-prop-descs.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-prop-descs.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-prototype.js b/test/language/expressions/dynamic-import/namespace/await-ns-prototype.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-prototype.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-prototype.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of-null.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of-null.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of-null.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-prototype-of.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-prototype-of.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-same-values-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-same-values-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-same-values-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/await-ns-set-strict.js b/test/language/expressions/dynamic-import/namespace/await-ns-set-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/await-ns-set-strict.js
rename to test/language/expressions/dynamic-import/namespace/await-ns-set-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/default-property-not-set-own.js b/test/language/expressions/dynamic-import/namespace/default-property-not-set-own.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/default-property-not-set-own.js
rename to test/language/expressions/dynamic-import/namespace/default-property-not-set-own.js
diff --git a/test/language/expressions/dynamic-import/ns/define-own-property_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/define-own-property_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/define-own-property_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/define-own-property_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/empty_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/empty_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/empty_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/empty_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named-end_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-named_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-named_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod-end_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-dflt-skip-prod_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-dflt-skip-prod_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-1_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-1_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-1_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-2_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-2_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-2_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-3_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/get-nested-namespace-props-nrml-3_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/get-nested-namespace-props-nrml-3_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/module-code_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/module-code_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/module-code_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/module-code_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/own-keys-sort_FIXTURE.js b/test/language/expressions/dynamic-import/namespace/own-keys-sort_FIXTURE.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/own-keys-sort_FIXTURE.js
rename to test/language/expressions/dynamic-import/namespace/own-keys-sort_FIXTURE.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-Symbol-toStringTag.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-Symbol-toStringTag.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-Symbol-toStringTag.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-define-own-property.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-define-own-property.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-define-own-property.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-define-own-property.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-delete-exported-init-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-exported-init-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-delete-non-exported-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-delete-non-exported-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-extensible.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-direct.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-direct.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-direct.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-indirect.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-dflt-indirect.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-dflt-indirect.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-props-nrml.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-nested-namespace-props-nrml.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-nested-namespace-props-nrml.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-found-init.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-found-init.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-found-init.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-sym.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-sym.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-own-property-sym.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-own-property-sym.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-get-sym-not-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-get-sym-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-found-init.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-found-init.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-found-init.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-str-not-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-str-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-not-found.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-has-property-sym-not-found.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-has-property-sym-not-found.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-no-iterator.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-no-iterator.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-no-iterator.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-no-iterator.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-own-property-keys-sort.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-own-property-keys-sort.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-own-property-keys-sort.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-object.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-object.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-object.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-reflect.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-prevent-extensions-reflect.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prevent-extensions-reflect.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-prop-descs.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prop-descs.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-prop-descs.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prop-descs.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-prototype.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-prototype.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-prototype.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-prototype.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of-null.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of-null.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of-null.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-prototype-of.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-prototype-of.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-no-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-no-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-no-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-same-values-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-same-values-strict.js
diff --git a/test/language/expressions/dynamic-import/ns/promise-then-ns-set-strict.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-set-strict.js
similarity index 100%
rename from test/language/expressions/dynamic-import/ns/promise-then-ns-set-strict.js
rename to test/language/expressions/dynamic-import/namespace/promise-then-ns-set-strict.js