diff --git a/gcc/testsuite/g++.dg/cpp/elifdef-2.C b/gcc/testsuite/g++.dg/cpp/elifdef-2.C
index 64082710fde..7b339a41e49 100644
--- a/gcc/testsuite/g++.dg/cpp/elifdef-2.C
+++ b/gcc/testsuite/g++.dg/cpp/elifdef-2.C
@@ -1,4 +1,4 @@
 // P2334R1
 // { dg-do preprocess { target c++23 } }
 
-#include "../../gcc.dg/cpp/c2x-elifdef-1.c"
+#include "../../gcc.dg/cpp/c23-elifdef-1.c"
diff --git a/gcc/testsuite/g++.dg/cpp/elifdef-4.C b/gcc/testsuite/g++.dg/cpp/elifdef-4.C
index 08edf583fa5..21599ae12b3 100644
--- a/gcc/testsuite/g++.dg/cpp/elifdef-4.C
+++ b/gcc/testsuite/g++.dg/cpp/elifdef-4.C
@@ -2,4 +2,4 @@
 // { dg-do preprocess }
 // { dg-options "" }
 
-#include "../../gcc.dg/cpp/c2x-elifdef-1.c"
+#include "../../gcc.dg/cpp/c23-elifdef-1.c"
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-lockfree-char8_t.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c
rename to gcc/testsuite/gcc.dg/atomic/c23-stdatomic-lockfree-char8_t.c
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-var-init-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
rename to gcc/testsuite/gcc.dg/atomic/c23-stdatomic-var-init-1.c
diff --git a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/gnu23-stdatomic-lockfree-char8_t.c
similarity index 75%
rename from gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
rename to gcc/testsuite/gcc.dg/atomic/gnu23-stdatomic-lockfree-char8_t.c
index 0d99b069ee9..5fb03cc84fe 100644
--- a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
+++ b/gcc/testsuite/gcc.dg/atomic/gnu23-stdatomic-lockfree-char8_t.c
@@ -2,4 +2,4 @@
 /* { dg-do run } */
 /* { dg-options "-std=gnu23 -pedantic-errors" } */
 
-#include "c2x-stdatomic-lockfree-char8_t.c"
+#include "c23-stdatomic-lockfree-char8_t.c"
diff --git a/gcc/testsuite/gcc.dg/c11-float-dfp-1.c b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
index 8d86b1bf238..1ff84b5a6b8 100644
--- a/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
 
-#include "c2x-float-no-dfp-1.c"
+#include "c23-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/c11-float-dfp-2.c b/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
index e63ebbcb0f2..aa2e9d0ddfa 100644
--- a/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
@@ -3,4 +3,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
 
-#include "c2x-float-no-dfp-3.c"
+#include "c23-float-no-dfp-3.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-align-1.c b/gcc/testsuite/gcc.dg/c23-align-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-align-1.c
rename to gcc/testsuite/gcc.dg/c23-align-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-align-6.c b/gcc/testsuite/gcc.dg/c23-align-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-align-6.c
rename to gcc/testsuite/gcc.dg/c23-align-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-1.c
similarity index 96%
rename from gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-deprecated-1.c
index 932336a1684..c1a578083b8 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-deprecated-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
 
-/* Similar to tests from gnu2x-attrs-1.c, but using the standard
+/* Similar to tests from gnu23-attrs-1.c, but using the standard
    attribute instead of gnu::deprecated, and sometimes using
    __deprecated__ or a string-literal argument.  */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-deprecated-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-deprecated-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c
rename to gcc/testsuite/gcc.dg/c23-attr-deprecated-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c
rename to gcc/testsuite/gcc.dg/c23-attr-fallthrough-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-maybe_unused-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-maybe_unused-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-maybe_unused-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c
rename to gcc/testsuite/gcc.dg/c23-attr-maybe_unused-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-nodiscard-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-nodiscard-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-nodiscard-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c
rename to gcc/testsuite/gcc.dg/c23-attr-nodiscard-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-noreturn-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-noreturn-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-noreturn-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
rename to gcc/testsuite/gcc.dg/c23-attr-syntax-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-1.c b/gcc/testsuite/gcc.dg/c23-auto-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-auto-1.c
rename to gcc/testsuite/gcc.dg/c23-auto-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-2.c b/gcc/testsuite/gcc.dg/c23-auto-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-auto-2.c
rename to gcc/testsuite/gcc.dg/c23-auto-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-3.c b/gcc/testsuite/gcc.dg/c23-auto-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-auto-3.c
rename to gcc/testsuite/gcc.dg/c23-auto-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-4.c b/gcc/testsuite/gcc.dg/c23-auto-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-auto-4.c
rename to gcc/testsuite/gcc.dg/c23-auto-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c b/gcc/testsuite/gcc.dg/c23-binary-constants-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-binary-constants-1.c
rename to gcc/testsuite/gcc.dg/c23-binary-constants-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c b/gcc/testsuite/gcc.dg/c23-binary-constants-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-binary-constants-2.c
rename to gcc/testsuite/gcc.dg/c23-binary-constants-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c b/gcc/testsuite/gcc.dg/c23-binary-constants-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-binary-constants-3.c
rename to gcc/testsuite/gcc.dg/c23-binary-constants-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-1.c b/gcc/testsuite/gcc.dg/c23-bool-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-bool-1.c
rename to gcc/testsuite/gcc.dg/c23-bool-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-2.c b/gcc/testsuite/gcc.dg/c23-bool-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-bool-2.c
rename to gcc/testsuite/gcc.dg/c23-bool-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c b/gcc/testsuite/gcc.dg/c23-bool-limits-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-bool-limits-1.c
rename to gcc/testsuite/gcc.dg/c23-bool-limits-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-builtins-1.c b/gcc/testsuite/gcc.dg/c23-builtins-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-builtins-1.c
rename to gcc/testsuite/gcc.dg/c23-builtins-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-1.c b/gcc/testsuite/gcc.dg/c23-complit-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-1.c
rename to gcc/testsuite/gcc.dg/c23-complit-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-2.c b/gcc/testsuite/gcc.dg/c23-complit-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-2.c
rename to gcc/testsuite/gcc.dg/c23-complit-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-3.c b/gcc/testsuite/gcc.dg/c23-complit-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-3.c
rename to gcc/testsuite/gcc.dg/c23-complit-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-4.c b/gcc/testsuite/gcc.dg/c23-complit-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-4.c
rename to gcc/testsuite/gcc.dg/c23-complit-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-5.c b/gcc/testsuite/gcc.dg/c23-complit-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-5.c
rename to gcc/testsuite/gcc.dg/c23-complit-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-6.c b/gcc/testsuite/gcc.dg/c23-complit-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-6.c
rename to gcc/testsuite/gcc.dg/c23-complit-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-7.c b/gcc/testsuite/gcc.dg/c23-complit-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-7.c
rename to gcc/testsuite/gcc.dg/c23-complit-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-8.c b/gcc/testsuite/gcc.dg/c23-complit-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-complit-8.c
rename to gcc/testsuite/gcc.dg/c23-complit-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-concat-1.c b/gcc/testsuite/gcc.dg/c23-concat-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-concat-1.c
rename to gcc/testsuite/gcc.dg/c23-concat-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-1.c b/gcc/testsuite/gcc.dg/c23-constexpr-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-1.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c b/gcc/testsuite/gcc.dg/c23-constexpr-2a.c
similarity index 93%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-2a.c
index 0989df48d56..a08097a126b 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-2a.c
@@ -1,7 +1,7 @@
 /* Test C23 constexpr.  Valid code, execution test.  */
 /* { dg-do link } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
-/* { dg-additional-sources "c2x-constexpr-2b.c" } */
+/* { dg-additional-sources "c23-constexpr-2b.c" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c b/gcc/testsuite/gcc.dg/c23-constexpr-2b.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-2b.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-2b.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-3.c b/gcc/testsuite/gcc.dg/c23-constexpr-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-3.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-4.c b/gcc/testsuite/gcc.dg/c23-constexpr-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-4.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-5.c b/gcc/testsuite/gcc.dg/c23-constexpr-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-5.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-6.c b/gcc/testsuite/gcc.dg/c23-constexpr-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-6.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-7.c b/gcc/testsuite/gcc.dg/c23-constexpr-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-7.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-8.c b/gcc/testsuite/gcc.dg/c23-constexpr-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-8.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-9.c b/gcc/testsuite/gcc.dg/c23-constexpr-9.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-constexpr-9.c
rename to gcc/testsuite/gcc.dg/c23-constexpr-9.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c b/gcc/testsuite/gcc.dg/c23-digit-separators-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-digit-separators-1.c
rename to gcc/testsuite/gcc.dg/c23-digit-separators-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c b/gcc/testsuite/gcc.dg/c23-digit-separators-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-digit-separators-2.c
rename to gcc/testsuite/gcc.dg/c23-digit-separators-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c b/gcc/testsuite/gcc.dg/c23-digit-separators-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-digit-separators-3.c
rename to gcc/testsuite/gcc.dg/c23-digit-separators-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-1.c b/gcc/testsuite/gcc.dg/c23-empty-init-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-empty-init-1.c
rename to gcc/testsuite/gcc.dg/c23-empty-init-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-2.c b/gcc/testsuite/gcc.dg/c23-empty-init-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-empty-init-2.c
rename to gcc/testsuite/gcc.dg/c23-empty-init-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-3.c b/gcc/testsuite/gcc.dg/c23-empty-init-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-empty-init-3.c
rename to gcc/testsuite/gcc.dg/c23-empty-init-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-1.c b/gcc/testsuite/gcc.dg/c23-enum-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-1.c
rename to gcc/testsuite/gcc.dg/c23-enum-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-2.c b/gcc/testsuite/gcc.dg/c23-enum-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-2.c
rename to gcc/testsuite/gcc.dg/c23-enum-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-3.c b/gcc/testsuite/gcc.dg/c23-enum-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-3.c
rename to gcc/testsuite/gcc.dg/c23-enum-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-4.c b/gcc/testsuite/gcc.dg/c23-enum-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-4.c
rename to gcc/testsuite/gcc.dg/c23-enum-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-5.c b/gcc/testsuite/gcc.dg/c23-enum-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-5.c
rename to gcc/testsuite/gcc.dg/c23-enum-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-6.c b/gcc/testsuite/gcc.dg/c23-enum-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-6.c
rename to gcc/testsuite/gcc.dg/c23-enum-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-7.c b/gcc/testsuite/gcc.dg/c23-enum-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-7.c
rename to gcc/testsuite/gcc.dg/c23-enum-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-8.c b/gcc/testsuite/gcc.dg/c23-enum-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-enum-8.c
rename to gcc/testsuite/gcc.dg/c23-enum-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-1.c b/gcc/testsuite/gcc.dg/c23-float-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-1.c
rename to gcc/testsuite/gcc.dg/c23-float-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-10.c b/gcc/testsuite/gcc.dg/c23-float-10.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-10.c
rename to gcc/testsuite/gcc.dg/c23-float-10.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-11.c b/gcc/testsuite/gcc.dg/c23-float-11.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-11.c
rename to gcc/testsuite/gcc.dg/c23-float-11.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-12.c b/gcc/testsuite/gcc.dg/c23-float-12.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-12.c
rename to gcc/testsuite/gcc.dg/c23-float-12.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-13.c b/gcc/testsuite/gcc.dg/c23-float-13.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-13.c
rename to gcc/testsuite/gcc.dg/c23-float-13.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-2.c b/gcc/testsuite/gcc.dg/c23-float-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-2.c
rename to gcc/testsuite/gcc.dg/c23-float-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-3.c b/gcc/testsuite/gcc.dg/c23-float-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-3.c
rename to gcc/testsuite/gcc.dg/c23-float-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-4.c b/gcc/testsuite/gcc.dg/c23-float-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-4.c
rename to gcc/testsuite/gcc.dg/c23-float-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-5.c b/gcc/testsuite/gcc.dg/c23-float-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-5.c
rename to gcc/testsuite/gcc.dg/c23-float-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-6.c b/gcc/testsuite/gcc.dg/c23-float-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-6.c
rename to gcc/testsuite/gcc.dg/c23-float-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7a.c b/gcc/testsuite/gcc.dg/c23-float-7a.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-7a.c
rename to gcc/testsuite/gcc.dg/c23-float-7a.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7b.c b/gcc/testsuite/gcc.dg/c23-float-7b.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-7b.c
rename to gcc/testsuite/gcc.dg/c23-float-7b.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7c.c b/gcc/testsuite/gcc.dg/c23-float-7c.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-7c.c
rename to gcc/testsuite/gcc.dg/c23-float-7c.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-8.c b/gcc/testsuite/gcc.dg/c23-float-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-8.c
rename to gcc/testsuite/gcc.dg/c23-float-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-9.c b/gcc/testsuite/gcc.dg/c23-float-9.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-9.c
rename to gcc/testsuite/gcc.dg/c23-float-9.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
rename to gcc/testsuite/gcc.dg/c23-float-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-2.c
similarity index 88%
rename from gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
rename to gcc/testsuite/gcc.dg/c23-float-no-dfp-2.c
index 25a2a97cca6..bfe54d72720 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-2.c
@@ -6,4 +6,4 @@
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-no-dfp-1.c"
+#include "c23-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c
rename to gcc/testsuite/gcc.dg/c23-float-no-dfp-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-4.c
similarity index 89%
rename from gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
rename to gcc/testsuite/gcc.dg/c23-float-no-dfp-4.c
index 8518c0a6e82..270dd3176e0 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-4.c
@@ -7,4 +7,4 @@
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-no-dfp-3.c"
+#include "c23-float-no-dfp-3.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-1.c b/gcc/testsuite/gcc.dg/c23-floatn-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-1.c
rename to gcc/testsuite/gcc.dg/c23-floatn-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-2.c b/gcc/testsuite/gcc.dg/c23-floatn-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-2.c
rename to gcc/testsuite/gcc.dg/c23-floatn-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-3.c b/gcc/testsuite/gcc.dg/c23-floatn-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-3.c
rename to gcc/testsuite/gcc.dg/c23-floatn-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-4.c b/gcc/testsuite/gcc.dg/c23-floatn-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-4.c
rename to gcc/testsuite/gcc.dg/c23-floatn-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-5.c b/gcc/testsuite/gcc.dg/c23-floatn-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-5.c
rename to gcc/testsuite/gcc.dg/c23-floatn-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-6.c b/gcc/testsuite/gcc.dg/c23-floatn-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-6.c
rename to gcc/testsuite/gcc.dg/c23-floatn-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-7.c b/gcc/testsuite/gcc.dg/c23-floatn-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-7.c
rename to gcc/testsuite/gcc.dg/c23-floatn-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-8.c b/gcc/testsuite/gcc.dg/c23-floatn-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-floatn-8.c
rename to gcc/testsuite/gcc.dg/c23-floatn-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-1.c b/gcc/testsuite/gcc.dg/c23-fordecl-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-fordecl-1.c
rename to gcc/testsuite/gcc.dg/c23-fordecl-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-2.c b/gcc/testsuite/gcc.dg/c23-fordecl-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-fordecl-2.c
rename to gcc/testsuite/gcc.dg/c23-fordecl-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-3.c b/gcc/testsuite/gcc.dg/c23-fordecl-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-fordecl-3.c
rename to gcc/testsuite/gcc.dg/c23-fordecl-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-4.c b/gcc/testsuite/gcc.dg/c23-fordecl-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-fordecl-4.c
rename to gcc/testsuite/gcc.dg/c23-fordecl-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c
rename to gcc/testsuite/gcc.dg/c23-has-c-attribute-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c
rename to gcc/testsuite/gcc.dg/c23-has-c-attribute-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c
rename to gcc/testsuite/gcc.dg/c23-has-c-attribute-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c
rename to gcc/testsuite/gcc.dg/c23-has-c-attribute-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-1.c b/gcc/testsuite/gcc.dg/c23-labels-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-labels-1.c
rename to gcc/testsuite/gcc.dg/c23-labels-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-2.c b/gcc/testsuite/gcc.dg/c23-labels-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-labels-2.c
rename to gcc/testsuite/gcc.dg/c23-labels-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-3.c b/gcc/testsuite/gcc.dg/c23-labels-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-labels-3.c
rename to gcc/testsuite/gcc.dg/c23-labels-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-limits-1.c b/gcc/testsuite/gcc.dg/c23-limits-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-limits-1.c
rename to gcc/testsuite/gcc.dg/c23-limits-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c b/gcc/testsuite/gcc.dg/c23-no-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-no-dfp-1.c
rename to gcc/testsuite/gcc.dg/c23-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-1.c b/gcc/testsuite/gcc.dg/c23-nullptr-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-1.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-2.c b/gcc/testsuite/gcc.dg/c23-nullptr-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-2.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-3.c b/gcc/testsuite/gcc.dg/c23-nullptr-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-3.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-4.c b/gcc/testsuite/gcc.dg/c23-nullptr-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-4.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-5.c b/gcc/testsuite/gcc.dg/c23-nullptr-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-5.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c b/gcc/testsuite/gcc.dg/c23-nullptr-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-nullptr-6.c
rename to gcc/testsuite/gcc.dg/c23-nullptr-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c
rename to gcc/testsuite/gcc.dg/c23-old-style-definition-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c b/gcc/testsuite/gcc.dg/c23-parm-omit-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-parm-omit-1.c
rename to gcc/testsuite/gcc.dg/c23-parm-omit-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c b/gcc/testsuite/gcc.dg/c23-parm-omit-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-parm-omit-2.c
rename to gcc/testsuite/gcc.dg/c23-parm-omit-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c b/gcc/testsuite/gcc.dg/c23-parm-omit-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-parm-omit-3.c
rename to gcc/testsuite/gcc.dg/c23-parm-omit-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c b/gcc/testsuite/gcc.dg/c23-parm-omit-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-parm-omit-4.c
rename to gcc/testsuite/gcc.dg/c23-parm-omit-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-1.c b/gcc/testsuite/gcc.dg/c23-qual-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-1.c
rename to gcc/testsuite/gcc.dg/c23-qual-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-2.c b/gcc/testsuite/gcc.dg/c23-qual-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-2.c
rename to gcc/testsuite/gcc.dg/c23-qual-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-3.c b/gcc/testsuite/gcc.dg/c23-qual-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-3.c
rename to gcc/testsuite/gcc.dg/c23-qual-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-4.c b/gcc/testsuite/gcc.dg/c23-qual-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-4.c
rename to gcc/testsuite/gcc.dg/c23-qual-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-5.c b/gcc/testsuite/gcc.dg/c23-qual-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-5.c
rename to gcc/testsuite/gcc.dg/c23-qual-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-6.c b/gcc/testsuite/gcc.dg/c23-qual-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-6.c
rename to gcc/testsuite/gcc.dg/c23-qual-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-7.c b/gcc/testsuite/gcc.dg/c23-qual-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-qual-7.c
rename to gcc/testsuite/gcc.dg/c23-qual-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-1.c b/gcc/testsuite/gcc.dg/c23-static-assert-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-static-assert-1.c
rename to gcc/testsuite/gcc.dg/c23-static-assert-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-2.c b/gcc/testsuite/gcc.dg/c23-static-assert-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-static-assert-2.c
rename to gcc/testsuite/gcc.dg/c23-static-assert-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-3.c b/gcc/testsuite/gcc.dg/c23-static-assert-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-static-assert-3.c
rename to gcc/testsuite/gcc.dg/c23-static-assert-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-4.c b/gcc/testsuite/gcc.dg/c23-static-assert-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-static-assert-4.c
rename to gcc/testsuite/gcc.dg/c23-static-assert-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-1.c b/gcc/testsuite/gcc.dg/c23-stdarg-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdarg-1.c
rename to gcc/testsuite/gcc.dg/c23-stdarg-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-2.c b/gcc/testsuite/gcc.dg/c23-stdarg-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdarg-2.c
rename to gcc/testsuite/gcc.dg/c23-stdarg-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-3.c b/gcc/testsuite/gcc.dg/c23-stdarg-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdarg-3.c
rename to gcc/testsuite/gcc.dg/c23-stdarg-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-4.c b/gcc/testsuite/gcc.dg/c23-stdarg-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdarg-4.c
rename to gcc/testsuite/gcc.dg/c23-stdarg-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c b/gcc/testsuite/gcc.dg/c23-stdarg-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdarg-5.c
rename to gcc/testsuite/gcc.dg/c23-stdarg-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c b/gcc/testsuite/gcc.dg/c23-stdatomic-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdatomic-1.c
rename to gcc/testsuite/gcc.dg/c23-stdatomic-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stddef-1.c b/gcc/testsuite/gcc.dg/c23-stddef-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stddef-1.c
rename to gcc/testsuite/gcc.dg/c23-stddef-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdint-1.c b/gcc/testsuite/gcc.dg/c23-stdint-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-stdint-1.c
rename to gcc/testsuite/gcc.dg/c23-stdint-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-1.c b/gcc/testsuite/gcc.dg/c23-thread-local-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-thread-local-1.c
rename to gcc/testsuite/gcc.dg/c23-thread-local-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-2.c b/gcc/testsuite/gcc.dg/c23-thread-local-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-thread-local-2.c
rename to gcc/testsuite/gcc.dg/c23-thread-local-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-1.c b/gcc/testsuite/gcc.dg/c23-typeof-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-typeof-1.c
rename to gcc/testsuite/gcc.dg/c23-typeof-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-2.c b/gcc/testsuite/gcc.dg/c23-typeof-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-typeof-2.c
rename to gcc/testsuite/gcc.dg/c23-typeof-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-3.c b/gcc/testsuite/gcc.dg/c23-typeof-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-typeof-3.c
rename to gcc/testsuite/gcc.dg/c23-typeof-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-1.c b/gcc/testsuite/gcc.dg/c23-unproto-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-unproto-1.c
rename to gcc/testsuite/gcc.dg/c23-unproto-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-2.c b/gcc/testsuite/gcc.dg/c23-unproto-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-unproto-2.c
rename to gcc/testsuite/gcc.dg/c23-unproto-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-3.c b/gcc/testsuite/gcc.dg/c23-unproto-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-unproto-3.c
rename to gcc/testsuite/gcc.dg/c23-unproto-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-4.c b/gcc/testsuite/gcc.dg/c23-unproto-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-unproto-4.c
rename to gcc/testsuite/gcc.dg/c23-unproto-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unreachable-1.c b/gcc/testsuite/gcc.dg/c23-unreachable-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-unreachable-1.c
rename to gcc/testsuite/gcc.dg/c23-unreachable-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-1.c b/gcc/testsuite/gcc.dg/c23-utf8char-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-utf8char-1.c
rename to gcc/testsuite/gcc.dg/c23-utf8char-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-2.c b/gcc/testsuite/gcc.dg/c23-utf8char-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-utf8char-2.c
rename to gcc/testsuite/gcc.dg/c23-utf8char-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-3.c b/gcc/testsuite/gcc.dg/c23-utf8char-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-utf8char-3.c
rename to gcc/testsuite/gcc.dg/c23-utf8char-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str-type.c b/gcc/testsuite/gcc.dg/c23-utf8str-type.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-utf8str-type.c
rename to gcc/testsuite/gcc.dg/c23-utf8str-type.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str.c b/gcc/testsuite/gcc.dg/c23-utf8str.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/c2x-utf8str.c
rename to gcc/testsuite/gcc.dg/c23-utf8str.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-elifdef-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c
rename to gcc/testsuite/gcc.dg/cpp/c23-elifdef-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c23-scope-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-scope-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c b/gcc/testsuite/gcc.dg/cpp/c23-scope-2.c
similarity index 82%
rename from gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
rename to gcc/testsuite/gcc.dg/cpp/c23-scope-2.c
index a372b56fed4..1304221535d 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-scope-2.c
@@ -8,4 +8,4 @@
 /* This must have a space inserted between the two ':' tokens in
    preprocessed output.  */
 TEST()COLON()COLON()TEST()
-/* { dg-final { scan-file c2x-scope-2.i "ABC: :ABC" } } */
+/* { dg-final { scan-file c23-scope-2.i "ABC: :ABC" } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-trigraphs-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c
rename to gcc/testsuite/gcc.dg/cpp/c23-trigraphs-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c b/gcc/testsuite/gcc.dg/cpp/c23-ucn-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-ucn-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1-utf8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c
rename to gcc/testsuite/gcc.dg/cpp/c23-ucnid-1-utf8.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-ucnid-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c b/gcc/testsuite/gcc.dg/cpp/c23-va-opt-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-va-opt-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/c23-warning-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c
rename to gcc/testsuite/gcc.dg/cpp/c23-warning-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/c23-warning-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c
rename to gcc/testsuite/gcc.dg/cpp/c23-warning-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c b/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
index efcfbc93270..706ed0f48f6 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
@@ -2,4 +2,4 @@
 /* { dg-do preprocess } */
 /* { dg-options "-std=gnu11" } */
 
-#include "c2x-elifdef-1.c"
+#include "c23-elifdef-1.c"
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c
rename to gcc/testsuite/gcc.dg/cpp/gnu23-warning-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c
rename to gcc/testsuite/gcc.dg/cpp/gnu23-warning-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-builtins-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c
rename to gcc/testsuite/gcc.dg/dfp/c23-builtins-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c b/gcc/testsuite/gcc.dg/dfp/c23-constants-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
rename to gcc/testsuite/gcc.dg/dfp/c23-constants-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c b/gcc/testsuite/gcc.dg/dfp/c23-constants-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
rename to gcc/testsuite/gcc.dg/dfp/c23-constants-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c
rename to gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c
rename to gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-2.c
similarity index 88%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-2.c
index 1b3e69361c8..96e8515a68b 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-2.c
@@ -5,4 +5,4 @@
 
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-dfp-1.c"
+#include "c23-float-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-3.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-4.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-5.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-6.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-6.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-7.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-7.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-8.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c
rename to gcc/testsuite/gcc.dg/dfp/c23-float-dfp-8.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c b/gcc/testsuite/gcc.dg/dfp/c23-keywords-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
rename to gcc/testsuite/gcc.dg/dfp/c23-keywords-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c b/gcc/testsuite/gcc.dg/dfp/c23-keywords-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
rename to gcc/testsuite/gcc.dg/dfp/c23-keywords-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
index e43ecac2068..6a405238998 100644
--- a/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
@@ -5,4 +5,4 @@
 
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-dfp-1.c"
+#include "c23-float-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c b/gcc/testsuite/gcc.dg/format/c23-dfp-printf-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c
rename to gcc/testsuite/gcc.dg/format/c23-dfp-printf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c b/gcc/testsuite/gcc.dg/format/c23-dfp-scanf-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c
rename to gcc/testsuite/gcc.dg/format/c23-dfp-scanf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-printf-1.c b/gcc/testsuite/gcc.dg/format/c23-printf-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/format/c2x-printf-1.c
rename to gcc/testsuite/gcc.dg/format/c23-printf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c b/gcc/testsuite/gcc.dg/format/c23-scanf-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/format/c2x-scanf-1.c
rename to gcc/testsuite/gcc.dg/format/c23-scanf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c b/gcc/testsuite/gcc.dg/format/c23-strftime-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
rename to gcc/testsuite/gcc.dg/format/c23-strftime-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c
rename to gcc/testsuite/gcc.dg/gnu23-attr-syntax-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c
rename to gcc/testsuite/gcc.dg/gnu23-attr-syntax-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c b/gcc/testsuite/gcc.dg/gnu23-attrs-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-attrs-1.c
rename to gcc/testsuite/gcc.dg/gnu23-attrs-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c b/gcc/testsuite/gcc.dg/gnu23-attrs-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-attrs-2.c
rename to gcc/testsuite/gcc.dg/gnu23-attrs-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-auto-1.c b/gcc/testsuite/gcc.dg/gnu23-auto-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-auto-1.c
rename to gcc/testsuite/gcc.dg/gnu23-auto-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c b/gcc/testsuite/gcc.dg/gnu23-builtins-no-dfp-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c
rename to gcc/testsuite/gcc.dg/gnu23-builtins-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-1.c b/gcc/testsuite/gcc.dg/gnu23-complit-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-complit-1.c
rename to gcc/testsuite/gcc.dg/gnu23-complit-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-2.c b/gcc/testsuite/gcc.dg/gnu23-complit-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-complit-2.c
rename to gcc/testsuite/gcc.dg/gnu23-complit-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c b/gcc/testsuite/gcc.dg/gnu23-constexpr-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c
rename to gcc/testsuite/gcc.dg/gnu23-constexpr-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c b/gcc/testsuite/gcc.dg/gnu23-empty-init-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c
rename to gcc/testsuite/gcc.dg/gnu23-empty-init-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c b/gcc/testsuite/gcc.dg/gnu23-empty-init-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c
rename to gcc/testsuite/gcc.dg/gnu23-empty-init-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-enum-1.c b/gcc/testsuite/gcc.dg/gnu23-enum-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-enum-1.c
rename to gcc/testsuite/gcc.dg/gnu23-enum-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c b/gcc/testsuite/gcc.dg/gnu23-static-assert-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c
rename to gcc/testsuite/gcc.dg/gnu23-static-assert-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c b/gcc/testsuite/gcc.dg/gnu23-stdarg-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c
rename to gcc/testsuite/gcc.dg/gnu23-stdarg-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c b/gcc/testsuite/gcc.dg/gnu23-typeof-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-typeof-1.c
rename to gcc/testsuite/gcc.dg/gnu23-typeof-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c b/gcc/testsuite/gcc.dg/gnu23-utf8char-1.c
similarity index 81%
rename from gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
rename to gcc/testsuite/gcc.dg/gnu23-utf8char-1.c
index 206ff233e99..f5e13491d45 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-utf8char-1.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "c2x-utf8char-1.c"
+#include "c23-utf8char-1.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c b/gcc/testsuite/gcc.dg/gnu23-utf8str-type.c
similarity index 79%
rename from gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
rename to gcc/testsuite/gcc.dg/gnu23-utf8str-type.c
index 7b5ccb02bcd..95440e385b2 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
+++ b/gcc/testsuite/gcc.dg/gnu23-utf8str-type.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "c2x-utf8str-type.c"
+#include "c23-utf8str-type.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str.c b/gcc/testsuite/gcc.dg/gnu23-utf8str.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/gnu2x-utf8str.c
rename to gcc/testsuite/gcc.dg/gnu23-utf8str.c
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c23.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
rename to gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c23.c
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1a.c
similarity index 95%
rename from gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
rename to gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1a.c
index d67f147dd2b..2dff79235b2 100644
--- a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
+++ b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1a.c
@@ -3,7 +3,7 @@
    between source files.  */
 /* { dg-do run } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
-/* { dg-additional-sources "c2x-stdarg-split-1b.c" } */
+/* { dg-additional-sources "c23-stdarg-split-1b.c" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1b.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c
rename to gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1b.c
diff --git a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m b/gcc/testsuite/objc.dg/attributes/gnu23-attr-syntax-1.m
similarity index 74%
rename from gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
rename to gcc/testsuite/objc.dg/attributes/gnu23-attr-syntax-1.m
index dedd53cdb05..d72d83aabc6 100644
--- a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
+++ b/gcc/testsuite/objc.dg/attributes/gnu23-attr-syntax-1.m
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "../../gcc.dg/c2x-attr-syntax-1.c"
+#include "../../gcc.dg/c23-attr-syntax-1.c"
