diff --git a/gcc/testsuite/gm2/calling-c/datatypes/unbounded/run/pass/gm2.exp b/gcc/testsuite/gm2/calling-c/datatypes/unbounded/run/pass/calling-c-datatypes-unbounded-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/calling-c/datatypes/unbounded/run/pass/gm2.exp
rename to gcc/testsuite/gm2/calling-c/datatypes/unbounded/run/pass/calling-c-datatypes-unbounded-run-pass.exp
diff --git a/gcc/testsuite/gm2/case/pass/gm2.exp b/gcc/testsuite/gm2/case/pass/case-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/case/pass/gm2.exp
rename to gcc/testsuite/gm2/case/pass/case-pass.exp
diff --git a/gcc/testsuite/gm2/complex/pass/gm2.exp b/gcc/testsuite/gm2/complex/pass/complex-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/complex/pass/gm2.exp
rename to gcc/testsuite/gm2/complex/pass/complex-pass.exp
diff --git a/gcc/testsuite/gm2/complex/run/pass/gm2.exp b/gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/complex/run/pass/gm2.exp
rename to gcc/testsuite/gm2/complex/run/pass/complex-run-pass.exp
diff --git a/gcc/testsuite/gm2/coroutines/pim/run/pass/gm2.exp b/gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/coroutines/pim/run/pass/gm2.exp
rename to gcc/testsuite/gm2/coroutines/pim/run/pass/coroutines-pim-run-pass.exp
diff --git a/gcc/testsuite/gm2/cpp/pass/gm2.exp b/gcc/testsuite/gm2/cpp/pass/cpp-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/cpp/pass/gm2.exp
rename to gcc/testsuite/gm2/cpp/pass/cpp-pass.exp
diff --git a/gcc/testsuite/gm2/cse/fail/gm2.exp b/gcc/testsuite/gm2/cse/fail/cse-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/cse/fail/gm2.exp
rename to gcc/testsuite/gm2/cse/fail/cse-fail.exp
diff --git a/gcc/testsuite/gm2/cse/pass/gm2.exp b/gcc/testsuite/gm2/cse/pass/cse-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/cse/pass/gm2.exp
rename to gcc/testsuite/gm2/cse/pass/cse-pass.exp
diff --git a/gcc/testsuite/gm2/dynamic/pass/gm2.exp b/gcc/testsuite/gm2/dynamic/pass/dynamic-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/dynamic/pass/gm2.exp
rename to gcc/testsuite/gm2/dynamic/pass/dynamic-pass.exp
diff --git a/gcc/testsuite/gm2/embedded/pass/gm2.exp b/gcc/testsuite/gm2/embedded/pass/embedded-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/embedded/pass/gm2.exp
rename to gcc/testsuite/gm2/embedded/pass/embedded-pass.exp
diff --git a/gcc/testsuite/gm2/errors/fail/gm2.exp b/gcc/testsuite/gm2/errors/fail/errors-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/errors/fail/gm2.exp
rename to gcc/testsuite/gm2/errors/fail/errors-fail.exp
diff --git a/gcc/testsuite/gm2/examples/callingC/pass/gm2.exp b/gcc/testsuite/gm2/examples/callingC/pass/examples-callingC-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/callingC/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/callingC/pass/examples-callingC-pass.exp
diff --git a/gcc/testsuite/gm2/examples/callingC/run/pass/gm2.exp b/gcc/testsuite/gm2/examples/callingC/run/pass/examples-callingC-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/callingC/run/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/callingC/run/pass/examples-callingC-run-pass.exp
diff --git a/gcc/testsuite/gm2/examples/cpp/pass/gm2.exp b/gcc/testsuite/gm2/examples/cpp/pass/examples-cpp-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/cpp/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/cpp/pass/examples-cpp-pass.exp
diff --git a/gcc/testsuite/gm2/examples/cppDef/pass/gm2.exp b/gcc/testsuite/gm2/examples/cppDef/pass/examples-cppDef-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/cppDef/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/cppDef/pass/examples-cppDef-pass.exp
diff --git a/gcc/testsuite/gm2/examples/hello/pass/gm2.exp b/gcc/testsuite/gm2/examples/hello/pass/examples-hello-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/hello/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/hello/pass/examples-hello-pass.exp
diff --git a/gcc/testsuite/gm2/examples/map/pass/gm2.exp b/gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/examples/map/pass/gm2.exp
rename to gcc/testsuite/gm2/examples/map/pass/examples-map-pass.exp
diff --git a/gcc/testsuite/gm2/exceptions/run/pass/gm2.exp b/gcc/testsuite/gm2/exceptions/run/pass/exceptions-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/exceptions/run/pass/gm2.exp
rename to gcc/testsuite/gm2/exceptions/run/pass/exceptions-run-pass.exp
diff --git a/gcc/testsuite/gm2/extensions/pass/gm2.exp b/gcc/testsuite/gm2/extensions/pass/extensions-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/extensions/pass/gm2.exp
rename to gcc/testsuite/gm2/extensions/pass/extensions-pass.exp
diff --git a/gcc/testsuite/gm2/extensions/run/fail/gm2.exp b/gcc/testsuite/gm2/extensions/run/fail/extensions-run-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/extensions/run/fail/gm2.exp
rename to gcc/testsuite/gm2/extensions/run/fail/extensions-run-fail.exp
diff --git a/gcc/testsuite/gm2/extensions/run/pass/gm2.exp b/gcc/testsuite/gm2/extensions/run/pass/extensions-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/extensions/run/pass/gm2.exp
rename to gcc/testsuite/gm2/extensions/run/pass/extensions-run-pass.exp
diff --git a/gcc/testsuite/gm2/fpu/pass/gm2.exp b/gcc/testsuite/gm2/fpu/pass/fpu-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/fpu/pass/gm2.exp
rename to gcc/testsuite/gm2/fpu/pass/fpu-pass.exp
diff --git a/gcc/testsuite/gm2/imports/run/pass/gm2.exp b/gcc/testsuite/gm2/imports/run/pass/imports-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/imports/run/pass/gm2.exp
rename to gcc/testsuite/gm2/imports/run/pass/imports-run-pass.exp
diff --git a/gcc/testsuite/gm2/iso/analysis/fail/gm2.exp b/gcc/testsuite/gm2/iso/analysis/fail/iso-analysis-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/iso/analysis/fail/gm2.exp
rename to gcc/testsuite/gm2/iso/analysis/fail/iso-analysis-fail.exp
diff --git a/gcc/testsuite/gm2/iso/check/fail/gm2.exp b/gcc/testsuite/gm2/iso/check/fail/iso-check-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/iso/check/fail/gm2.exp
rename to gcc/testsuite/gm2/iso/check/fail/iso-check-fail.exp
diff --git a/gcc/testsuite/gm2/iso/fail/gm2.exp b/gcc/testsuite/gm2/iso/fail/iso-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/iso/fail/gm2.exp
rename to gcc/testsuite/gm2/iso/fail/iso-fail.exp
diff --git a/gcc/testsuite/gm2/iso/pass/gm2.exp b/gcc/testsuite/gm2/iso/pass/iso-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/iso/pass/gm2.exp
rename to gcc/testsuite/gm2/iso/pass/iso-pass.exp
diff --git a/gcc/testsuite/gm2/iso/run/pass/gm2.exp b/gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/iso/run/pass/gm2.exp
rename to gcc/testsuite/gm2/iso/run/pass/iso-run-pass.exp
diff --git a/gcc/testsuite/gm2/isocoroutines/run/pass/gm2.exp b/gcc/testsuite/gm2/isocoroutines/run/pass/isocoroutines-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/isocoroutines/run/pass/gm2.exp
rename to gcc/testsuite/gm2/isocoroutines/run/pass/isocoroutines-run-pass.exp
diff --git a/gcc/testsuite/gm2/isolib/run/pass/gm2.exp b/gcc/testsuite/gm2/isolib/run/pass/isolib-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/isolib/run/pass/gm2.exp
rename to gcc/testsuite/gm2/isolib/run/pass/isolib-run-pass.exp
diff --git a/gcc/testsuite/gm2/link/pim/fail/gm2.exp b/gcc/testsuite/gm2/link/pim/fail/link-pim-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/link/pim/fail/gm2.exp
rename to gcc/testsuite/gm2/link/pim/fail/link-pim-fail.exp
diff --git a/gcc/testsuite/gm2/link/pim/pass/gm2.exp b/gcc/testsuite/gm2/link/pim/pass/link-pim-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/link/pim/pass/gm2.exp
rename to gcc/testsuite/gm2/link/pim/pass/link-pim-pass.exp
diff --git a/gcc/testsuite/gm2/linking/libarchive/pass/gm2.exp b/gcc/testsuite/gm2/linking/libarchive/pass/linking-libarchive-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/linking/libarchive/pass/gm2.exp
rename to gcc/testsuite/gm2/linking/libarchive/pass/linking-libarchive-pass.exp
diff --git a/gcc/testsuite/gm2/linking/verbose/pass/gm2.exp b/gcc/testsuite/gm2/linking/verbose/pass/linking-verbose-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/linking/verbose/pass/gm2.exp
rename to gcc/testsuite/gm2/linking/verbose/pass/linking-verbose-pass.exp
diff --git a/gcc/testsuite/gm2/pim/fail/gm2.exp b/gcc/testsuite/gm2/pim/fail/pim-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/fail/gm2.exp
rename to gcc/testsuite/gm2/pim/fail/pim-fail.exp
diff --git a/gcc/testsuite/gm2/pim/no-options/run/pass/gm2.exp b/gcc/testsuite/gm2/pim/no-options/run/pass/pim-no-options-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/no-options/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pim/no-options/run/pass/pim-no-options-run-pass.exp
diff --git a/gcc/testsuite/gm2/pim/options/bounds/fail/gm2.exp b/gcc/testsuite/gm2/pim/options/bounds/fail/pim-options-bounds-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/options/bounds/fail/gm2.exp
rename to gcc/testsuite/gm2/pim/options/bounds/fail/pim-options-bounds-fail.exp
diff --git a/gcc/testsuite/gm2/pim/options/optimize/run/pass/gm2.exp b/gcc/testsuite/gm2/pim/options/optimize/run/pass/pim-options-optimize-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/options/optimize/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pim/options/optimize/run/pass/pim-options-optimize-run-pass.exp
diff --git a/gcc/testsuite/gm2/pim/pass/gm2.exp b/gcc/testsuite/gm2/pim/pass/pim-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/pass/gm2.exp
rename to gcc/testsuite/gm2/pim/pass/pim-pass.exp
diff --git a/gcc/testsuite/gm2/pim/run/fail/gm2.exp b/gcc/testsuite/gm2/pim/run/fail/pim-run-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/run/fail/gm2.exp
rename to gcc/testsuite/gm2/pim/run/fail/pim-run-fail.exp
diff --git a/gcc/testsuite/gm2/pim/run/pass/gm2.exp b/gcc/testsuite/gm2/pim/run/pass/pim-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pim/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pim/run/pass/pim-run-pass.exp
diff --git a/gcc/testsuite/gm2/pimcoroutines/pass/gm2.exp b/gcc/testsuite/gm2/pimcoroutines/pass/pimcoroutines-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimcoroutines/pass/gm2.exp
rename to gcc/testsuite/gm2/pimcoroutines/pass/pimcoroutines-pass.exp
diff --git a/gcc/testsuite/gm2/pimcoroutines/run/pass/gm2.exp b/gcc/testsuite/gm2/pimcoroutines/run/pass/pimcoroutines-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimcoroutines/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pimcoroutines/run/pass/pimcoroutines-run-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/base/run/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/base/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/base/run/pass/pimlib-base-run-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/coroutines/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/coroutines/pass/pimlib-coroutines-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/coroutines/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/coroutines/pass/pimlib-coroutines-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/logitech/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/logitech/pass/pimlib-logitech-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/logitech/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/logitech/pass/pimlib-logitech-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/logitech/run/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/logitech/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/logitech/run/pass/pimlib-logitech-run-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/pass/pimlib-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/pass/pimlib-pass.exp
diff --git a/gcc/testsuite/gm2/pimlib/run/pass/gm2.exp b/gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/pimlib/run/pass/gm2.exp
rename to gcc/testsuite/gm2/pimlib/run/pass/pimlib-run-pass.exp
diff --git a/gcc/testsuite/gm2/quads/run/pass/gm2.exp b/gcc/testsuite/gm2/quads/run/pass/quads-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/quads/run/pass/gm2.exp
rename to gcc/testsuite/gm2/quads/run/pass/quads-run-pass.exp
diff --git a/gcc/testsuite/gm2/sets/run/pass/gm2.exp b/gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/sets/run/pass/gm2.exp
rename to gcc/testsuite/gm2/sets/run/pass/sets-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/auto-init/fail/gm2.exp b/gcc/testsuite/gm2/switches/auto-init/fail/switches-auto-init-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/auto-init/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/auto-init/fail/switches-auto-init-fail.exp
diff --git a/gcc/testsuite/gm2/switches/check-all/pim2/fail/gm2.exp b/gcc/testsuite/gm2/switches/check-all/pim2/fail/switches-check-all-pim2-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/check-all/pim2/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/check-all/pim2/fail/switches-check-all-pim2-fail.exp
diff --git a/gcc/testsuite/gm2/switches/check-all/plugin/iso/fail/gm2.exp b/gcc/testsuite/gm2/switches/check-all/plugin/iso/fail/switches-check-all-plugin-iso-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/check-all/plugin/iso/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/check-all/plugin/iso/fail/switches-check-all-plugin-iso-fail.exp
diff --git a/gcc/testsuite/gm2/switches/check-all/plugin/pim2/fail/gm2.exp b/gcc/testsuite/gm2/switches/check-all/plugin/pim2/fail/switches-check-all-plugin-pim2-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/check-all/plugin/pim2/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/check-all/plugin/pim2/fail/switches-check-all-plugin-pim2-fail.exp
diff --git a/gcc/testsuite/gm2/switches/check-all/run/fail/gm2.exp b/gcc/testsuite/gm2/switches/check-all/run/fail/switches-check-all-run-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/check-all/run/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/check-all/run/fail/switches-check-all-run-fail.exp
diff --git a/gcc/testsuite/gm2/switches/check-all/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/check-all/run/pass/switches-check-all-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/check-all/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/check-all/run/pass/switches-check-all-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/extended-opaque/fail/gm2.exp b/gcc/testsuite/gm2/switches/extended-opaque/fail/switches-extended-opaque-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/extended-opaque/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/extended-opaque/fail/switches-extended-opaque-fail.exp
diff --git a/gcc/testsuite/gm2/switches/extended-opaque/pass/gm2.exp b/gcc/testsuite/gm2/switches/extended-opaque/pass/switches-extended-opaque-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/extended-opaque/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/extended-opaque/pass/switches-extended-opaque-pass.exp
diff --git a/gcc/testsuite/gm2/switches/iso/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/iso/run/pass/switches-iso-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/iso/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/iso/run/pass/switches-iso-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/makeall/fail/gm2.exp b/gcc/testsuite/gm2/switches/makeall/fail/switches-makeall-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/makeall/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/makeall/fail/switches-makeall-fail.exp
diff --git a/gcc/testsuite/gm2/switches/makeall/pass/gm2.exp b/gcc/testsuite/gm2/switches/makeall/pass/switches-makeall-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/makeall/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/makeall/pass/switches-makeall-pass.exp
diff --git a/gcc/testsuite/gm2/switches/optimization/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/optimization/run/pass/switches-optimization-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/optimization/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/optimization/run/pass/switches-optimization-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/pedantic-params/fail/gm2.exp b/gcc/testsuite/gm2/switches/pedantic-params/fail/switches-pedantic-params-fail.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pedantic-params/fail/gm2.exp
rename to gcc/testsuite/gm2/switches/pedantic-params/fail/switches-pedantic-params-fail.exp
diff --git a/gcc/testsuite/gm2/switches/pedantic-params/pass/gm2.exp b/gcc/testsuite/gm2/switches/pedantic-params/pass/switches-pedantic-params-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pedantic-params/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/pedantic-params/pass/switches-pedantic-params-pass.exp
diff --git a/gcc/testsuite/gm2/switches/pic/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pic/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/pic/run/pass/switches-pic-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/pim2/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/pim2/run/pass/switches-pim2-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pim2/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/pim2/run/pass/switches-pim2-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/pim3/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/pim3/run/pass/switches-pim3-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pim3/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/pim3/run/pass/switches-pim3-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/pim4/run/pass/gm2.exp b/gcc/testsuite/gm2/switches/pim4/run/pass/switches-pim4-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/pim4/run/pass/gm2.exp
rename to gcc/testsuite/gm2/switches/pim4/run/pass/switches-pim4-run-pass.exp
diff --git a/gcc/testsuite/gm2/switches/whole-program/pass/run/gm2.exp b/gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp
similarity index 100%
rename from gcc/testsuite/gm2/switches/whole-program/pass/run/gm2.exp
rename to gcc/testsuite/gm2/switches/whole-program/pass/run/switches-whole-program-pass-run.exp
diff --git a/gcc/testsuite/gm2/types/run/pass/gm2.exp b/gcc/testsuite/gm2/types/run/pass/types-run-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/types/run/pass/gm2.exp
rename to gcc/testsuite/gm2/types/run/pass/types-run-pass.exp
diff --git a/gcc/testsuite/gm2/ulmlib/pass/gm2.exp b/gcc/testsuite/gm2/ulmlib/pass/ulmlib-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/ulmlib/pass/gm2.exp
rename to gcc/testsuite/gm2/ulmlib/pass/ulmlib-pass.exp
diff --git a/gcc/testsuite/gm2/ulmlib/std/pass/gm2.exp b/gcc/testsuite/gm2/ulmlib/std/pass/ulmlib-std-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/ulmlib/std/pass/gm2.exp
rename to gcc/testsuite/gm2/ulmlib/std/pass/ulmlib-std-pass.exp
diff --git a/gcc/testsuite/gm2/ulmlib/sys/pass/gm2.exp b/gcc/testsuite/gm2/ulmlib/sys/pass/ulmlib-sys-pass.exp
similarity index 100%
rename from gcc/testsuite/gm2/ulmlib/sys/pass/gm2.exp
rename to gcc/testsuite/gm2/ulmlib/sys/pass/ulmlib-sys-pass.exp