diff --git a/Help/release/dev/gtest-use-json-output-for-discovery.rst b/Help/release/dev/gtest-use-json-output-for-discovery.rst
index 304b3c0848..09f2d3588e 100644
--- a/Help/release/dev/gtest-use-json-output-for-discovery.rst
+++ b/Help/release/dev/gtest-use-json-output-for-discovery.rst
@@ -5,3 +5,8 @@ gtest-use-json-output-for-discovery
   module now sets the ``DEF_SOURCE_LINE`` test property for each discovered
   test if gtest supports the ``--gtest_output=json`` option.  This test
   property is used by some IDEs to locate the source for each test.
+* The :command:`gtest_discover_tests()` command from the :module:`GoogleTest`
+  module previously parsed certain type-parameterized test names incorrectly.
+  Their names ended up with raw characters from gtest's output and were
+  very obviously misparsed.  Those names are now parsed correctly, so projects
+  may see different test names to before for affected tests.
diff --git a/Modules/GoogleTestAddTests.cmake b/Modules/GoogleTestAddTests.cmake
index 3061ed23c0..d376af1aa3 100644
--- a/Modules/GoogleTestAddTests.cmake
+++ b/Modules/GoogleTestAddTests.cmake
@@ -58,39 +58,28 @@ macro(write_test_to_file)
     string(REGEX REPLACE "^DISABLED_" "" pretty_test_name "${pretty_test_name}")
   endif()
 
-  set(pretty_type_param "")
-  if(NOT current_test_type_param STREQUAL "")
-    # Parse test suite index from name
-    set(current_test_suite_index "")
-    if(pretty_test_suite MATCHES "^(.+)/([0-9]+)$")
-      set(pretty_test_suite ${CMAKE_MATCH_1})
-      set(current_test_suite_index ${CMAKE_MATCH_2})
-    endif()
-    if(NOT current_test_suite_index STREQUAL "")
-      if(arg_NO_PRETTY_TYPES)
-        set(pretty_type_param "<${current_test_suite_index}>")
-      else()
-        set(pretty_type_param "<${current_test_type_param}>")
-      endif()
-    else()
-      # bug compatibility with https://gitlab.kitware.com/cmake/cmake/-/issues/26939
-      set(pretty_test_suite "${pretty_test_suite}.  # TypeParam = ${current_test_type_param}")
-      set(pretty_type_param "<${pretty_test_suite}>")
-    endif()
+  if (NOT current_test_value_param STREQUAL "" AND NOT arg_NO_PRETTY_VALUES)
+    # Remove value param name, if any, from test name
+    string(REGEX REPLACE "^(.+)/.+$" "\\1" pretty_test_name "${pretty_test_name}")
+    set(pretty_test_name "${pretty_test_name}/${current_test_value_param}")
   endif()
-  if (NOT current_test_value_param STREQUAL "")
-    # Parse test index from name
-    if(NOT arg_NO_PRETTY_VALUES)
-      if(pretty_test_name MATCHES "^(.+)/[0-9]+$")
-        set(pretty_test_name "${CMAKE_MATCH_1}/${current_test_value_param}")
-      else()
-        # bug compatibility with https://gitlab.kitware.com/cmake/cmake/-/issues/26939
-        set(pretty_test_name "${pretty_test_name}  # GetParam() = ${current_test_value_param}")
-      endif()
+
+  if(NOT current_test_type_param STREQUAL "")
+    # Parse type param name from suite name
+    if(pretty_test_suite MATCHES "^(.+)/(.+)$")
+      set(pretty_test_suite "${CMAKE_MATCH_1}")
+      set(current_type_param_name "${CMAKE_MATCH_2}")
+    else()
+      set(current_type_param_name "")
+    endif()
+    if (NOT arg_NO_PRETTY_TYPES)
+      string(APPEND pretty_test_name  "<${current_test_type_param}>")
+    elseif(NOT current_type_param_name STREQUAL "")
+        string(APPEND pretty_test_name "<${current_type_param_name}>")
     endif()
   endif()
 
-  set(test_name_template "@prefix@@pretty_test_suite@.@pretty_test_name@@pretty_type_param@@suffix@")
+  set(test_name_template "@prefix@@pretty_test_suite@.@pretty_test_name@@suffix@")
   string(CONFIGURE "${test_name_template}" testname)
 
   if(NOT "${arg_TEST_XML_OUTPUT_DIR}" STREQUAL "")
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
index 4631a27589..a658586841 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change-typed-stdout.txt
@@ -2,22 +2,22 @@ Test project .*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-arg-change
   Test +#[0-9]+: typed\.case<short>
   Test +#[0-9]+: typed\.case<float>
   Test +#[0-9]+: typed\.case<char>
-  Test +#[0-9]+: typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>
+  Test +#[0-9]+: typed\.case<int>
   Test +#[0-9]+: ns\.typed\.case<short>
   Test +#[0-9]+: ns\.typed\.case<float>
   Test +#[0-9]+: ns\.typed\.case<char>
-  Test +#[0-9]+: ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>
+  Test +#[0-9]+: ns\.typed\.case<int>
   Test +#[0-9]+: prefix/typed\.case<short>
   Test +#[0-9]+: prefix/typed\.case<float>
   Test +#[0-9]+: prefix/typed\.case<char>
-  Test +#[0-9]+: prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>
-  Test +#[0-9]+: both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: ns\.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: ns\.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>
-  Test +#[0-9]+: prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>
+  Test +#[0-9]+: prefix/typed\.case<int>
+  Test +#[0-9]+: both_suite\.test/VALUE<TYPE>
+  Test +#[0-9]+: both_suite\.case/VALUE<TYPE>
+  Test +#[0-9]+: both\.test/VALUE<TYPE>
+  Test +#[0-9]+: both\.case/VALUE<TYPE>
+  Test +#[0-9]+: ns\.both\.test/VALUE<TYPE>
+  Test +#[0-9]+: ns\.both\.case/VALUE<TYPE>
+  Test +#[0-9]+: prefix/both\.test/VALUE<TYPE>
+  Test +#[0-9]+: prefix/both\.case/VALUE<TYPE>
 
 Total Tests: [0-9]+
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
index 951abd4e12..a70ea9bfae 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test1-stdout.txt
@@ -25,42 +25,42 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<float>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:typed\.case<char>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<char>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:typed\.case<int>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<int>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<short>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<short>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<float>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<float>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<char>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<char>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.typed\.case<int>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<int>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<short>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<short>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<float>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<float>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<char>!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<char>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/typed\.case<int>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<int>!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/1!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/1!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/"foo"!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:value/test\.case/named  # GetParam\(\) = 'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/named  # GetParam\(\) = 'c'!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:value/test\.case/'c'!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/'c'!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/1!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/1!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/"foo"!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.value/test\.case/named  # GetParam\(\) = 'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/named  # GetParam\(\) = 'c'!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.value/test\.case/'c'!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/'c'!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/1!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/1!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/"foo"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/"foo"!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/value/test\.case/named  # GetParam\(\) = 'c'!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/named  # GetParam\(\) = 'c'!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/value/test\.case/'c'!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/'c'!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"semicolon;"!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:param/special\.case/"semicolon;"!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"backslash\\"!1
@@ -109,22 +109,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"__csb___text"!1 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!1
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!1
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!1
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!1 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
index 06d248f034..5ae246cb43 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test2-stdout.txt
@@ -25,42 +25,42 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<float>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:typed\.case<char>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<char>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:typed\.case<int>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<int>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<short>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<short>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<float>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<float>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<char>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<char>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.typed\.case<int>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<int>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<short>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<short>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<float>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<float>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<char>!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<char>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/typed\.case<int>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<int>!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/1!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/1!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/"foo"!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:value/test\.case/named  # GetParam\(\) = 'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/named  # GetParam\(\) = 'c'!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:value/test\.case/'c'!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:value/test\.case/'c'!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/1!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/1!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/"foo"!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.value/test\.case/named  # GetParam\(\) = 'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/named  # GetParam\(\) = 'c'!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.value/test\.case/'c'!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.value/test\.case/'c'!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/1!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/1!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/value/test\.case/"foo"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/"foo"!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/value/test\.case/named  # GetParam\(\) = 'c'!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/named  # GetParam\(\) = 'c'!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/value/test\.case/'c'!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/value/test\.case/'c'!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"semicolon;"!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:param/special\.case/"semicolon;"!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:param/special\.case/"backslash\\"!2
@@ -109,22 +109,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"__csb___text"!2 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!2
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/"S o m  e   "!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns.both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!2
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!2
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!2 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
index 9bd3efd64f..671cdfb17c 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test4-stdout.txt
@@ -5,40 +5,40 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<float>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:typed\.case<char>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<char>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:typed\.case<int>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<int>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<short>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<short>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<float>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<float>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<char>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<char>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.typed\.case<int>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<int>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<short>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<short>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<float>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<float>!4 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<char>!4
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<char>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!4
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/typed\.case<int>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<int>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!4
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<TYPE>!4 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test5-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test5-stdout.txt
index 2d407d2aa0..805ec9ed5f 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test5-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test5-stdout.txt
@@ -65,22 +65,22 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/6!5 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/param/special\.case/7!5
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/param/special\.case/7!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test<both_suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test<both_suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test<both_suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test<both_suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test<both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test<both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test<both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test<both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test<ns\.both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test<ns\.both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test<ns\.both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test<ns\.both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test<prefix/both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test<prefix/both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test<prefix/both/suite\.  # TypeParam = TYPE>!5
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test<prefix/both/suite\.  # TypeParam = TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<TYPE>!5
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<TYPE>!5 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
index 17c26a5ff8..d467bbc94a 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test6-stdout.txt
@@ -5,40 +5,40 @@ Test project .*
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<1>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:typed\.case<42>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed\.case<42>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed/named\.  # TypeParam = int\.case<typed/named\.  # TypeParam = int>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:typed.case<named>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:typed.case<named>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<0>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<0>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<1>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<1>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:ns\.typed\.case<42>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed\.case<42>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed/named\.  # TypeParam = int\.case<ns\.typed/named\.  # TypeParam = int>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.typed.case<named>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.typed.case<named>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<0>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<0>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<1>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<1>!6 \.+ +Passed +[0-9.]+ sec
  *Start +[0-9]+: TEST:prefix/typed\.case<42>!6
  *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed\.case<42>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed/named\.  # TypeParam = int\.case<prefix/typed/named\.  # TypeParam = int>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both_suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<ns\.both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!6
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test  # GetParam\(\) = VALUE<prefix/both/suite\.  # TypeParam = TYPE>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/typed.case<named>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/typed.case<named>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test/VALUE!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test/VALUE!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/VALUE!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/VALUE!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/VALUE<suite>!6
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/VALUE<suite>!6 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+
 
diff --git a/Tests/RunCMake/GoogleTest/GoogleTest-test7-stdout.txt b/Tests/RunCMake/GoogleTest/GoogleTest-test7-stdout.txt
index d1bfc9b8fb..13ee9d0144 100644
--- a/Tests/RunCMake/GoogleTest/GoogleTest-test7-stdout.txt
+++ b/Tests/RunCMake/GoogleTest/GoogleTest-test7-stdout.txt
@@ -1,20 +1,20 @@
 Test project .*
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test<both_suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.test<both_suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test<both_suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.  # TypeParam = TYPE\.case/test<both_suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test<both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.test<both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test<both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both/suite\.  # TypeParam = TYPE\.case/test<both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test<ns\.both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.test<ns\.both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test<ns\.both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both/suite\.  # TypeParam = TYPE\.case/test<ns\.both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test<prefix/both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.test<prefix/both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
- *Start +[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test<prefix/both/suite\.  # TypeParam = TYPE>!7
- *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both/suite\.  # TypeParam = TYPE\.case/test<prefix/both/suite\.  # TypeParam = TYPE>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.test!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.test!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both_suite\.case/test!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both_suite\.case/test!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.test<suite>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:both\.case/test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:both\.case/test<suite>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.test<suite>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:ns\.both\.case/test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:ns\.both\.case/test<suite>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.test<suite>!7 \.+ +Passed +[0-9.]+ sec
+ *Start +[0-9]+: TEST:prefix/both\.case/test<suite>!7
+ *[0-9]+/[0-9]+ +Test +#[0-9]+: TEST:prefix/both\.case/test<suite>!7 \.+ +Passed +[0-9.]+ sec
 
 100% tests passed, 0 tests failed out of [0-9]+