diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 3426921994858..dc3373a1e1c71 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -11274,8 +11274,8 @@ def err_implied_coroutine_type_not_found : Error<
   "a coroutine; include <experimental/coroutine> if your version "
   "of libcxx is less than 14.0">;
 def warn_deprecated_coroutine_namespace : Warning<
-  "support for std::experimental::%0 will be removed in LLVM 17; "
-  "use std::%0 instead">,
+  "support for 'std::experimental::%0' will be removed in Clang 17; "
+  "use 'std::%0' instead">,
   InGroup<DeprecatedExperimentalCoroutine>;
 def err_mixed_use_std_and_experimental_namespace_for_coroutine : Error<
   "conflicting mixed use of std and std::experimental namespaces for "
diff --git a/clang/test/SemaCXX/co_await-range-for-exp-namespace.cpp b/clang/test/SemaCXX/co_await-range-for-exp-namespace.cpp
index 18541cee00145..9db3f0138d460 100644
--- a/clang/test/SemaCXX/co_await-range-for-exp-namespace.cpp
+++ b/clang/test/SemaCXX/co_await-range-for-exp-namespace.cpp
@@ -50,7 +50,7 @@ struct MyForLoopArrayAwaiter {
 };
 MyForLoopArrayAwaiter g() {
   int arr[10] = {0};
-  for co_await (auto i : arr) {} // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  for co_await (auto i : arr) {} // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
   // expected-error@-1 {{call to deleted member function 'await_transform'}}
   // expected-note@-2 {{'await_transform' implicitly required by 'co_await' here}}
   // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
diff --git a/clang/test/SemaCXX/coreturn-eh-exp-namespace.cpp b/clang/test/SemaCXX/coreturn-eh-exp-namespace.cpp
index facdedf14d01d..6e302d6179878 100644
--- a/clang/test/SemaCXX/coreturn-eh-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coreturn-eh-exp-namespace.cpp
@@ -39,7 +39,7 @@ struct std::experimental::coroutine_traits<void, T1> { using promise_type = prom
 VoidTagReturnValue test() {
   object x = {};
   try {
-    co_return {}; // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+    co_return {}; // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
     // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
   } catch (...) {
     throw;
diff --git a/clang/test/SemaCXX/coreturn-exp-namespace.cpp b/clang/test/SemaCXX/coreturn-exp-namespace.cpp
index f45b030f322b2..2c0f2842fcbe0 100644
--- a/clang/test/SemaCXX/coreturn-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coreturn-exp-namespace.cpp
@@ -83,7 +83,7 @@ struct std::experimental::coroutine_traits<float, T...> { using promise_type = p
 template <typename... T>
 struct std::experimental::coroutine_traits<int, T...> { using promise_type = promise_int; };
 
-void test0() { co_await a; } // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+void test0() { co_await a; } // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
 // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
 float test1() { co_await a; }
 
diff --git a/clang/test/SemaCXX/coroutine-final-suspend-noexcept-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-final-suspend-noexcept-exp-namespace.cpp
index b501d537b7a8d..e50e90b8df4f2 100644
--- a/clang/test/SemaCXX/coroutine-final-suspend-noexcept-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-final-suspend-noexcept-exp-namespace.cpp
@@ -51,7 +51,7 @@ struct coro_t {
 
 coro_t f(int n) { // expected-error {{the expression 'co_await __promise.final_suspend()' is required to be non-throwing}}
   A a{};
-  co_await a; // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  co_await a; // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
 }
 
 template <typename T>
diff --git a/clang/test/SemaCXX/coroutine-mixed-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-mixed-exp-namespace.cpp
index 5c214ca732bed..ae67f3aa819a8 100644
--- a/clang/test/SemaCXX/coroutine-mixed-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-mixed-exp-namespace.cpp
@@ -24,7 +24,7 @@ struct std::coroutine_traits<void> { using promise_type = promise_void; };
 
 void test() {
   co_return; // expected-error {{mixed use of std and std::experimental namespaces for coroutine components}}
-  // expected-warning@-1{{support for std::experimental::coroutine_traits will be removed}}
+  // expected-warning@-1{{support for 'std::experimental::coroutine_traits' will be removed}}
   // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
   // expected-note@Inputs/std-coroutine.h:8 {{'coroutine_traits' declared here}}
 }
diff --git a/clang/test/SemaCXX/coroutine-mixed2-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-mixed2-exp-namespace.cpp
index 3d37b34c642e6..a4f228a227838 100644
--- a/clang/test/SemaCXX/coroutine-mixed2-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-mixed2-exp-namespace.cpp
@@ -25,7 +25,7 @@ struct std::coroutine_traits<void> { using promise_type = promise_void; };
 
 void test() {
   co_return; // expected-error {{mixed use of std and std::experimental namespaces for coroutine components}}
-  // expected-warning@-1{{support for std::experimental::coroutine_traits will be removed}}
+  // expected-warning@-1{{support for 'std::experimental::coroutine_traits' will be removed}}
   // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
   // expected-note@Inputs/std-coroutine.h:8 {{'coroutine_traits' declared here}}
 }
diff --git a/clang/test/SemaCXX/coroutine-mixed3-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-mixed3-exp-namespace.cpp
index 533f9d78e2784..b47f5f75ab99a 100644
--- a/clang/test/SemaCXX/coroutine-mixed3-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-mixed3-exp-namespace.cpp
@@ -26,5 +26,5 @@ struct std::coroutine_traits<void> { using promise_type = promise_void; };
 
 void test() {
   co_return;
-  // expected-warning@-1{{support for std::experimental::coroutine_traits will be removed}}
+  // expected-warning@-1{{support for 'std::experimental::coroutine_traits' will be removed}}
 }
diff --git a/clang/test/SemaCXX/coroutine-mixed4-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-mixed4-exp-namespace.cpp
index 715282dd2df83..49e79b868b0f5 100644
--- a/clang/test/SemaCXX/coroutine-mixed4-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-mixed4-exp-namespace.cpp
@@ -27,6 +27,6 @@ struct std::coroutine_traits<void> { using promise_type = promise_void; };
 
 void test() {
   co_return; // expected-error {{mixed use of std and std::experimental namespaces for coroutine components}}
-  // expected-warning@-1{{support for std::experimental::coroutine_traits will be removed}}
+  // expected-warning@-1{{support for 'std::experimental::coroutine_traits' will be removed}}
   // expected-note@Inputs/std-coroutine.h:8 {{'coroutine_traits' declared here}}
 }
diff --git a/clang/test/SemaCXX/coroutine-rvo-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-rvo-exp-namespace.cpp
index f8941f8ed2dcf..dd8efa1bffd41 100644
--- a/clang/test/SemaCXX/coroutine-rvo-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-rvo-exp-namespace.cpp
@@ -63,7 +63,7 @@ struct task {
 
 task<NoCopyNoMove> local2val() {
   NoCopyNoMove value;
-  co_return value; // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  co_return value; // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
 }
 
 task<NoCopyNoMove &> local2ref() {
diff --git a/clang/test/SemaCXX/coroutine-seh-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-seh-exp-namespace.cpp
index bfe421595c002..37d6975e1de50 100644
--- a/clang/test/SemaCXX/coroutine-seh-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-seh-exp-namespace.cpp
@@ -34,7 +34,7 @@ template <> struct std::experimental::coroutine_traits<void> {
 void SEH_used() {
   __try {      // expected-error {{cannot use SEH '__try' in a coroutine when C++ exceptions are enabled}}
     co_return; // expected-note {{function is a coroutine due to use of 'co_return' here}}
-               // expected-warning@-1 {{support for std::experimental::coroutine_traits will be removed}}
+               // expected-warning@-1 {{support for 'std::experimental::coroutine_traits' will be removed}}
   } __except (0) {
   }
 }
diff --git a/clang/test/SemaCXX/coroutine-traits-undefined-template-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-traits-undefined-template-exp-namespace.cpp
index c71023ad5af5c..f0f1cc573eff3 100644
--- a/clang/test/SemaCXX/coroutine-traits-undefined-template-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-traits-undefined-template-exp-namespace.cpp
@@ -16,5 +16,5 @@ template <> struct coroutine_traits<void>; // expected-note {{forward declaratio
 
 void uses_forward_declaration() {
   co_return; // expected-error {{this function cannot be a coroutine: missing definition of specialization 'coroutine_traits<void>'}}
-             // expected-warning@-1 {{support for std::experimental::coroutine_traits will be removed}}
+             // expected-warning@-1 {{support for 'std::experimental::coroutine_traits' will be removed}}
 }
diff --git a/clang/test/SemaCXX/coroutine-unhandled_exception-warning-exp-namespace.cpp b/clang/test/SemaCXX/coroutine-unhandled_exception-warning-exp-namespace.cpp
index 1987eeaa90ae9..bd5dced7f215b 100644
--- a/clang/test/SemaCXX/coroutine-unhandled_exception-warning-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine-unhandled_exception-warning-exp-namespace.cpp
@@ -32,7 +32,7 @@ struct std::experimental::coroutine_traits<void, T...> { using promise_type = pr
 
 #ifndef DISABLE_WARNING
 void test0() { // expected-warning {{'promise_void' is required to declare the member 'unhandled_exception()' when exceptions are enabled}}
-  co_return;   // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  co_return;   // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
   // expected-note@Inputs/std-coroutine-exp-namespace.h:8 {{'coroutine_traits' declared here}}
 }
 #else
diff --git a/clang/test/SemaCXX/coroutine_handle-address-return-type-exp-namespace.cpp b/clang/test/SemaCXX/coroutine_handle-address-return-type-exp-namespace.cpp
index f167d167746a7..14982143a420c 100644
--- a/clang/test/SemaCXX/coroutine_handle-address-return-type-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutine_handle-address-return-type-exp-namespace.cpp
@@ -67,7 +67,7 @@ struct awaitable {
 } a;
 
 task f() {
-  co_await a; // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  co_await a; // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
 }
 
 int main() {
diff --git a/clang/test/SemaCXX/coroutines-exp-namespace.cpp b/clang/test/SemaCXX/coroutines-exp-namespace.cpp
index 5c6f8e0bf0ed0..59af88f60f2f0 100644
--- a/clang/test/SemaCXX/coroutines-exp-namespace.cpp
+++ b/clang/test/SemaCXX/coroutines-exp-namespace.cpp
@@ -84,7 +84,7 @@ struct auto_await_suspend {
 
 struct DummyVoidTag {};
 DummyVoidTag no_specialization() { // expected-error {{this function cannot be a coroutine: 'std::experimental::coroutine_traits<DummyVoidTag>' has no member named 'promise_type'}}
-  co_await a;                      // expected-warning {{support for std::experimental::coroutine_traits will be removed}}
+  co_await a;                      // expected-warning {{support for 'std::experimental::coroutine_traits' will be removed}}
 }
 
 template <typename... T>