diff --git a/src/catch2/internal/catch_reporter_registry.cpp b/src/catch2/internal/catch_reporter_registry.cpp
index ee92ad7d..2a2bedcb 100644
--- a/src/catch2/internal/catch_reporter_registry.cpp
+++ b/src/catch2/internal/catch_reporter_registry.cpp
@@ -23,14 +23,14 @@ namespace Catch {
     ReporterRegistry::ReporterRegistry() {
         // Because it is impossible to move out of initializer list,
         // we have to add the elements manually
-        m_factories["automake"] = Detail::make_unique<ReporterFactory<AutomakeReporter>>();
+        m_factories["Automake"] = Detail::make_unique<ReporterFactory<AutomakeReporter>>();
         m_factories["compact"] = Detail::make_unique<ReporterFactory<CompactReporter>>();
         m_factories["console"] = Detail::make_unique<ReporterFactory<ConsoleReporter>>();
-        m_factories["junit"] = Detail::make_unique<ReporterFactory<JunitReporter>>();
-        m_factories["sonarqube"] = Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
-        m_factories["tap"] = Detail::make_unique<ReporterFactory<TAPReporter>>();
-        m_factories["teamcity"] = Detail::make_unique<ReporterFactory<TeamCityReporter>>();
-        m_factories["xml"] = Detail::make_unique<ReporterFactory<XmlReporter>>();
+        m_factories["JUnit"] = Detail::make_unique<ReporterFactory<JunitReporter>>();
+        m_factories["SonarQube"] = Detail::make_unique<ReporterFactory<SonarQubeReporter>>();
+        m_factories["TAP"] = Detail::make_unique<ReporterFactory<TAPReporter>>();
+        m_factories["TeamCity"] = Detail::make_unique<ReporterFactory<TeamCityReporter>>();
+        m_factories["XML"] = Detail::make_unique<ReporterFactory<XmlReporter>>();
     }
 
     ReporterRegistry::~ReporterRegistry() = default;
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index dabd078b..e0dac422 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -1311,19 +1311,19 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fak
    1  [fakeTag]
 1 tag
 
-" contains: "fakeTag" with 1 message: 'Tested reporter: automake'
+" contains: "fakeTag" with 1 message: 'Tested reporter: Automake'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:
   fake reporter:  fake description
 
-" contains: "fake reporter" with 1 message: 'Tested reporter: automake'
+" contains: "fake reporter" with 1 message: 'Tested reporter: Automake'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:
   fake test name
       [fakeTestTag]
 1 test case
 
-" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: automake'
+" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: Automake'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "All available tags:
    1  [fakeTag]
@@ -1366,13 +1366,13 @@ All available tags:
    1  [fakeTag]
 1 tag
 
-" contains: "fakeTag" with 1 message: 'Tested reporter: junit'
+" contains: "fakeTag" with 1 message: 'Tested reporter: JUnit'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 Available reporters:
   fake reporter:  fake description
 
-" contains: "fake reporter" with 1 message: 'Tested reporter: junit'
+" contains: "fake reporter" with 1 message: 'Tested reporter: JUnit'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?>
 All available test cases:
@@ -1380,20 +1380,20 @@ All available test cases:
       [fakeTestTag]
 1 test case
 
-" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: junit'
+" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JUnit'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 All available tags:
    1  [fakeTag]
 1 tag
 
-" contains: "fakeTag" with 1 message: 'Tested reporter: sonarqube'
+" contains: "fakeTag" with 1 message: 'Tested reporter: SonarQube'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 Available reporters:
   fake reporter:  fake description
 
-" contains: "fake reporter" with 1 message: 'Tested reporter: sonarqube'
+" contains: "fake reporter" with 1 message: 'Tested reporter: SonarQube'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?>
 All available test cases:
@@ -1401,43 +1401,43 @@ All available test cases:
       [fakeTestTag]
 1 test case
 
-" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: sonarqube'
+" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: SonarQube'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "All available tags:
    1  [fakeTag]
 1 tag
 
-" contains: "fakeTag" with 1 message: 'Tested reporter: tap'
+" contains: "fakeTag" with 1 message: 'Tested reporter: TAP'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:
   fake reporter:  fake description
 
-" contains: "fake reporter" with 1 message: 'Tested reporter: tap'
+" contains: "fake reporter" with 1 message: 'Tested reporter: TAP'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:
   fake test name
       [fakeTestTag]
 1 test case
 
-" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: tap'
+" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: TAP'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "All available tags:
    1  [fakeTag]
 1 tag
 
-" contains: "fakeTag" with 1 message: 'Tested reporter: teamcity'
+" contains: "fakeTag" with 1 message: 'Tested reporter: TeamCity'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:
   fake reporter:  fake description
 
-" contains: "fake reporter" with 1 message: 'Tested reporter: teamcity'
+" contains: "fake reporter" with 1 message: 'Tested reporter: TeamCity'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:
   fake test name
       [fakeTestTag]
 1 test case
 
-" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: teamcity'
+" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: TeamCity'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 <TagsFromMatchingTests>
@@ -1447,7 +1447,7 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fak
       <Alias>fakeTag</Alias>
     </Aliases>
   </Tag>
-</TagsFromMatchingTests>" contains: "fakeTag" with 1 message: 'Tested reporter: xml'
+</TagsFromMatchingTests>" contains: "fakeTag" with 1 message: 'Tested reporter: XML'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?>
 <AvailableReporters>
@@ -1455,7 +1455,7 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring("fak
     <Name>fake reporter</Name>
     <Description>fake description</Description>
   </Reporter>
-</AvailableReporters>" contains: "fake reporter" with 1 message: 'Tested reporter: xml'
+</AvailableReporters>" contains: "fake reporter" with 1 message: 'Tested reporter: XML'
 Reporters.tests.cpp:<line number>: passed: !(factories.empty()) for: !false
 Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?>
 <MatchingTests>
@@ -1468,7 +1468,7 @@ Reporters.tests.cpp:<line number>: passed: listingString, ContainsSubstring( "fa
       <Line>123456789</Line>
     </SourceInfo>
   </TestCase>
-</MatchingTests>" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: xml'
+</MatchingTests>" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: XML'
 Reporters.tests.cpp:<line number>: passed:
 Message.tests.cpp:<line number>: passed: with 1 message: 'this is a success'
 Message.tests.cpp:<line number>: passed:
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index ed5e317a..74c0df93 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -9703,7 +9703,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  automake reporter lists tags
+  Automake reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -9717,7 +9717,7 @@ with expansion:
 
 " contains: "fakeTag"
 with message:
-  Tested reporter: automake
+  Tested reporter: Automake
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -9732,7 +9732,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  automake reporter lists reporters
+  Automake reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -9745,7 +9745,7 @@ with expansion:
 
 " contains: "fake reporter"
 with message:
-  Tested reporter: automake
+  Tested reporter: Automake
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -9760,7 +9760,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  automake reporter lists tests
+  Automake reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -9775,7 +9775,7 @@ with expansion:
 
 " ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: automake
+  Tested reporter: Automake
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -9964,7 +9964,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  junit reporter lists tags
+  JUnit reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -9979,7 +9979,7 @@ with expansion:
 
 " contains: "fakeTag"
 with message:
-  Tested reporter: junit
+  Tested reporter: JUnit
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -9994,7 +9994,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  junit reporter lists reporters
+  JUnit reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10008,7 +10008,7 @@ with expansion:
 
 " contains: "fake reporter"
 with message:
-  Tested reporter: junit
+  Tested reporter: JUnit
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10023,7 +10023,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  junit reporter lists tests
+  JUnit reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10039,7 +10039,7 @@ with expansion:
 
 " ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: junit
+  Tested reporter: JUnit
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10054,7 +10054,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  sonarqube reporter lists tags
+  SonarQube reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10069,7 +10069,7 @@ with expansion:
 
 " contains: "fakeTag"
 with message:
-  Tested reporter: sonarqube
+  Tested reporter: SonarQube
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10084,7 +10084,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  sonarqube reporter lists reporters
+  SonarQube reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10098,7 +10098,7 @@ with expansion:
 
 " contains: "fake reporter"
 with message:
-  Tested reporter: sonarqube
+  Tested reporter: SonarQube
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10113,7 +10113,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  sonarqube reporter lists tests
+  SonarQube reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10129,7 +10129,7 @@ with expansion:
 
 " ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: sonarqube
+  Tested reporter: SonarQube
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10144,7 +10144,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  tap reporter lists tags
+  TAP reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10158,7 +10158,7 @@ with expansion:
 
 " contains: "fakeTag"
 with message:
-  Tested reporter: tap
+  Tested reporter: TAP
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10173,7 +10173,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  tap reporter lists reporters
+  TAP reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10186,7 +10186,7 @@ with expansion:
 
 " contains: "fake reporter"
 with message:
-  Tested reporter: tap
+  Tested reporter: TAP
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10201,7 +10201,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  tap reporter lists tests
+  TAP reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10216,7 +10216,7 @@ with expansion:
 
 " ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: tap
+  Tested reporter: TAP
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10231,7 +10231,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  teamcity reporter lists tags
+  TeamCity reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10245,7 +10245,7 @@ with expansion:
 
 " contains: "fakeTag"
 with message:
-  Tested reporter: teamcity
+  Tested reporter: TeamCity
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10260,7 +10260,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  teamcity reporter lists reporters
+  TeamCity reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10273,7 +10273,7 @@ with expansion:
 
 " contains: "fake reporter"
 with message:
-  Tested reporter: teamcity
+  Tested reporter: TeamCity
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10288,7 +10288,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  teamcity reporter lists tests
+  TeamCity reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10303,7 +10303,7 @@ with expansion:
 
 " ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: teamcity
+  Tested reporter: TeamCity
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10318,7 +10318,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  xml reporter lists tags
+  XML reporter lists tags
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10336,7 +10336,7 @@ with expansion:
     </Tag>
   </TagsFromMatchingTests>" contains: "fakeTag"
 with message:
-  Tested reporter: xml
+  Tested reporter: XML
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10351,7 +10351,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  xml reporter lists reporters
+  XML reporter lists reporters
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10367,7 +10367,7 @@ with expansion:
     </Reporter>
   </AvailableReporters>" contains: "fake reporter"
 with message:
-  Tested reporter: xml
+  Tested reporter: XML
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
@@ -10382,7 +10382,7 @@ with expansion:
 
 -------------------------------------------------------------------------------
 Reporter's write listings to provided stream
-  xml reporter lists tests
+  XML reporter lists tests
 -------------------------------------------------------------------------------
 Reporters.tests.cpp:<line number>
 ...............................................................................
@@ -10403,7 +10403,7 @@ with expansion:
     </TestCase>
   </MatchingTests>" ( contains: "fake test name" and contains: "fakeTestTag" )
 with message:
-  Tested reporter: xml
+  Tested reporter: XML
 
 -------------------------------------------------------------------------------
 Reproducer for #2309 - a very long description past 80 chars (default console
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index 95670382..f4469f58 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1149,30 +1149,30 @@ Matchers.tests.cpp:<line number>
     </testcase>
     <testcase classname="<exe-name>.global" name="Regression test #1" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/automake reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/automake reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/automake reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/Automake reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/Automake reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/Automake reporter lists tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/compact reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/compact reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/compact reporter lists tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tags" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists reporters" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/console reporter lists tests" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/junit reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/junit reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/junit reporter lists tests" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/sonarqube reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/sonarqube reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/sonarqube reporter lists tests" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/tap reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/tap reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/tap reporter lists tests" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/teamcity reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/teamcity reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/teamcity reporter lists tests" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/xml reporter lists tags" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/xml reporter lists reporters" time="{duration}" status="run"/>
-    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/xml reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/JUnit reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/SonarQube reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/SonarQube reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/SonarQube reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TAP reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TAP reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TAP reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TeamCity reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TeamCity reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/TeamCity reporter lists tests" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/XML reporter lists tags" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/XML reporter lists reporters" time="{duration}" status="run"/>
+    <testcase classname="<exe-name>.global" name="Reporter's write listings to provided stream/XML reporter lists tests" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="Reproducer for #2309 - a very long description past 80 chars (default console width) with a late colon : blablabla" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="SUCCEED counts as a test pass" time="{duration}" status="run"/>
     <testcase classname="<exe-name>.global" name="SUCCEED does not require an argument" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index bbec9854..e56652ce 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -168,30 +168,30 @@
   </file>
   <file path="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp">
     <testCase name="Reporter's write listings to provided stream" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/automake reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/automake reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/automake reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/Automake reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/Automake reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/Automake reporter lists tests" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/compact reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/compact reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/compact reporter lists tests" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists tags" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists reporters" duration="{duration}"/>
     <testCase name="Reporter's write listings to provided stream/console reporter lists tests" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/junit reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/junit reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/junit reporter lists tests" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/sonarqube reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/sonarqube reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/sonarqube reporter lists tests" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/tap reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/tap reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/tap reporter lists tests" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/teamcity reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/teamcity reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/teamcity reporter lists tests" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/xml reporter lists tags" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/xml reporter lists reporters" duration="{duration}"/>
-    <testCase name="Reporter's write listings to provided stream/xml reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JUnit reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/JUnit reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/SonarQube reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/SonarQube reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/SonarQube reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TAP reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TAP reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TAP reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TeamCity reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TeamCity reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/TeamCity reporter lists tests" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/XML reporter lists tags" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/XML reporter lists reporters" duration="{duration}"/>
+    <testCase name="Reporter's write listings to provided stream/XML reporter lists tests" duration="{duration}"/>
     <testCase name="Reproducer for #2309 - a very long description past 80 chars (default console width) with a late colon : blablabla" duration="{duration}"/>
     <testCase name="The default listing implementation write to provided stream/Listing tags" duration="{duration}"/>
     <testCase name="The default listing implementation write to provided stream/Listing reporters" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index 7d60d6d6..405d1108 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -2537,15 +2537,15 @@ ok {test-number} - actual, !UnorderedEquals( expected ) for: { 'a', 'b' } not Un
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: automake'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: Automake'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: automake'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: Automake'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: automake'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: Automake'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
@@ -2573,63 +2573,63 @@ ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && Cont
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: junit'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: JUnit'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: junit'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: JUnit'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: junit'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: JUnit'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: sonarqube'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: SonarQube'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: sonarqube'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: SonarQube'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: sonarqube'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: SonarQube'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: tap'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: TAP'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: tap'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: TAP'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: tap'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: TAP'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: teamcity'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "All available tags:    1  [fakeTag] 1 tag  " contains: "fakeTag" with 1 message: 'Tested reporter: TeamCity'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: teamcity'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "Available reporters:   fake reporter:  fake description  " contains: "fake reporter" with 1 message: 'Tested reporter: TeamCity'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: teamcity'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "All available test cases:   fake test name       [fakeTestTag] 1 test case  " ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: TeamCity'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> <TagsFromMatchingTests>   <Tag>     <Count>1</Count>     <Aliases>       <Alias>fakeTag</Alias>     </Aliases>   </Tag> </TagsFromMatchingTests>" contains: "fakeTag" with 1 message: 'Tested reporter: xml'
+ok {test-number} - listingString, ContainsSubstring("fakeTag"s) for: "<?xml version="1.0" encoding="UTF-8"?> <TagsFromMatchingTests>   <Tag>     <Count>1</Count>     <Aliases>       <Alias>fakeTag</Alias>     </Aliases>   </Tag> </TagsFromMatchingTests>" contains: "fakeTag" with 1 message: 'Tested reporter: XML'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> <AvailableReporters>   <Reporter>     <Name>fake reporter</Name>     <Description>fake description</Description>   </Reporter> </AvailableReporters>" contains: "fake reporter" with 1 message: 'Tested reporter: xml'
+ok {test-number} - listingString, ContainsSubstring("fake reporter"s) for: "<?xml version="1.0" encoding="UTF-8"?> <AvailableReporters>   <Reporter>     <Name>fake reporter</Name>     <Description>fake description</Description>   </Reporter> </AvailableReporters>" contains: "fake reporter" with 1 message: 'Tested reporter: XML'
 # Reporter's write listings to provided stream
 ok {test-number} - !(factories.empty()) for: !false
 # Reporter's write listings to provided stream
-ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> <MatchingTests>   <TestCase>     <Name>fake test name</Name>     <ClassName/>     <Tags>[fakeTestTag]</Tags>     <SourceInfo>       <File>fake-file.cpp</File>       <Line>123456789</Line>     </SourceInfo>   </TestCase> </MatchingTests>" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: xml'
+ok {test-number} - listingString, ContainsSubstring( "fake test name"s ) && ContainsSubstring( "fakeTestTag"s ) for: "<?xml version="1.0" encoding="UTF-8"?> <MatchingTests>   <TestCase>     <Name>fake test name</Name>     <ClassName/>     <Tags>[fakeTestTag]</Tags>     <SourceInfo>       <File>fake-file.cpp</File>       <Line>123456789</Line>     </SourceInfo>   </TestCase> </MatchingTests>" ( contains: "fake test name" and contains: "fakeTestTag" ) with 1 message: 'Tested reporter: XML'
 # Reproducer for #2309 - a very long description past 80 chars (default console width) with a late colon : blablabla
 ok {test-number} -
 # SUCCEED counts as a test pass
diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt
index 696ea472..2b5e3378 100644
--- a/tests/SelfTest/Baselines/xml.sw.approved.txt
+++ b/tests/SelfTest/Baselines/xml.sw.approved.txt
@@ -11816,9 +11816,9 @@ Nor would this
         !false
       </Expanded>
     </Expression>
-    <Section name="automake reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="Automake reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: automake
+        Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -11842,9 +11842,9 @@ Nor would this
         !false
       </Expanded>
     </Expression>
-    <Section name="automake reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="Automake reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: automake
+        Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -11867,9 +11867,9 @@ Nor would this
         !false
       </Expanded>
     </Expression>
-    <Section name="automake reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="Automake reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: automake
+        Tested reporter: Automake
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12050,9 +12050,9 @@ Nor would this
         !false
       </Expanded>
     </Expression>
-    <Section name="junit reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="JUnit reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: junit
+        Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12077,9 +12077,9 @@ All available tags:
         !false
       </Expanded>
     </Expression>
-    <Section name="junit reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="JUnit reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: junit
+        Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12103,9 +12103,9 @@ Available reporters:
         !false
       </Expanded>
     </Expression>
-    <Section name="junit reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="JUnit reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: junit
+        Tested reporter: JUnit
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12131,9 +12131,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="sonarqube reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="SonarQube reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: sonarqube
+        Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12158,9 +12158,9 @@ All available tags:
         !false
       </Expanded>
     </Expression>
-    <Section name="sonarqube reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="SonarQube reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: sonarqube
+        Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12184,9 +12184,9 @@ Available reporters:
         !false
       </Expanded>
     </Expression>
-    <Section name="sonarqube reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="SonarQube reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: sonarqube
+        Tested reporter: SonarQube
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12212,9 +12212,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="tap reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TAP reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: tap
+        Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12238,9 +12238,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="tap reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TAP reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: tap
+        Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12263,9 +12263,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="tap reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TAP reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: tap
+        Tested reporter: TAP
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12290,9 +12290,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="teamcity reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TeamCity reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: teamcity
+        Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12316,9 +12316,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="teamcity reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TeamCity reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: teamcity
+        Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12341,9 +12341,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="teamcity reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="TeamCity reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: teamcity
+        Tested reporter: TeamCity
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12368,9 +12368,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="xml reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="XML reporter lists tags" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: xml
+        Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12398,9 +12398,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="xml reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="XML reporter lists reporters" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: xml
+        Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>
@@ -12426,9 +12426,9 @@ All available test cases:
         !false
       </Expanded>
     </Expression>
-    <Section name="xml reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
+    <Section name="XML reporter lists tests" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
       <Info>
-        Tested reporter: xml
+        Tested reporter: XML
       </Info>
       <Expression success="true" type="REQUIRE_THAT" filename="tests/<exe-name>/IntrospectiveTests/Reporters.tests.cpp" >
         <Original>