diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index d29c0bd1175fd..8a0518586c3c7 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -11071,7 +11071,7 @@ def note_invalid_type_in_sycl_kernel : Note<
   "%select{%1 should be globally-visible"
   "|unscoped enum %1 requires fixed underlying type"
   "|type %1 cannot be in the \"std\" namespace"
-  "|kernel name is missing"
+  "|unnamed type used in a SYCL kernel name"
   "}0">;
 
 def err_sycl_kernel_not_function_object
diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
index 180e25cc130de..bac0e071d9812 100644
--- a/clang/lib/Sema/SemaSYCL.cpp
+++ b/clang/lib/Sema/SemaSYCL.cpp
@@ -2921,7 +2921,7 @@ class SYCLKernelNameTypeVisitor
               << KernelNameType;
           S.Diag(KernelInvocationFuncLoc,
                  diag::note_invalid_type_in_sycl_kernel)
-              << /* kernel name is missing */ 3;
+              << /* unnamed type used in a SYCL kernel name */ 3;
           IsInvalid = true;
           return;
         }
diff --git a/clang/test/SemaSYCL/unnamed-kernel.cpp b/clang/test/SemaSYCL/unnamed-kernel.cpp
index e452bd1c6430d..c4e3746f78679 100644
--- a/clang/test/SemaSYCL/unnamed-kernel.cpp
+++ b/clang/test/SemaSYCL/unnamed-kernel.cpp
@@ -118,7 +118,7 @@ int main() {
   cl::sycl::queue q;
 #ifndef __SYCL_UNNAMED_LAMBDA__
   // expected-error-re@Inputs/sycl.hpp:220 {{'(lambda at {{.*}}unnamed-kernel.cpp{{.*}}' is an invalid kernel name type}}
-  // expected-note@Inputs/sycl.hpp:220 {{kernel name is missing}}
+  // expected-note@Inputs/sycl.hpp:220 {{unnamed type used in a SYCL kernel name}}
   // expected-note@+2{{in instantiation of function template specialization}}
 #endif
   q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); });