diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 7642639e..aaf083b3 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1913,7 +1913,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  if (diff->to_be_reported())
 	    {
 	      function_decl_sptr fn = (*i)->first_function_decl();
-	      out << indent << "  [C]'"
+	      out << indent << "  [C] '"
 		  << fn->get_pretty_representation() << "'";
 	      report_loc_info((*i)->second_function_decl(), *ctxt, out);
 	      out << " has some indirect sub-type changes:\n";
@@ -2090,7 +2090,7 @@ default_reporter::report(const corpus_diff& d, ostream& out,
 	  n1 = diff->first_subject()->get_pretty_representation();
 	  n2 = diff->second_subject()->get_pretty_representation();
 
-	  out << indent << "  [C]'" << n1 << "' was changed";
+	  out << indent << "  [C] '" << n1 << "' was changed";
 	  if (n1 != n2)
 	    out << " to '" << n2 << "'";
 	  report_loc_info(diff->second_subject(), *ctxt, out);
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index 791b301c..5d810818 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -1130,7 +1130,7 @@ leaf_reporter::report(const corpus_diff& d,
 	  if (diff_to_be_reported(diff.get()))
 	    {
 	      function_decl_sptr fn = (*i)->first_function_decl();
-	      out << indent << "  [C]'"
+	      out << indent << "  [C] '"
 		  << fn->get_pretty_representation() << "'";
 	      report_loc_info((*i)->second_function_decl(), *ctxt, out);
 	      out << " has some sub-type changes:\n";
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-0.txt b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
index 405df690..b8884f8f 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char libapp::S0::m1', at offset 32 (in bits)
 
-  [C]'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1':
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test0-fn-changed-report-2.txt b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
index 7c09f5ff..fc55ef62 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -4,14 +4,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v1.cc:61:1 has some indirect sub-type changes:
+  [C] 'function libapp::S0* libapp::create_s0()' at test0-fn-changed-libapp-v1.cc:61:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S0' at test0-fn-changed-libapp-v1.cc:10:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char libapp::S0::m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:13:1
 
-  [C]'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v1.cc:69:1 has some indirect sub-type changes:
+  [C] 'function libapp::S1* libapp::create_s1()' at test0-fn-changed-libapp-v1.cc:69:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct libapp::S1' at test0-fn-changed-libapp-v1.cc:21:1:
         type size changed from 32 to 96 (in bits)
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-0.txt b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
index 3c130c01..19db76e3 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
@@ -4,13 +4,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function float add(float, float)' has some indirect sub-type changes:
+  [C] 'function float add(float, float)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'float' to 'int'
       type size hasn't changed
 
 
-  [C]'function void print(const Student)' has some indirect sub-type changes:
+  [C] 'function void print(const Student)' has some indirect sub-type changes:
     parameter 1 of type 'const Student' has sub-type changes:
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
diff --git a/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt b/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
index d62e405e..53672744 100644
--- a/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
+++ b/tests/data/test-abidiff-exit/test-loc-with-locs-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void x(unsigned char)' at test-loc-v1.c:1:1 has some indirect sub-type changes:
+  [C] 'function void x(unsigned char)' at test-loc-v1.c:1:1 has some indirect sub-type changes:
     parameter 1 of type 'unsigned char' changed:
       type name changed from 'unsigned char' to 'signed char'
       type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt b/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
index 5a72047e..6893e3fc 100644
--- a/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
+++ b/tests/data/test-abidiff-exit/test-loc-without-locs-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void x(unsigned char)' has some indirect sub-type changes:
+  [C] 'function void x(unsigned char)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned char' changed:
       type name changed from 'unsigned char' to 'signed char'
       type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt b/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
index ecc6783b..c8396254 100644
--- a/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test1-voffset-change-report0.txt
@@ -3,11 +3,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'method virtual int C::virtual_func0()' has some indirect sub-type changes:
+  [C] 'method virtual int C::virtual_func0()' has some indirect sub-type changes:
     the vtable offset of method virtual int C::virtual_func0() changed from 0 to 1
       note that this is an ABI incompatible change to the vtable of class C
 
-  [C]'method virtual char C::virtual_func1()' has some indirect sub-type changes:
+  [C] 'method virtual char C::virtual_func1()' has some indirect sub-type changes:
     the vtable offset of method virtual char C::virtual_func1() changed from 1 to 0
       note that this is an ABI incompatible change to the vtable of class C
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index d5f1e52c..e24ce778 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 17 functions with some indirect sub-type change:
 
-  [C]'method sigc::connection::connection(sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::connection::connection(sigc::slot_base&)' has some indirect sub-type changes:
     parameter 1 of type 'sigc::slot_base&' has sub-type changes:
       in referenced type 'class sigc::slot_base':
         type size hasn't changed
@@ -62,7 +62,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'method sigc::connection& sigc::connection::operator=(const sigc::connection&)' has some indirect sub-type changes:
+  [C] 'method sigc::connection& sigc::connection::operator=(const sigc::connection&)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'struct sigc::connection':
         type size hasn't changed
@@ -74,11 +74,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::connection':
         unqualified underlying type 'struct sigc::connection' changed, as reported earlier
 
-  [C]'method void sigc::connection::set_slot(sigc::slot_base*)' has some indirect sub-type changes:
+  [C] 'method void sigc::connection::set_slot(sigc::slot_base*)' has some indirect sub-type changes:
     parameter 1 of type 'sigc::slot_base*' has sub-type changes:
       pointed to type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::connect(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::connect(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed:
         typedef name changed from std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator to std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator
@@ -87,13 +87,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::erase(sigc::internal::signal_impl::iterator_type)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::erase(sigc::internal::signal_impl::iterator_type)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
     parameter 1 of type 'typedef sigc::internal::signal_impl::iterator_type' changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::insert(sigc::internal::signal_impl::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl::iterator_type sigc::internal::signal_impl::insert(sigc::internal::signal_impl::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef std::list<sigc::slot_base, std::allocator<sigc::slot_base> >::iterator' changed, as reported earlier
     parameter 1 of type 'typedef sigc::internal::signal_impl::iterator_type' changed:
@@ -102,20 +102,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::connect(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::connect(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::erase(sigc::signal_base::iterator_type)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::erase(sigc::signal_base::iterator_type)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'typedef sigc::signal_base::iterator_type' changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
 
-  [C]'method sigc::internal::signal_impl* sigc::signal_base::impl()' has some indirect sub-type changes:
+  [C] 'method sigc::internal::signal_impl* sigc::signal_base::impl()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct sigc::internal::signal_impl':
         type size changed from 192 to 256 (in bits)
@@ -139,7 +139,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'method sigc::signal_base::iterator_type sigc::signal_base::insert(sigc::signal_base::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::iterator_type sigc::signal_base::insert(sigc::signal_base::iterator_type, const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       underlying type 'typedef sigc::internal::signal_impl::iterator_type' changed, as reported earlier
     parameter 1 of type 'typedef sigc::signal_base::iterator_type' changed:
@@ -148,7 +148,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base& sigc::signal_base::operator=(const sigc::signal_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base& sigc::signal_base::operator=(const sigc::signal_base&)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'struct sigc::signal_base':
         type size hasn't changed
@@ -164,35 +164,35 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const sigc::signal_base':
         unqualified underlying type 'struct sigc::signal_base' changed, as reported earlier
 
-  [C]'method sigc::signal_base::signal_base(const sigc::signal_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::signal_base::signal_base(const sigc::signal_base&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::signal_base&' has sub-type changes:
       in referenced type 'const sigc::signal_base':
         unqualified underlying type 'struct sigc::signal_base' changed, as reported earlier
 
-  [C]'method sigc::slot_base& sigc::slot_base::operator=(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::slot_base& sigc::slot_base::operator=(const sigc::slot_base&)' has some indirect sub-type changes:
     return type changed:
       referenced type 'class sigc::slot_base' changed, as reported earlier
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::slot_base::slot_base(const sigc::slot_base&)' has some indirect sub-type changes:
+  [C] 'method sigc::slot_base::slot_base(const sigc::slot_base&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::slot_base&' has sub-type changes:
       in referenced type 'const sigc::slot_base':
         unqualified underlying type 'class sigc::slot_base' changed, as reported earlier
 
-  [C]'method sigc::internal::trackable_callback_list* sigc::trackable::callback_list()' has some indirect sub-type changes:
+  [C] 'method sigc::internal::trackable_callback_list* sigc::trackable::callback_list()' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct sigc::internal::trackable_callback_list' changed, as reported earlier
 
-  [C]'method sigc::trackable& sigc::trackable::operator=(const sigc::trackable&)' has some indirect sub-type changes:
+  [C] 'method sigc::trackable& sigc::trackable::operator=(const sigc::trackable&)' has some indirect sub-type changes:
     return type changed:
       referenced type 'struct sigc::trackable' changed, as reported earlier
     parameter 1 of type 'const sigc::trackable&' has sub-type changes:
       in referenced type 'const sigc::trackable':
         unqualified underlying type 'struct sigc::trackable' changed, as reported earlier
 
-  [C]'method sigc::trackable::trackable(const sigc::trackable&)' has some indirect sub-type changes:
+  [C] 'method sigc::trackable::trackable(const sigc::trackable&)' has some indirect sub-type changes:
     parameter 1 of type 'const sigc::trackable&' has sub-type changes:
       in referenced type 'const sigc::trackable':
         unqualified underlying type 'struct sigc::trackable' changed, as reported earlier
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index cb41cc76..29f823ec 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -85,7 +85,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 25 functions with some indirect sub-type change:
 
-  [C]'function int lttng_add_context(lttng_handle*, lttng_event_context*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_add_context(lttng_handle*, lttng_event_context*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event_context*' has sub-type changes:
       in pointed to type 'struct lttng_event_context':
         type size hasn't changed
@@ -110,7 +110,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
            to:
              union {lttng_event_perf_counter_ctx perf_counter; struct {char* provider_name; char* ctx_name;} app_ctx; char padding[288];}
 
-  [C]'function lttng_condition_type lttng_condition_get_type(const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_condition_type lttng_condition_get_type(const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       type size hasn't changed
       3 enumerator insertions:
@@ -119,7 +119,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
 
 
-  [C]'function int lttng_disable_event_ext(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_disable_event_ext(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       in pointed to type 'struct lttng_event':
         type size hasn't changed
@@ -131,40 +131,40 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 
 
-  [C]'function int lttng_enable_event(lttng_handle*, lttng_event*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event(lttng_handle*, lttng_event*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_enable_event_with_exclusions(lttng_handle*, lttng_event*, const char*, const char*, int, char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event_with_exclusions(lttng_handle*, lttng_event*, const char*, const char*, int, char**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_enable_event_with_filter(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
+  [C] 'function int lttng_enable_event_with_filter(lttng_handle*, lttng_event*, const char*, const char*)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function lttng_condition_type lttng_evaluation_get_type(const lttng_evaluation*)' has some indirect sub-type changes:
+  [C] 'function lttng_condition_type lttng_evaluation_get_type(const lttng_evaluation*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_condition_type' changed, as reported earlier
 
-  [C]'function int lttng_event_get_exclusion_name(lttng_event*, size_t, const char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_exclusion_name(lttng_event*, size_t, const char**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_event_get_exclusion_name_count(lttng_event*)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_exclusion_name_count(lttng_event*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_event_get_filter_expression(lttng_event*, const char**)' has some indirect sub-type changes:
+  [C] 'function int lttng_event_get_filter_expression(lttng_event*, const char**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event*' has sub-type changes:
       pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_events(lttng_handle*, const char*, lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_events(lttng_handle*, const char*, lttng_event**)' has some indirect sub-type changes:
     parameter 3 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_sessions(lttng_session**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_sessions(lttng_session**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_session**' has sub-type changes:
       in pointed to type 'lttng_session*':
         in pointed to type 'struct lttng_session':
@@ -175,12 +175,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
           1 data member insertion:
             'union {char padding[12]; void* ptr;} lttng_session::extended', at offset 34944 (in bits)
 
-  [C]'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function int lttng_list_tracepoint_fields(lttng_handle*, lttng_event_field**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_tracepoint_fields(lttng_handle*, lttng_event_field**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event_field**' has sub-type changes:
       in pointed to type 'lttng_event_field*':
         in pointed to type 'struct lttng_event_field':
@@ -190,12 +190,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
              details were reported earlier
 
 
-  [C]'function int lttng_list_tracepoints(lttng_handle*, lttng_event**)' has some indirect sub-type changes:
+  [C] 'function int lttng_list_tracepoints(lttng_handle*, lttng_event**)' has some indirect sub-type changes:
     parameter 2 of type 'lttng_event**' has sub-type changes:
       in pointed to type 'lttng_event*':
         pointed to type 'struct lttng_event' changed, as reported earlier
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_get_next_notification(lttng_notification_channel*, lttng_notification**)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_get_next_notification(lttng_notification_channel*, lttng_notification**)' has some indirect sub-type changes:
     return type changed:
       type size hasn't changed
       1 enumerator insertion:
@@ -209,27 +209,27 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
             'bool lttng_notification::owns_elements', at offset 128 (in bits)
 
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_notification_channel_status' changed, as reported earlier
 
-  [C]'function lttng_notification_channel_status lttng_notification_channel_unsubscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
+  [C] 'function lttng_notification_channel_status lttng_notification_channel_unsubscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
     return type changed:
       enum type 'enum lttng_notification_channel_status' changed, as reported earlier
 
-  [C]'function void lttng_notification_destroy(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function void lttng_notification_destroy(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function const lttng_condition* lttng_notification_get_condition(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function const lttng_condition* lttng_notification_get_condition(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function const lttng_evaluation* lttng_notification_get_evaluation(lttng_notification*)' has some indirect sub-type changes:
+  [C] 'function const lttng_evaluation* lttng_notification_get_evaluation(lttng_notification*)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_notification*' has sub-type changes:
       pointed to type 'struct lttng_notification' changed, as reported earlier
 
-  [C]'function filter_parser_ctx* lttng_yyget_extra(yyscan_t)' has some indirect sub-type changes:
+  [C] 'function filter_parser_ctx* lttng_yyget_extra(yyscan_t)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct filter_parser_ctx':
         type size hasn't changed
@@ -333,7 +333,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
               'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
 
 
-  [C]'function YYSTYPE* lttng_yyget_lval(yyscan_t)' has some indirect sub-type changes:
+  [C] 'function YYSTYPE* lttng_yyget_lval(yyscan_t)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'typedef YYSTYPE':
         underlying type 'union YYSTYPE' changed:
@@ -346,11 +346,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
           to:
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
-  [C]'function void lttng_yyset_extra(filter_parser_ctx*, yyscan_t)' has some indirect sub-type changes:
+  [C] 'function void lttng_yyset_extra(filter_parser_ctx*, yyscan_t)' has some indirect sub-type changes:
     parameter 1 of type 'filter_parser_ctx*' has sub-type changes:
       pointed to type 'struct filter_parser_ctx' changed, as reported earlier
 
-  [C]'function void lttng_yyset_lval(YYSTYPE*, yyscan_t)' has some indirect sub-type changes:
+  [C] 'function void lttng_yyset_lval(YYSTYPE*, yyscan_t)' has some indirect sub-type changes:
     parameter 1 of type 'YYSTYPE*' has sub-type changes:
       pointed to type 'typedef YYSTYPE' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
index 7443ceb3..b1fad0ee 100644
--- a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
+++ b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
@@ -6,7 +6,7 @@ architecture changed from 'elf-intel-80386' to 'elf-amd-x86_64'
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo()' has some indirect sub-type changes:
+  [C] 'function int foo()' has some indirect sub-type changes:
     address size of function changed from 32 bits to 64 bits
 
 
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 7c2ac820..24d5e022 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-dwarf/test1-report.txt b/tests/data/test-diff-dwarf/test1-report.txt
index 50918390..962bfac5 100644
--- a/tests/data/test-diff-dwarf/test1-report.txt
+++ b/tests/data/test-diff-dwarf/test1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 12e1ef77..84400c29 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 1152 to 1280 (in bits)
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 852f84fe..32058bb6 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 1248 to 1536 (in bits)
diff --git a/tests/data/test-diff-dwarf/test13-report.txt b/tests/data/test-diff-dwarf/test13-report.txt
index 20629076..cf29a4fd 100644
--- a/tests/data/test-diff-dwarf/test13-report.txt
+++ b/tests/data/test-diff-dwarf/test13-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 128 to 192 (in bits)
diff --git a/tests/data/test-diff-dwarf/test15-enum-report.txt b/tests/data/test-diff-dwarf/test15-enum-report.txt
index 19326c5b..337d9c35 100644
--- a/tests/data/test-diff-dwarf/test15-enum-report.txt
+++ b/tests/data/test-diff-dwarf/test15-enum-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(E)' has some indirect sub-type changes:
+  [C] 'function void foo(E)' has some indirect sub-type changes:
     parameter 1 of type 'typedef E' has sub-type changes:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test2-report.txt b/tests/data/test-diff-dwarf/test2-report.txt
index 14f8ea8c..902ca456 100644
--- a/tests/data/test-diff-dwarf/test2-report.txt
+++ b/tests/data/test-diff-dwarf/test2-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(int, char)' has some indirect sub-type changes:
+  [C] 'function void foo(int, char)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       entity changed from 'int' to compatible type 'typedef Int'
     parameter 2 of type 'char' changed:
diff --git a/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt b/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
index 434f66d2..f79b6d99 100644
--- a/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
+++ b/tests/data/test-diff-dwarf/test20-add-fn-parm-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int add(int, int)' has some indirect sub-type changes:
+  [C] 'function int add(int, int)' has some indirect sub-type changes:
     parameter 3 of type 'int' was added
 
 
diff --git a/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt b/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
index bb0cc78c..1582fffc 100644
--- a/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
+++ b/tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt b/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-dwarf/test22-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
index 8dd07ee7..860fb791 100644
--- a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void fun()' has some indirect sub-type changes:
+  [C] 'function void fun()' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was added
     parameter 2 of type 'char' was added
     parameter 3 of type 'int' was added
diff --git a/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
index 936640b6..78d341e9 100644
--- a/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test25-removed-fn-parms-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void fun(unsigned int, char, int)' has some indirect sub-type changes:
+  [C] 'function void fun(unsigned int, char, int)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was removed
     parameter 2 of type 'char' was removed
     parameter 3 of type 'int' was removed
diff --git a/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt b/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
index 133a0c1a..b87e4635 100644
--- a/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
+++ b/tests/data/test-diff-dwarf/test26-added-parms-before-variadic-report.txt
@@ -3,28 +3,28 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some indirect sub-type change:
 
-  [C]'function void fun1(const char*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun1(const char*, ...)' has some indirect sub-type changes:
     parameter 2 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const char*'
       type size changed from 0 to 64 (in bits)
     parameter 3 of type '...' was added
 
 
-  [C]'function void fun2(const char*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun2(const char*, ...)' has some indirect sub-type changes:
     parameter 2 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const char*'
       type size changed from 0 to 64 (in bits)
     parameter 3 of type '...' was added
 
 
-  [C]'function void fun3(const char*, const int*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun3(const char*, const int*, ...)' has some indirect sub-type changes:
     parameter 3 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const int*'
       type size changed from 0 to 64 (in bits)
     parameter 4 of type '...' was added
 
 
-  [C]'function void fun4(const char*, const int*, ...)' has some indirect sub-type changes:
+  [C] 'function void fun4(const char*, const int*, ...)' has some indirect sub-type changes:
     parameter 3 of type '...' changed:
       entity changed from 'variadic parameter type' to 'const int*'
       type size changed from 0 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
index b104d300..63c7ec8c 100644
--- a/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
+++ b/tests/data/test-diff-dwarf/test27-local-base-diff-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(base&)' has some indirect sub-type changes:
+  [C] 'function void bar(base&)' has some indirect sub-type changes:
     parameter 1 of type 'base&' has sub-type changes:
       in referenced type 'struct base':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char base::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
index 154532fc..361781a1 100644
--- a/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test28-vtable-changes-report-0.txt
@@ -12,7 +12,7 @@ Variable symbols changes summary: 0 Removed, 3 Added variable symbols not refere
 
 1 function with some indirect sub-type change:
 
-  [C]'method void S::bar()' has some indirect sub-type changes:
+  [C] 'method void S::bar()' has some indirect sub-type changes:
     method void S::bar() is now declared virtual
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test3-report.txt b/tests/data/test-diff-dwarf/test3-report.txt
index d1acbc0e..a556b0f8 100644
--- a/tests/data/test-diff-dwarf/test3-report.txt
+++ b/tests/data/test-diff-dwarf/test3-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method void C1::foo(C0&)' has some indirect sub-type changes:
+  [C] 'method void C1::foo(C0&)' has some indirect sub-type changes:
     parameter 1 of type 'C0&' has sub-type changes:
       in referenced type 'struct C0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
index 5f32f8d4..6b0f772c 100644
--- a/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test30-vtable-changes-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method virtual void S::fn1()' has some indirect sub-type changes:
+  [C] 'method virtual void S::fn1()' has some indirect sub-type changes:
     the vtable offset of method virtual void S::fn1() changed from 3 to 4
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
index 68e8504c..23e6fb52 100644
--- a/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test31-vtable-changes-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method virtual void S::fn1()' has some indirect sub-type changes:
+  [C] 'method virtual void S::fn1()' has some indirect sub-type changes:
     the vtable offset of method virtual void S::fn1() changed from 3 to 2
       note that this is an ABI incompatible change to the vtable of struct S
 
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 3e263d86..1dd410ca 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0()' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)*' changed:
         in pointed to type 'function type int (int)':
@@ -19,14 +19,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C]'function double (int)* fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)* fn1()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'function type double (int)':
         return type changed:
           type name changed from 'double' to 'int'
           type size changed from 64 to 32 (in bits)
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index ff8c934e..46e71c78 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0()' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)&' changed:
         in referenced type 'function type int (int)':
@@ -19,14 +19,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C]'function double (int)& fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)& fn1()' has some indirect sub-type changes:
     return type changed:
       in referenced type 'function type double (int)':
         return type changed:
           type name changed from 'double' to 'int'
           type size changed from 64 to 32 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'class S':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt b/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
index 13292980..5d97f66b 100644
--- a/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
+++ b/tests/data/test-diff-dwarf/test34-pr19173-libfoo-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'long int buggy_symbol' was changed:
+  [C] 'long int buggy_symbol' was changed:
     size of symbol changed from 8 to 64
 
 
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
index 64ad4d54..3db4c087 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-clang-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
+  [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
      type name changed from 'char[5]' to 'char[10]'
diff --git a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
index 64ad4d54..3db4c087 100644
--- a/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
+++ b/tests/data/test-diff-dwarf/test35-pr19173-libfoo-long-gcc-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
+  [C] 'char buggy_symbol[5]' was changed to 'char buggy_symbol[10]':
     size of symbol changed from 5 to 10
     type of variable changed:
      type name changed from 'char[5]' to 'char[10]'
diff --git a/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt b/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
index 427b62d0..62709474 100644
--- a/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
+++ b/tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test37-union-report-0.txt b/tests/data/test-diff-dwarf/test37-union-report-0.txt
index 31f0a98c..c399e94c 100644
--- a/tests/data/test-diff-dwarf/test37-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test37-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-dwarf/test38-union-report-0.txt b/tests/data/test-diff-dwarf/test38-union-report-0.txt
index 69893b19..f7a75df7 100644
--- a/tests/data/test-diff-dwarf/test38-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test38-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test39-union-report-0.txt b/tests/data/test-diff-dwarf/test39-union-report-0.txt
index 1d6b294b..2f70de44 100644
--- a/tests/data/test-diff-dwarf/test39-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test39-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(some_union_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(some_union_type*)' has some indirect sub-type changes:
     parameter 1 of type 'some_union_type*' has sub-type changes:
       in pointed to type 'union some_union_type':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test4-report.txt b/tests/data/test-diff-dwarf/test4-report.txt
index 2df515a4..e784dde6 100644
--- a/tests/data/test-diff-dwarf/test4-report.txt
+++ b/tests/data/test-diff-dwarf/test4-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(C0)' has some indirect sub-type changes:
+  [C] 'function void foo(C0)' has some indirect sub-type changes:
     parameter 1 of type 'class C0' has sub-type changes:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test40-report-0.txt b/tests/data/test-diff-dwarf/test40-report-0.txt
index 8e6ce8c2..d0b8c52c 100644
--- a/tests/data/test-diff-dwarf/test40-report-0.txt
+++ b/tests/data/test-diff-dwarf/test40-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function int bar(S2*)' has some indirect sub-type changes:
+  [C] 'function int bar(S2*)' has some indirect sub-type changes:
     parameter 1 of type 'S2*' has sub-type changes:
       in pointed to type 'struct S2':
         type size changed from 96 to 64 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
          'int S2::m0' offset changed from 32 to 0 (in bits) (by -32 bits)
          'char S2::m1' offset changed from 64 to 32 (in bits) (by -32 bits)
 
-  [C]'function int baz(S3*)' has some indirect sub-type changes:
+  [C] 'function int baz(S3*)' has some indirect sub-type changes:
     parameter 1 of type 'S3*' has sub-type changes:
       in pointed to type 'struct S3':
         type size hasn't changed
@@ -25,7 +25,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'function int foo(S1*)' has some indirect sub-type changes:
+  [C] 'function int foo(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
index 57076505..df387deb 100644
--- a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
+++ b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function Interface* make_interface()' has some indirect sub-type changes:
+  [C] 'function Interface* make_interface()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'class Interface':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
index 34f54514..52692d9f 100644
--- a/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
+++ b/tests/data/test-diff-dwarf/test42-PR21296-clanggcc-report0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 11 functions with some indirect sub-type change:
 
-  [C]'method STR::~STR(int)' has some indirect sub-type changes:
+  [C] 'method STR::~STR(int)' has some indirect sub-type changes:
     linkage names of method STR::~STR(int)
     changed from '_ZN3STRD1Ev, _ZN3STRD2Ev' to '_ZN3STRD2Ev'
 
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'int' was removed
 
 
-  [C]'function std::tuple<STR&&> my_forward_as_tuple<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'function std::tuple<STR&&> my_forward_as_tuple<STR>(STR&&)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'std::tuple<STR&&>' to 'std::tuple<STR &&>'
       type size hasn't changed
@@ -25,23 +25,23 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       1 base class insertion:
         struct std::_Tuple_impl<0, STR &&>
 
-  [C]'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&)' has some indirect sub-type changes:
     'method void std::_Head_base<0ul, STR&&, false>::_Head_base<STR>(STR&&) {_ZNSt10_Head_baseILm0EO3STRLb0EEC2IS0_St9true_typeEEOT_}' now becomes 'method void std::_Head_base<0, STR &&, false>::_Head_base<STR, std::true_type>(STR&&) {_ZNSt10_Head_baseILm0EO3STRLb0EEC2IS0_St9true_typeEEOT_}'
 
-  [C]'method STR& std::_Head_base<0ul, STR&&, false>::_M_head()' has some indirect sub-type changes:
+  [C] 'method STR& std::_Head_base<0ul, STR&&, false>::_M_head()' has some indirect sub-type changes:
     'method STR& std::_Head_base<0ul, STR&&, false>::_M_head() {_ZNSt10_Head_baseILm0EO3STRLb0EE7_M_headERKS2_}' now becomes 'method STR& std::_Head_base<0, STR &&, false>::_M_head() {_ZNSt10_Head_baseILm0EO3STRLb0EE7_M_headERKS2_}'
 
-  [C]'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head()' has some indirect sub-type changes:
+  [C] 'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head()' has some indirect sub-type changes:
     'method STR& std::_Tuple_impl<0ul, STR&&>::_M_head() {_ZNSt11_Tuple_implILm0EJO3STREE7_M_headERKS2_}' now becomes 'method STR& std::_Tuple_impl<0, STR &&>::_M_head() {_ZNSt11_Tuple_implILm0EJO3STREE7_M_headERKS2_}'
 
-  [C]'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_
      and it aliases symbol: _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_
     linkage names of method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&)
     changed from '_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_, _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_' to '_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_'
     'method void std::_Tuple_impl<0ul, STR&&>::_Tuple_impl<STR>(STR&&) {_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_, _ZNSt11_Tuple_implILm0EJO3STREEC1IS0_JESt10false_typeEEOT_DpOT0_}' now becomes 'method void std::_Tuple_impl<0, STR &&>::_Tuple_impl<STR, std::false_type>(STR&&) {_ZNSt11_Tuple_implILm0EJO3STREEC2IS0_JESt10false_typeEEOT_DpOT0_}'
 
-  [C]'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&)' has some indirect sub-type changes:
+  [C] 'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&)' has some indirect sub-type changes:
     'function std::__add_c_ref<STR&&>::type std::__get_helper<0ul, STR&&>(const std::_Tuple_impl<0ul, STR&&>&) {_ZSt12__get_helperILm0EO3STRJEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS3_DpT1_EE}' now becomes 'function std::__add_c_ref<STR &&>::type std::__get_helper<0, STR &&>(const std::_Tuple_impl<0, STR &&>&) {_ZSt12__get_helperILm0EO3STRJEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS3_DpT1_EE}'
     return type changed:
       typedef name changed from std::__add_c_ref<STR&&>::type to std::__add_c_ref<STR &&>::type
@@ -50,7 +50,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const std::_Tuple_impl<0ul, STR&&>':
         'const std::_Tuple_impl<0ul, STR&&>' changed to 'const std::_Tuple_impl<0, STR &&>'
 
-  [C]'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&)' has some indirect sub-type changes:
+  [C] 'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&)' has some indirect sub-type changes:
     'function std::__add_c_ref<STR&&>::type std::get<0ul, STR&&>(const std::tuple<STR&&>&) {_ZSt3getILm0EJO3STREENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKS7_}' now becomes 'function std::__add_c_ref<STR &&>::type std::get<0, STR &&>(const std::tuple<STR &&>&) {_ZSt3getILm0EJO3STREENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKS7_}'
     return type changed:
       typedef name changed from std::__add_c_ref<STR&&>::type to std::__add_c_ref<STR &&>::type
@@ -59,21 +59,21 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'const std::tuple<STR&&>':
         'const std::tuple<STR&&>' changed to 'const std::tuple<STR &&>'
 
-  [C]'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&)' has some indirect sub-type changes:
+  [C] 'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&)' has some indirect sub-type changes:
     'function std::remove_reference<STR&>::type&& std::move<STR&>(STR&) {_ZSt4moveIR3STREONSt16remove_referenceIT_E4typeEOS3_}' now becomes 'function std::remove_reference<STR &>::type&& std::move<STR &>(STR&) {_ZSt4moveIR3STREONSt16remove_referenceIT_E4typeEOS3_}'
     return type changed:
       in referenced type 'typedef std::remove_reference<STR&>::type':
         typedef name changed from std::remove_reference<STR&>::type to std::remove_reference<STR &>::type
 
 
-  [C]'method void std::tuple<STR&&>::tuple<STR>(STR&&)' has some indirect sub-type changes:
+  [C] 'method void std::tuple<STR&&>::tuple<STR>(STR&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_
      and it aliases symbol: _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_
     linkage names of method void std::tuple<STR&&>::tuple<STR>(STR&&)
     changed from '_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_, _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_' to '_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_'
     'method void std::tuple<STR&&>::tuple<STR>(STR&&) {_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_, _ZNSt5tupleIJO3STREEC1IJS0_ESt9true_typeEEDpOT_}' now becomes 'method void std::tuple<STR &&>::tuple<STR, std::true_type>(STR&&) {_ZNSt5tupleIJO3STREEC2IJS0_ESt9true_typeEEDpOT_}'
 
-  [C]'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>)' has some indirect sub-type changes:
+  [C] 'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>)' has some indirect sub-type changes:
     'function void tpl<std::tuple<STR&&> >(std::tuple<STR&&>) {_Z3tplISt5tupleIJO3STREEEvT_}' now becomes 'function void tpl<std::tuple<STR &&> >(std::tuple<STR &&>) {_Z3tplISt5tupleIJO3STREEEvT_}'
     parameter 1 of type 'class std::tuple<STR&&>' changed:
       details were reported earlier
diff --git a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
index 345f7e91..1c0c773d 100644
--- a/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
+++ b/tests/data/test-diff-dwarf/test43-PR22913-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function char f1(Struct1Ptr)' has some indirect sub-type changes:
+  [C] 'function char f1(Struct1Ptr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef Struct1Ptr' has sub-type changes:
       underlying type '__anonymous_struct__1*' changed:
         in pointed to type 'struct {char m1; char m2;}':
diff --git a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
index ad8d6332..ff0131a4 100644
--- a/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0*)' has some indirect sub-type changes:
     parameter 1 of type 'S0*' has sub-type changes:
       in pointed to type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
index cb92f5ed..e43c3a89 100644
--- a/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
+++ b/tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1&)' has some indirect sub-type changes:
+  [C] 'function void bar(S1&)' has some indirect sub-type changes:
     parameter 1 of type 'S1&' has sub-type changes:
       in referenced type 'struct S1':
         type size changed from 96 to 64 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
 
-  [C]'function void foo(S0&)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test46-rust-report-0.txt b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
index 87544b6f..66538cdf 100644
--- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt
+++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function one::Foo one::foo(u32)' has some indirect sub-type changes:
+  [C] 'function one::Foo one::foo(u32)' has some indirect sub-type changes:
     'function one::Foo one::foo(u32) {foo}' now becomes 'function two::Foo two::foo(u32, u32) {foo}'
     return type changed:
       type name changed from 'one::Foo' to 'two::Foo'
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index c8c9830f..74c9e3bf 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function C0 foo()' has some indirect sub-type changes:
+  [C] 'function C0 foo()' has some indirect sub-type changes:
     return type changed:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test6-report.txt b/tests/data/test-diff-dwarf/test6-report.txt
index 35817256..755d37f8 100644
--- a/tests/data/test-diff-dwarf/test6-report.txt
+++ b/tests/data/test-diff-dwarf/test6-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size hasn't changed
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 727db5a9..5adaea5f 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-dwarf/test9-report.txt b/tests/data/test-diff-dwarf/test9-report.txt
index 126f5d84..914841bd 100644
--- a/tests/data/test-diff-dwarf/test9-report.txt
+++ b/tests/data/test-diff-dwarf/test9-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'int global_var0' was changed to 'char global_var0':
+  [C] 'int global_var0' was changed to 'char global_var0':
     size of symbol changed from 4 to 1
     type of variable changed:
      type name changed from 'int' to 'char'
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
index 6fb973a4..78be7f06 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some indirect sub-type change:
 
-  [C]'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some indirect sub-type changes:
+  [C] 'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some indirect sub-type changes:
     return type changed:
       in referenced type 'int':
         type name changed from 'int' to 'char'
@@ -18,7 +18,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some indirect sub-type changes:
+  [C] 'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'int':
         type name changed from 'int' to 'char'
@@ -33,7 +33,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some indirect sub-type changes:
+  [C] 'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some indirect sub-type changes:
     return type changed:
       'const int' changed to 'const char'
     parameter 1 of type 'S2&' has sub-type changes:
@@ -46,7 +46,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
              type size changed from 32 to 8 (in bits)
 
 
-  [C]'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some indirect sub-type changes:
+  [C] 'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
index c3a54e36..e5e4bd30 100644
--- a/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
+++ b/tests/data/test-diff-filter/libtest45-basic-type-change-report-1.txt
@@ -5,19 +5,19 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 
 4 functions with some sub-type change:
 
-  [C]'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some sub-type changes:
+  [C] 'function int& foo0(S0&)' at test45-basic-type-change-v1.cc:24:1 has some sub-type changes:
     return type changed:
       reference type changed from: 'int&' to: 'char&'
 
-  [C]'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some sub-type changes:
+  [C] 'function int* foo1(S1&)' at test45-basic-type-change-v1.cc:28:1 has some sub-type changes:
     return type changed:
       pointer type changed from: 'int*' to: 'char*'
 
-  [C]'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some sub-type changes:
+  [C] 'function const int foo2(S2&)' at test45-basic-type-change-v1.cc:32:1 has some sub-type changes:
     return type changed:
       'const int' changed to 'const char'
 
-  [C]'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some sub-type changes:
+  [C] 'function int foo3(S2&)' at test45-basic-type-change-v1.cc:36:1 has some sub-type changes:
     return type changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test-PR24731-report-1.txt b/tests/data/test-diff-filter/test-PR24731-report-1.txt
index d33e5653..759fc39c 100644
--- a/tests/data/test-diff-filter/test-PR24731-report-1.txt
+++ b/tests/data/test-diff-filter/test-PR24731-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void test_func(u)' at test-PR24731-v1.c:3:1 has some indirect sub-type changes:
+  [C] 'function void test_func(u)' at test-PR24731-v1.c:3:1 has some indirect sub-type changes:
     parameter 1 of type 'union u' has sub-type changes:
       type size hasn't changed
       type changed from:
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index d916c773..0d5d2e52 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index 2edddb2b..0407bd46 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S0&, S1*)' has some indirect sub-type changes:
+  [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'class S0':
         type size changed from 96 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test1-report.txt b/tests/data/test-diff-filter/test1-report.txt
index d8154ccd..0c1d1911 100644
--- a/tests/data/test-diff-filter/test1-report.txt
+++ b/tests/data/test-diff-filter/test1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(C1*)' has some indirect sub-type changes:
+  [C] 'function void bar(C1*)' has some indirect sub-type changes:
     parameter 1 of type 'C1*' has sub-type changes:
       in pointed to type 'class C1':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index fa489090..64969890 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test11-report.txt b/tests/data/test-diff-filter/test11-report.txt
index aee87235..c3b9672e 100644
--- a/tests/data/test-diff-filter/test11-report.txt
+++ b/tests/data/test-diff-filter/test11-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'method int S1::member_fn0(S0&)' has some indirect sub-type changes:
+  [C] 'method int S1::member_fn0(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
       in referenced type 'struct S0':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index 8c815957..169771ec 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test14-0-report.txt b/tests/data/test-diff-filter/test14-0-report.txt
index 036b14d8..52cdcf89 100644
--- a/tests/data/test-diff-filter/test14-0-report.txt
+++ b/tests/data/test-diff-filter/test14-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test14-1-report.txt b/tests/data/test-diff-filter/test14-1-report.txt
index 003aae59..27df61a8 100644
--- a/tests/data/test-diff-filter/test14-1-report.txt
+++ b/tests/data/test-diff-filter/test14-1-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
           'unsigned int S::m2', at offset 64 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       referenced type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test15-0-report.txt b/tests/data/test-diff-filter/test15-0-report.txt
index 11739ca4..2c162d55 100644
--- a/tests/data/test-diff-filter/test15-0-report.txt
+++ b/tests/data/test-diff-filter/test15-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S* var1' was changed:
+  [C] 'S* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test15-1-report.txt b/tests/data/test-diff-filter/test15-1-report.txt
index 2dfc6a8e..82c6575c 100644
--- a/tests/data/test-diff-filter/test15-1-report.txt
+++ b/tests/data/test-diff-filter/test15-1-report.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S* var1' was changed:
+  [C] 'S* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 64 to 96 (in bits)
        1 data member insertion:
          'unsigned int S::m2', at offset 64 (in bits)
 
-  [C]'S* var2' was changed:
+  [C] 'S* var2' was changed:
     type of variable changed:
      pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test16-report-2.txt b/tests/data/test-diff-filter/test16-report-2.txt
index a7415e2a..744bdced 100644
--- a/tests/data/test-diff-filter/test16-report-2.txt
+++ b/tests/data/test-diff-filter/test16-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test16-report.txt b/tests/data/test-diff-filter/test16-report.txt
index 9c34fc4b..cf2bd81c 100644
--- a/tests/data/test-diff-filter/test16-report.txt
+++ b/tests/data/test-diff-filter/test16-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test17-0-report.txt b/tests/data/test-diff-filter/test17-0-report.txt
index df3624d2..2d2f8650 100644
--- a/tests/data/test-diff-filter/test17-0-report.txt
+++ b/tests/data/test-diff-filter/test17-0-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-filter/test17-1-report.txt b/tests/data/test-diff-filter/test17-1-report.txt
index 3bcb59e8..1c75796c 100644
--- a/tests/data/test-diff-filter/test17-1-report.txt
+++ b/tests/data/test-diff-filter/test17-1-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            pointed to type 'struct S' changed; details are being reported
          and offset changed from 0 to 64 (in bits) (by +64 bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       referenced type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test18-report.txt b/tests/data/test-diff-filter/test18-report.txt
index 08e354fb..0d30ef39 100644
--- a/tests/data/test-diff-filter/test18-report.txt
+++ b/tests/data/test-diff-filter/test18-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test19-enum-report-1.txt b/tests/data/test-diff-filter/test19-enum-report-1.txt
index 19326c5b..337d9c35 100644
--- a/tests/data/test-diff-filter/test19-enum-report-1.txt
+++ b/tests/data/test-diff-filter/test19-enum-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(E)' has some indirect sub-type changes:
+  [C] 'function void foo(E)' has some indirect sub-type changes:
     parameter 1 of type 'typedef E' has sub-type changes:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test2-report.txt b/tests/data/test-diff-filter/test2-report.txt
index df2c9a06..87ef1a4d 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -7,14 +7,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(C1&)' has some indirect sub-type changes:
+  [C] 'function void bar(C1&)' has some indirect sub-type changes:
     parameter 1 of type 'C1&' has sub-type changes:
       in referenced type 'class C1':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
           'int C1::m1', at offset 32 (in bits)
 
-  [C]'function void foo(C0&)' has some indirect sub-type changes:
+  [C] 'function void foo(C0&)' has some indirect sub-type changes:
     parameter 1 of type 'C0&' has sub-type changes:
       in referenced type 'struct C0':
         type size changed from 16 to 24 (in bits)
diff --git a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
index 893ffd63..606c619d 100644
--- a/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
+++ b/tests/data/test-diff-filter/test21-compatible-vars-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'const volatile S* const* const* var0' was changed to 'const volatile typedef_of_S* const* const* var0':
+  [C] 'const volatile S* const* const* var0' was changed to 'const volatile typedef_of_S* const* const* var0':
     type of variable changed:
      in pointed to type 'const volatile S* const* const':
        'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
diff --git a/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt b/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
index 77d6766c..bdbca052 100644
--- a/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
+++ b/tests/data/test-diff-filter/test22-compatible-fns-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(const volatile S* const* const*)' has some indirect sub-type changes:
+  [C] 'function void func0(const volatile S* const* const*)' has some indirect sub-type changes:
     parameter 1 of type 'const volatile S* const* const*' changed:
       in pointed to type 'const volatile S* const* const':
         'const volatile S* const* const' changed to 'const volatile typedef_of_S* const* const'
diff --git a/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt b/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
index a624ef0f..f847d32e 100644
--- a/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
+++ b/tests/data/test-diff-filter/test23-redundant-fn-parm-change-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int add(int, int)' has some indirect sub-type changes:
+  [C] 'function int add(int, int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'float'
       type size hasn't changed
diff --git a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
index a961246c..85125410 100644
--- a/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
+++ b/tests/data/test-diff-filter/test24-compatible-vars-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'S a[2]' was changed to 'typedef_of_S a[2]':
+  [C] 'S a[2]' was changed to 'typedef_of_S a[2]':
     type of variable changed:
      array element type 'struct S' changed: 
        entity changed from 'struct S' to compatible type 'typedef typedef_of_S'
diff --git a/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt b/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
index d6597ef7..8f96c202 100644
--- a/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
+++ b/tests/data/test-diff-filter/test25-cyclic-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
index a213d7f9..dba30227 100644
--- a/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
+++ b/tests/data/test-diff-filter/test25-cyclic-type-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
index 7c74f324..a226b6c5 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
+  [C] 'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
     parameter 1 of type 'ConstTypedefOfS*' has sub-type changes:
       in pointed to type 'typedef ConstTypedefOfS':
         underlying type 'const TypedefOfS' changed:
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
index 593cc1af..0f032cbd 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
+  [C] 'function void foo(ConstTypedefOfS*)' has some indirect sub-type changes:
     parameter 1 of type 'ConstTypedefOfS*' has sub-type changes:
       in pointed to type 'typedef ConstTypedefOfS':
         underlying type 'const TypedefOfS' changed:
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
index a0615d05..7197c376 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
index 48003c42..cfbc7918 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S0::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
index 0c30b68a..eba592a2 100644
--- a/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
+++ b/tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
+  [C] 'function S0* bar(S1*, S2*)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
@@ -16,7 +16,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S2':
         entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
index 857685f4..9e5fb48b 100644
--- a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
+++ b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(s*)' has some indirect sub-type changes:
+  [C] 'function void bar(s*)' has some indirect sub-type changes:
     parameter 1 of type 's*' has sub-type changes:
       in pointed to type 'class s':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
index 178ec737..11a44d5e 100644
--- a/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
+++ b/tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt
@@ -3,18 +3,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(s*)' has some indirect sub-type changes:
+  [C] 'function void bar(s*)' has some indirect sub-type changes:
     parameter 1 of type 's*' has sub-type changes:
       in pointed to type 'class s':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char s::m1', at offset 32 (in bits)
 
-  [C]'function void foo(s&)' has some indirect sub-type changes:
+  [C] 'function void foo(s&)' has some indirect sub-type changes:
     parameter 1 of type 's&' has sub-type changes:
       referenced type 'class s' changed, as reported earlier
 
-  [C]'method s::s(const s&)' has some indirect sub-type changes:
+  [C] 'method s::s(const s&)' has some indirect sub-type changes:
     'method s::s(const s&)' access changed from 'public' to 'private'
     parameter 1 of type 'const s&' has sub-type changes:
       in referenced type 'const s':
diff --git a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
index 60ee3766..a7ee9d55 100644
--- a/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
+++ b/tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt
@@ -3,18 +3,18 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(base&)' has some indirect sub-type changes:
+  [C] 'function void bar(base&)' has some indirect sub-type changes:
     parameter 1 of type 'base&' has sub-type changes:
       in referenced type 'struct base':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char base::m1', at offset 32 (in bits)
 
-  [C]'function void baz(base)' has some indirect sub-type changes:
+  [C] 'function void baz(base)' has some indirect sub-type changes:
     parameter 1 of type 'struct base' has sub-type changes:
       details were reported earlier
 
-  [C]'function void foo(inherited*)' has some indirect sub-type changes:
+  [C] 'function void foo(inherited*)' has some indirect sub-type changes:
     parameter 1 of type 'inherited*' has sub-type changes:
       in pointed to type 'struct inherited':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-filter/test3-report.txt b/tests/data/test-diff-filter/test3-report.txt
index c7c0a826..ef48956a 100644
--- a/tests/data/test-diff-filter/test3-report.txt
+++ b/tests/data/test-diff-filter/test3-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S&)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S&)' has some indirect sub-type changes:
     parameter 2 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 8 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index d35b958e..b78215b0 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133'
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc':
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry':
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor':
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index 9bc76121..ccaf8126 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133' at liboffload_error_codes.h:38:1
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 2b6aaec1..44e78935 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1174,7 +1174,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.h:206:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' at liboffload_error_codes.h:38:1 changed:
         type size hasn't changed
@@ -1296,7 +1296,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133' at liboffload_error_codes.h:38:1
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' at offload_host.h:157:1 has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc' at offload_common.h:254:1:
         type size hasn't changed
@@ -1313,7 +1313,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' at offload_myo_host.cpp:691:1 has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry' at offload_table.h:296:1:
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
@@ -1327,7 +1327,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' at compiler_if_host.cpp:456:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
@@ -1440,12 +1440,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
 
-  [C]'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' at offload_host.cpp:5531:1 has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 0x1 (in bytes)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' at vector.tcc:407:1 has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -1518,7 +1518,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]' at offload_engine.h:659:1:
     size of symbol changed from 0x6 to 0x7
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index b106d946..795410dc 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -27,7 +27,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 2 functions with some indirect sub-type change:
 
-  [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
@@ -41,7 +41,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
-  [C]'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
+  [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
       type size hasn't changed
       1 enumerator deletion:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index 89d6ca76..4ec08fea 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -27,7 +27,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 2 functions with some indirect sub-type change:
 
-  [C]'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
@@ -41,7 +41,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
          'int __cxxabiv1::__cxa_dependent_exception::propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
-  [C]'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:139:1 has some indirect sub-type changes:
+  [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:139:1 has some indirect sub-type changes:
     parameter 1 of type 'enum std::regex_constants::error_type' has sub-type changes:
       type size hasn't changed
       1 enumerator deletion:
diff --git a/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt b/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
index f8151035..69ed568c 100644
--- a/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
+++ b/tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int bar(S*)' has some indirect sub-type changes:
+  [C] 'function int bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index f0f512df..c9cb9246 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -90,7 +90,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 6 functions with some indirect sub-type change:
 
-  [C]'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
+  [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
       underlying type 'enum __anonymous_enum__' changed:
         type size hasn't changed
@@ -212,7 +212,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           '__anonymous_enum__::c_coipipe_max_number' from value '123' to '133'
 
 
-  [C]'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
+  [C] 'method bool OffloadDescriptor::setup_descriptors(VarDesc*, VarDesc2*, int, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'VarDesc*' has sub-type changes:
       in pointed to type 'struct VarDesc':
         type size hasn't changed
@@ -229,7 +229,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 
 
-  [C]'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
+  [C] 'function void __offload_myoRegisterTables(InitTableEntry*, SharedTableEntry*, FptrTableEntry*)' has some indirect sub-type changes:
     parameter 1 of type 'InitTableEntry*' changed:
       in pointed to type 'struct InitTableEntry':
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
@@ -243,7 +243,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
            and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
 
-  [C]'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
+  [C] 'function int __offload_offload(OFFLOAD, const char*, int, int, VarDesc*, VarDesc2*, int, void**, void*, int, void*)' has some indirect sub-type changes:
     parameter 1 of type 'typedef OFFLOAD' has sub-type changes:
       underlying type 'OffloadDescriptor*' changed:
         in pointed to type 'struct OffloadDescriptor':
@@ -356,12 +356,12 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
            'uint64_t OffloadDescriptor::m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
            'bool OffloadDescriptor::m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
-  [C]'function void __offload_register_image(void*)' has some indirect sub-type changes:
+  [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'bool'
       type size changed from 0 to 8 (in bits)
 
-  [C]'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
+  [C] 'method void std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> >::_M_emplace_back_aux<const VarTable::Entry*>(const VarTable::Entry*&&)' has some indirect sub-type changes:
     Please note that the symbol of this function is _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIJS3_EEEvDpOT_
      and it aliases symbol: _ZNSt6vectorIPKN8VarTable5EntryESaIS3_EE19_M_emplace_back_auxIIS3_EEEvDpOT_
     parameter 1 of type 'const VarTable::Entry*&&' changed:
@@ -420,7 +420,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 27653229..2f07f1a6 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -90,7 +90,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 1 Changed variable:
 
-  [C]'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
+  [C] 'static const char* Engine::m_func_names[6]' was changed to 'static const char* Engine::m_func_names[7]':
     size of symbol changed from 48 to 56
     type of variable changed:
      type name changed from 'const char*[6]' to 'const char*[7]'
diff --git a/tests/data/test-diff-filter/test36-report-0.txt b/tests/data/test-diff-filter/test36-report-0.txt
index 4815807c..08692c1e 100644
--- a/tests/data/test-diff-filter/test36-report-0.txt
+++ b/tests/data/test-diff-filter/test36-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function int foo_1(S*)' at test36-1-v1.c:12:1 has some indirect sub-type changes:
+  [C] 'function int foo_1(S*)' at test36-1-v1.c:12:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test36-1-v1.c:6:1:
         type size hasn't changed
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 
 
-  [C]'function int foo_2(S*)' at test36-2-v1.c:13:1 has some indirect sub-type changes:
+  [C] 'function int foo_2(S*)' at test36-2-v1.c:13:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test36-2-v1.c:6:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test37-report-0.txt b/tests/data/test-diff-filter/test37-report-0.txt
index ca393b48..4617a505 100644
--- a/tests/data/test-diff-filter/test37-report-0.txt
+++ b/tests/data/test-diff-filter/test37-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void f1(A&)' at test37-v1.cc:19:1 has some indirect sub-type changes:
+  [C] 'function void f1(A&)' at test37-v1.cc:19:1 has some indirect sub-type changes:
     parameter 1 of type 'A&' has sub-type changes:
       in referenced type 'struct A' at test37-v1.cc:3:1:
         type size changed from 32 to 8 (in bits)
@@ -13,7 +13,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            type size changed from 32 to 8 (in bits)
 
 
-  [C]'function void f2(B&)' at test37-v1.cc:23:1 has some indirect sub-type changes:
+  [C] 'function void f2(B&)' at test37-v1.cc:23:1 has some indirect sub-type changes:
     parameter 1 of type 'B&' has sub-type changes:
       in referenced type 'struct B' at test37-v1.cc:8:1:
         type size changed from 32 to 8 (in bits)
@@ -23,7 +23,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
            type size changed from 32 to 8 (in bits)
 
 
-  [C]'function void f3(C&)' at test37-v1.cc:27:1 has some indirect sub-type changes:
+  [C] 'function void f3(C&)' at test37-v1.cc:27:1 has some indirect sub-type changes:
     parameter 1 of type 'C&' has sub-type changes:
       in referenced type 'struct C' at test37-v1.cc:13:1:
         type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-filter/test39/test39-report-0.txt b/tests/data/test-diff-filter/test39/test39-report-0.txt
index b58eb8af..c6bfa2b1 100644
--- a/tests/data/test-diff-filter/test39/test39-report-0.txt
+++ b/tests/data/test-diff-filter/test39/test39-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function long long int foo1(container_type*)' at test39-b-v1.c:10:1 has some indirect sub-type changes:
+  [C] 'function long long int foo1(container_type*)' at test39-b-v1.c:10:1 has some indirect sub-type changes:
     parameter 1 of type 'container_type*' has sub-type changes:
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
 
 
-  [C]'function long long int foo2(container_type*)' at test39-c-v1.c:10:1 has some indirect sub-type changes:
+  [C] 'function long long int foo2(container_type*)' at test39-c-v1.c:10:1 has some indirect sub-type changes:
     parameter 1 of type 'container_type*' has sub-type changes:
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index 3a87adb5..cdae9c56 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -36,7 +36,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 2 functions with some indirect sub-type change:
 
-  [C]'method void abigail::xml_writer::write_context::record_type_as_emitted(const abigail::ir::type_base_sptr&)' at abg-writer.cc:473:1 has some indirect sub-type changes:
+  [C] 'method void abigail::xml_writer::write_context::record_type_as_emitted(const abigail::ir::type_base_sptr&)' at abg-writer.cc:473:1 has some indirect sub-type changes:
     parameter 1 of type 'const abigail::ir::type_base_sptr&' has sub-type changes:
       in referenced type 'const abigail::ir::type_base_sptr':
         in unqualified underlying type 'typedef abigail::ir::type_base_sptr' at abg-fwd.h:110:1:
@@ -47,7 +47,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
             1 base class insertion:
               class std::tr1::__shared_ptr<abigail::ir::type_base, __gnu_cxx::_Lock_policy::_S_atomic> at shared_ptr.h:539:1
 
-  [C]'method bool abigail::xml_writer::write_context::type_ptr_cmp::operator()(const abigail::ir::type_base*, const abigail::ir::type_base*) const' at abg-writer.cc:359:1 has some indirect sub-type changes:
+  [C] 'method bool abigail::xml_writer::write_context::type_ptr_cmp::operator()(const abigail::ir::type_base*, const abigail::ir::type_base*) const' at abg-writer.cc:359:1 has some indirect sub-type changes:
 
 
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
index cc3b2678..a660fd3e 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int bar(S2*)' at test44-anonymous-data-member-v1.c:26:1 has some indirect sub-type changes:
+  [C] 'function int bar(S2*)' at test44-anonymous-data-member-v1.c:26:1 has some indirect sub-type changes:
     parameter 1 of type 'S2*' has sub-type changes:
       in pointed to type 'struct S2' at test44-anonymous-data-member-v1.c:11:1:
         type size changed from 128 to 160 (in bits)
diff --git a/tests/data/test-diff-filter/test6-report.txt b/tests/data/test-diff-filter/test6-report.txt
index 8ad408b8..ddf991f7 100644
--- a/tests/data/test-diff-filter/test6-report.txt
+++ b/tests/data/test-diff-filter/test6-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo()' has some indirect sub-type changes:
     return type changed:
       underlying type 'unsigned char' changed:
         type name changed from 'unsigned char' to 'unsigned int'
diff --git a/tests/data/test-diff-filter/test7-report.txt b/tests/data/test-diff-filter/test7-report.txt
index f71441ee..7e3a4d47 100644
--- a/tests/data/test-diff-filter/test7-report.txt
+++ b/tests/data/test-diff-filter/test7-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'return_type' to 'other_return_type'
       type size hasn't changed
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index a67ff59e..0699c146 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index 645324b5..fb67e43a 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -6,7 +6,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function void gl_h__glgentextures(const gdk__gl__gl_configs, const gl_h__gluint_vec___XUP)' at gl_h.adb:35:1 has some indirect sub-type changes:
+    [C] 'function void gl_h__glgentextures(const gdk__gl__gl_configs, const gl_h__gluint_vec___XUP)' at gl_h.adb:35:1 has some indirect sub-type changes:
       parameter 2 of type 'const gl_h__gluint_vec___XUP' has sub-type changes:
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
@@ -25,7 +25,7 @@
 
 
 
-    [C]'function gtk__glarea__gtk_glarea gtk__glarea__gtk_new(gtk__glarea__gtk_glarea, const gtk__glarea__attributes_array___XUP)' at gtk-glarea.adb:63:1 has some indirect sub-type changes:
+    [C] 'function gtk__glarea__gtk_glarea gtk__glarea__gtk_new(gtk__glarea__gtk_glarea, const gtk__glarea__attributes_array___XUP)' at gtk-glarea.adb:63:1 has some indirect sub-type changes:
       parameter 2 of type 'const gtk__glarea__attributes_array___XUP' has sub-type changes:
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
diff --git a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
index 736de8fb..8631497a 100644
--- a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/dirpkg-2-report-1.txt b/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
index c7c92265..c7c34702 100644
--- a/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-2-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
index e90a7e89..3bc01e14 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void foo(S1&)' has some indirect sub-type changes:
+    [C] 'function void foo(S1&)' has some indirect sub-type changes:
       parameter 1 of type 'S1&' has sub-type changes:
         in referenced type 'struct S1':
           type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
index bea69bad..5ed307f2 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void foo(S1&)' at obj-v0.cc:24:1 has some indirect sub-type changes:
+    [C] 'function void foo(S1&)' at obj-v0.cc:24:1 has some indirect sub-type changes:
       parameter 1 of type 'S1&' has sub-type changes:
         in referenced type 'struct S1' at obj-v0.cc:15:1:
           type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
index 858967bb..0c097b6b 100644
--- a/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
+++ b/tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt
@@ -10,7 +10,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function IceConn IceAcceptConnection(IceListenObj, IceAcceptStatus*)' at accept.c:38:1 has some indirect sub-type changes:
+    [C] 'function IceConn IceAcceptConnection(IceListenObj, IceAcceptStatus*)' at accept.c:38:1 has some indirect sub-type changes:
       return type changed:
         underlying type '_IceConn*' changed:
           in pointed to type 'struct _IceConn' at ICEconn.h:131:1:
@@ -92,7 +92,7 @@
 
   2 Changed variables:
 
-    [C]'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1:
+    [C] 'char* _IceAuthNames[1]' was changed to 'const char* _IceAuthNames[1]' at globals.h:37:1:
       type of variable changed:
        array element type 'char*' changed: 
          in pointed to type 'char':
@@ -101,7 +101,7 @@
        type name changed from 'char*[1]' to 'const char*[1]'
        type size hasn't changed
 
-    [C]'_IceWatchProc* _IceWatchProcs' was changed at globals.h:39:1:
+    [C] '_IceWatchProc* _IceWatchProcs' was changed at globals.h:39:1:
       type of variable changed:
        in pointed to type 'struct _IceWatchProc' at ICElibint.h:322:1:
          entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
diff --git a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
index 662e2305..b3be1535 100644
--- a/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
+++ b/tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function discmode_t mmc_get_dvd_struct_physical(const CdIo_t*, cdio_dvd_struct_t*)' at mmc.c:949:1 has some indirect sub-type changes:
+    [C] 'function discmode_t mmc_get_dvd_struct_physical(const CdIo_t*, cdio_dvd_struct_t*)' at mmc.c:949:1 has some indirect sub-type changes:
       parameter 2 of type 'cdio_dvd_struct_t*' has sub-type changes:
         in pointed to type 'typedef cdio_dvd_struct_t' at dvd.h:130:1:
           underlying type 'union {uint8_t type; cdio_dvd_physical_t physical; cdio_dvd_copyright_t copyright; cdio_dvd_disckey_t disckey; cdio_dvd_bca_t bca; cdio_dvd_manufact_t manufact;}' at dvd.h:122:1 changed:
diff --git a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
index 385f9189..3819aed9 100644
--- a/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
+++ b/tests/data/test-diff-pkg/libsigc++-2.0-0c2a_2.4.0-1_amd64--libsigc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt
@@ -12,7 +12,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'method sigc::connection::connection(const sigc::connection&)' has some indirect sub-type changes:
+    [C] 'method sigc::connection::connection(const sigc::connection&)' has some indirect sub-type changes:
       parameter 1 of type 'const sigc::connection&' has sub-type changes:
         in referenced type 'const sigc::connection':
           in unqualified underlying type 'struct sigc::connection':
@@ -69,7 +69,7 @@
 
 
 
-    [C]'method sigc::internal::signal_impl* sigc::signal_base::impl() const' has some indirect sub-type changes:
+    [C] 'method sigc::internal::signal_impl* sigc::signal_base::impl() const' has some indirect sub-type changes:
       return type changed:
         in pointed to type 'struct sigc::internal::signal_impl':
           type size changed from 192 to 256 (in bits)
diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index 9b78ca91..c227fa5c 100644
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2199:1 has some indirect sub-type changes:
+    [C] 'function SECStatus CERT_AddOCSPAcceptableResponses(CERTOCSPRequest*, SECOidTag, ...)' at ocsp.c:2199:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef SECOidTag' has sub-type changes:
         underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
           type size hasn't changed
@@ -28,7 +28,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function SSLKEAType NSS_FindCertKEAType(CERTCertificate*)' at sslcert.c:939:1 has some indirect sub-type changes:
+    [C] 'function SSLKEAType NSS_FindCertKEAType(CERTCertificate*)' at sslcert.c:939:1 has some indirect sub-type changes:
       return type changed:
         underlying type 'enum __anonymous_enum__' at sslt.h:38:1 changed:
           type size hasn't changed
@@ -39,7 +39,7 @@
             '__anonymous_enum__::ssl_kea_size' from value '5' to '6' at sslt.h:40:1
 
 
-    [C]'function SECStatus SSL_GetCipherSuiteInfo(PRUint16, SSLCipherSuiteInfo*, PRUintn)' at sslinfo.c:294:1 has some indirect sub-type changes:
+    [C] 'function SECStatus SSL_GetCipherSuiteInfo(PRUint16, SSLCipherSuiteInfo*, PRUintn)' at sslinfo.c:294:1 has some indirect sub-type changes:
       parameter 2 of type 'SSLCipherSuiteInfo*' has sub-type changes:
         in pointed to type 'typedef SSLCipherSuiteInfo' at sslt.h:252:1:
           underlying type 'struct SSLCipherSuiteInfoStr' at sslt.h:178:1 changed:
@@ -67,7 +67,7 @@
 
   1 Changed variable:
 
-    [C]'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
+    [C] 'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
       size of symbol changed from 148 to 138
       type of variable changed:
        type name changed from 'PRUint16[74]' to 'const PRUint16[69]'
@@ -83,7 +83,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:359:1 has some indirect sub-type changes:
+    [C] 'function PK11SymKey* NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo*)' at cmscinfo.c:359:1 has some indirect sub-type changes:
       parameter 1 of type 'NSSCMSContentInfo*' has sub-type changes:
         in pointed to type 'typedef NSSCMSContentInfo' at cmst.h:54:1:
           underlying type 'struct NSSCMSContentInfoStr' at cmst.h:131:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
index 4fd91394..9251c43f 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-0.txt
@@ -19,7 +19,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -47,7 +47,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
index 4fd91394..9251c43f 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-1.txt
@@ -19,7 +19,7 @@
 
   2 functions with some indirect sub-type change:
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -47,7 +47,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index d1ef2674..b885629e 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -19,7 +19,7 @@
 
   6 functions with some indirect sub-type change:
 
-    [C]'function void spice_qxl_add_memslot(QXLInstance*, QXLDevMemSlot*)' at red_dispatcher.c:879:1 has some indirect sub-type changes:
+    [C] 'function void spice_qxl_add_memslot(QXLInstance*, QXLDevMemSlot*)' at red_dispatcher.c:879:1 has some indirect sub-type changes:
       parameter 1 of type 'QXLInstance*' has sub-type changes:
         in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
           underlying type 'struct QXLInstance' at spice.h:259:1 changed:
@@ -55,7 +55,7 @@
 
 
 
-    [C]'function int spice_server_add_client(SpiceServer*, int, int)' at reds.c:2391:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_add_client(SpiceServer*, int, int)' at reds.c:2391:1 has some indirect sub-type changes:
       parameter 1 of type 'SpiceServer*' has sub-type changes:
         in pointed to type 'typedef SpiceServer' at spice-server.h:38:1:
           underlying type 'struct RedsState' at reds-private.h:127:1 changed:
@@ -327,7 +327,7 @@
 
             no data member change (1 filtered);
 
-    [C]'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
+    [C] 'function spice_image_compression_t spice_server_get_image_compression(SpiceServer*)' at reds.c:3618:1 has some indirect sub-type changes:
       return type changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
@@ -355,7 +355,7 @@
             'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
 
 
-    [C]'function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)' at snd_worker.c:1081:1 has some indirect sub-type changes:
+    [C] 'function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)' at snd_worker.c:1081:1 has some indirect sub-type changes:
       parameter 1 of type 'SpicePlaybackInstance*' has sub-type changes:
         in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
           underlying type 'struct SpicePlaybackInstance' at spice.h:350:1 changed:
@@ -370,7 +370,7 @@
                    no data member changes (2 filtered);
 
 
-    [C]'function uint32_t spice_server_record_get_samples(SpiceRecordInstance*, uint32_t*, uint32_t)' at snd_worker.c:1331:1 has some indirect sub-type changes:
+    [C] 'function uint32_t spice_server_record_get_samples(SpiceRecordInstance*, uint32_t*, uint32_t)' at snd_worker.c:1331:1 has some indirect sub-type changes:
       parameter 1 of type 'SpiceRecordInstance*' has sub-type changes:
         in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
           underlying type 'struct SpiceRecordInstance' at spice.h:380:1 changed:
@@ -385,7 +385,7 @@
                    no data member changes (2 filtered);
 
 
-    [C]'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
+    [C] 'function int spice_server_set_image_compression(SpiceServer*, spice_image_compression_t)' at reds.c:3602:1 has some indirect sub-type changes:
       parameter 2 of type 'typedef spice_image_compression_t' changed:
         typedef name changed from spice_image_compression_t to SpiceImageCompression at enums.h:197:1
         underlying type 'enum __anonymous_enum__2' at spice.h:471:1 changed:
diff --git a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
index 42dc1a72..478fa263 100644
--- a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
+++ b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function int f(S*)' at foo.c:10:1 has some indirect sub-type changes:
+    [C] 'function int f(S*)' at foo.c:10:1 has some indirect sub-type changes:
       parameter 1 of type 'S*' has sub-type changes:
         in pointed to type 'struct S' at foo.c:3:1:
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
index 736de8fb..8631497a 100644
--- a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' has some indirect sub-type changes:
+    [C] 'function void bar(S&)' has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
index 91d3df9f..de24937a 100644
--- a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
@@ -4,7 +4,7 @@
 
   1 function with some indirect sub-type change:
 
-    [C]'function void bar(S&)' at obj-v0.cc:16:1 has some indirect sub-type changes:
+    [C] 'function void bar(S&)' at obj-v0.cc:16:1 has some indirect sub-type changes:
       parameter 1 of type 'S&' has sub-type changes:
         in referenced type 'struct S' at obj-v0.cc:4:1:
           type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index dd58207a..69f438ea 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -26,7 +26,7 @@
 
   8 functions with some indirect sub-type change:
 
-    [C]'method void tbb::internal::concurrent_queue_base_v3::assign(const tbb::internal::concurrent_queue_base&)' at concurrent_queue.cpp:570:1 has some indirect sub-type changes:
+    [C] 'method void tbb::internal::concurrent_queue_base_v3::assign(const tbb::internal::concurrent_queue_base&)' at concurrent_queue.cpp:570:1 has some indirect sub-type changes:
       parameter 1 of type 'const tbb::internal::concurrent_queue_base&' has sub-type changes:
         in referenced type 'const tbb::internal::concurrent_queue_base':
           in unqualified underlying type 'typedef tbb::internal::concurrent_queue_base' at concurrent_queue.cpp:57:1:
@@ -55,7 +55,7 @@
 
 
 
-    [C]'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
+    [C] 'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
       parameter 1 of type 'enum tbb::internal::exception_id' has sub-type changes:
         type size hasn't changed
         1 enumerator insertion:
@@ -65,14 +65,14 @@
           'tbb::internal::exception_id::eid_max' from value '20' to '21' at tbb_exception.h:79:1
 
 
-    [C]'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
+    [C] 'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::mutex&' has sub-type changes:
         in referenced type 'class tbb::mutex' at mutex.h:40:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
+    [C] 'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
       parameter 2 of type 'tbb::task_group_context&' has sub-type changes:
         in referenced type 'class tbb::task_group_context' at task.h:302:1:
           type size hasn't changed
@@ -203,28 +203,28 @@
                 '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
 
 
-    [C]'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_mutex' at queuing_mutex.h:45:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_rw_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_rw_mutex' at queuing_rw_mutex.h:47:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
+    [C] 'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::recursive_mutex&' has sub-type changes:
         in referenced type 'class tbb::recursive_mutex' at recursive_mutex.h:39:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method bool tbb::spin_mutex::scoped_lock::internal_try_acquire(tbb::spin_mutex&)' at spin_mutex.h:69:1 has some indirect sub-type changes:
+    [C] 'method bool tbb::spin_mutex::scoped_lock::internal_try_acquire(tbb::spin_mutex&)' at spin_mutex.h:69:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::spin_mutex&' has sub-type changes:
         referenced type 'class tbb::spin_mutex' changed at spin_mutex.h:47:1, as reported earlier
 
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 26ab7c05..de74f1c5 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -26,7 +26,7 @@
 
   7 functions with some indirect sub-type change:
 
-    [C]'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
+    [C] 'function void tbb::internal::throw_exception_v4(tbb::internal::exception_id)' at tbb_misc.cpp:119:1 has some indirect sub-type changes:
       parameter 1 of type 'enum tbb::internal::exception_id' has sub-type changes:
         type size hasn't changed
         1 enumerator insertion:
@@ -36,14 +36,14 @@
           'tbb::internal::exception_id::eid_max' from value '20' to '21' at tbb_exception.h:79:1
 
 
-    [C]'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
+    [C] 'method void tbb::mutex::scoped_lock::internal_acquire(tbb::mutex&)' at mutex.h:129:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::mutex&' has sub-type changes:
         in referenced type 'class tbb::mutex' at mutex.h:40:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
+    [C] 'method void tbb::pipeline::run(std::size_t, tbb::task_group_context&)' at pipeline.cpp:633:1 has some indirect sub-type changes:
       parameter 2 of type 'tbb::task_group_context&' has sub-type changes:
         in referenced type 'class tbb::task_group_context' at task.h:302:1:
           type size hasn't changed
@@ -56,28 +56,28 @@
              array type subrange 1 changed length from 80 to 72
 
 
-    [C]'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_mutex::scoped_lock::acquire(tbb::queuing_mutex&)' at queuing_mutex.h:84:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_mutex' at queuing_mutex.h:45:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
+    [C] 'method void tbb::queuing_rw_mutex::scoped_lock::acquire(tbb::queuing_rw_mutex&, bool)' at queuing_rw_mutex.h:95:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::queuing_rw_mutex&' has sub-type changes:
         in referenced type 'class tbb::queuing_rw_mutex' at queuing_rw_mutex.h:47:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
+    [C] 'method void tbb::recursive_mutex::scoped_lock::internal_acquire(tbb::recursive_mutex&)' at recursive_mutex.h:139:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::recursive_mutex&' has sub-type changes:
         in referenced type 'class tbb::recursive_mutex' at recursive_mutex.h:39:1:
           type size hasn't changed
           1 base class insertion:
             class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
 
-    [C]'method void tbb::spin_mutex::scoped_lock::internal_acquire(tbb::spin_mutex&)' at spin_mutex.h:66:1 has some indirect sub-type changes:
+    [C] 'method void tbb::spin_mutex::scoped_lock::internal_acquire(tbb::spin_mutex&)' at spin_mutex.h:66:1 has some indirect sub-type changes:
       parameter 1 of type 'tbb::spin_mutex&' has sub-type changes:
         in referenced type 'class tbb::spin_mutex' at spin_mutex.h:40:1:
           type size hasn't changed
diff --git a/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt b/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
index 9ba2b126..1bd9abb0 100644
--- a/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
+++ b/tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt
@@ -6,7 +6,7 @@ SONAME changed from 'test48-soname-abixml-v0' to 'test48-soname-abixml-v1'
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S*)' at test48-soname-abixml-v1.c:8:1 has some indirect sub-type changes:
+  [C] 'function void foo(S*)' at test48-soname-abixml-v1.c:8:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S' at test48-soname-abixml-v1.c:1:1:
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
index 701c6a57..11a383c7 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(MyType*)' has some indirect sub-type changes:
+  [C] 'function void foo(MyType*)' has some indirect sub-type changes:
     parameter 1 of type 'MyType*' has sub-type changes:
       in pointed to type 'struct MyType':
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
index 7ca965b5..d3ac0320 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(b_type*)' has some indirect sub-type changes:
+  [C] 'function void bar(b_type*)' has some indirect sub-type changes:
     parameter 1 of type 'b_type*' has sub-type changes:
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function void foo(a_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(a_type*)' has some indirect sub-type changes:
     parameter 1 of type 'a_type*' has sub-type changes:
       in pointed to type 'typedef a_type':
         underlying type 'struct a_type' changed:
diff --git a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
index 66ecc1cb..e9a14b00 100644
--- a/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(b_type*)' has some indirect sub-type changes:
+  [C] 'function void bar(b_type*)' has some indirect sub-type changes:
     parameter 1 of type 'b_type*' has sub-type changes:
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt b/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
index faaecb89..8f5d0b6b 100644
--- a/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-suppr/test10-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int, int)' has some indirect sub-type changes:
+  [C] 'function int foo(int, int)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'int' to 'float'
       type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt b/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
index dc196bc4..f3c4c1d9 100644
--- a/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
+++ b/tests/data/test-diff-suppr/test11-add-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 8 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt b/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
index 38d69388..c92f1f34 100644
--- a/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
+++ b/tests/data/test-diff-suppr/test12-add-data-member-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt b/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
index 38d69388..c92f1f34 100644
--- a/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
+++ b/tests/data/test-diff-suppr/test12-add-data-member-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(S*)' has some indirect sub-type changes:
+  [C] 'function int foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
diff --git a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
index c70a653b..754409ca 100644
--- a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
+++ b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
       details were reported earlier
 
diff --git a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
index 0b59f208..46c078c0 100644
--- a/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
+++ b/tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S)' has some indirect sub-type changes:
+  [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
index 215e41b6..40b936fc 100644
--- a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
+++ b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
index 7d880737..f351bc58 100644
--- a/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
+++ b/tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void baz(S*)' has some indirect sub-type changes:
+  [C] 'function void baz(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 53e0a860..70ec5a75 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
index be4a923e..eb8df613 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 53e0a860..70ec5a75 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index 484d7fa1..e64a5b55 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
index 7f33158d..2c085a78 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index e903a1a2..80012c1e 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
index 1c0df326..fa1d882f 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
index 112dc702..2cb7afd9 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) variab
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
index 1c0df326..fa1d882f 100644
--- a/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
index 0eee865c..47fe3d83 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt
@@ -7,7 +7,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
index 41d859cd..f235ac30 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed (1 filtered out), 1 Changed, 0 Added variab
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
index 0eee865c..47fe3d83 100644
--- a/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
+++ b/tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt
@@ -7,7 +7,7 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
 
 1 Changed variable:
 
-  [C]'S* var0' was changed:
+  [C] 'S* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
index 5e65d5a3..0de2e7cf 100644
--- a/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(C&)' has some indirect sub-type changes:
+  [C] 'function void bar(C&)' has some indirect sub-type changes:
     parameter 1 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
index 3e7b00be..75274e00 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void __private_function(S*)' has some indirect sub-type changes:
+  [C] 'function void __private_function(S*)' has some indirect sub-type changes:
     Please note that the symbol of this function is function1@VERSION_1.0
      and it aliases symbols: __private_function@PRIVATE_1.0, function2@VERSION_1.0
     parameter 1 of type 'S*' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
index 3e7b00be..75274e00 100644
--- a/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
+++ b/tests/data/test-diff-suppr/test23-alias-filter-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void __private_function(S*)' has some indirect sub-type changes:
+  [C] 'function void __private_function(S*)' has some indirect sub-type changes:
     Please note that the symbol of this function is function1@VERSION_1.0
      and it aliases symbols: __private_function@PRIVATE_1.0, function2@VERSION_1.0
     parameter 1 of type 'S*' has sub-type changes:
diff --git a/tests/data/test-diff-suppr/test24-soname-report-1.txt b/tests/data/test-diff-suppr/test24-soname-report-1.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-1.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-10.txt b/tests/data/test-diff-suppr/test24-soname-report-10.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-10.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-10.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-12.txt b/tests/data/test-diff-suppr/test24-soname-report-12.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-12.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-12.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-14.txt b/tests/data/test-diff-suppr/test24-soname-report-14.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-14.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-14.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-16.txt b/tests/data/test-diff-suppr/test24-soname-report-16.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-16.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-16.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test24-soname-report-4.txt b/tests/data/test-diff-suppr/test24-soname-report-4.txt
index db82a93d..dabce854 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-4.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test25-typedef-report-0.txt b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
index 61c6748e..6d2ba155 100644
--- a/tests/data/test-diff-suppr/test25-typedef-report-0.txt
+++ b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(Type*)' has some indirect sub-type changes:
+  [C] 'function void bar(Type*)' has some indirect sub-type changes:
     parameter 1 of type 'Type*' has sub-type changes:
       in pointed to type 'typedef Type':
         underlying type 'struct PrivateType0' changed:
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 data member insertion:
             'char PrivateType0::m1', at offset 32 (in bits)
 
-  [C]'function void baz(TypePtr)' has some indirect sub-type changes:
+  [C] 'function void baz(TypePtr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef TypePtr' has sub-type changes:
       underlying type 'PrivateType1*' changed:
         in pointed to type 'struct PrivateType1':
diff --git a/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt b/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
index ec620dcf..a06d0413 100644
--- a/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(S*)' has some indirect sub-type changes:
+  [C] 'function void func0(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt b/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
index ec620dcf..a06d0413 100644
--- a/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(S*)' has some indirect sub-type changes:
+  [C] 'function void func0(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-3.txt b/tests/data/test-diff-suppr/test29-soname-report-3.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-3.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-6.txt b/tests/data/test-diff-suppr/test29-soname-report-6.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-6.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-6.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test29-soname-report-8.txt b/tests/data/test-diff-suppr/test29-soname-report-8.txt
index ec4ce084..609643aa 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-8.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-8.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
 
 1 Changed variable:
 
-  [C]'static S* S::sm0' was changed:
+  [C] 'static S* S::sm0' was changed:
     type of variable changed:
      in pointed to type 'struct S':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
index 799dc6fa..ebd3b6ea 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
index 5b36215a..93fa56e1 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 2 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
index e1229701..3cf04629 100644
--- a/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(S&, C&)' has some indirect sub-type changes:
+  [C] 'function void foo(S&, C&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index cf413ce3..be32d3f7 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -13,11 +13,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'method virtual int non_defined_class::virtual_func0()' at test30-priv-lib-v1.h:15:1 has some indirect sub-type changes:
+  [C] 'method virtual int non_defined_class::virtual_func0()' at test30-priv-lib-v1.h:15:1 has some indirect sub-type changes:
     the vtable offset of method virtual int non_defined_class::virtual_func0() changed from 3 to 4
       note that this is an ABI incompatible change to the vtable of class non_defined_class
 
-  [C]'function int public_function(S*)' at test30-pub-lib-v1.cc:22:1 has some indirect sub-type changes:
+  [C] 'function int public_function(S*)' at test30-pub-lib-v1.cc:22:1 has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
diff --git a/tests/data/test-diff-suppr/test31-report-1.txt b/tests/data/test-diff-suppr/test31-report-1.txt
index a2deb146..cad99541 100644
--- a/tests/data/test-diff-suppr/test31-report-1.txt
+++ b/tests/data/test-diff-suppr/test31-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void hidden::foo(hidden::S0&)' has some indirect sub-type changes:
+  [C] 'function void hidden::foo(hidden::S0&)' has some indirect sub-type changes:
     parameter 1 of type 'hidden::S0&' has sub-type changes:
       in referenced type 'struct hidden::S0':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-0.txt b/tests/data/test-diff-suppr/test32-report-0.txt
index 2eea3328..3dc192f6 100644
--- a/tests/data/test-diff-suppr/test32-report-0.txt
+++ b/tests/data/test-diff-suppr/test32-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void priv::foo()' has some indirect sub-type changes:
+  [C] 'function void priv::foo()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'int'
       type size changed from 0 to 32 (in bits)
 
-  [C]'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-1.txt b/tests/data/test-diff-suppr/test32-report-1.txt
index 7e260378..7b0fbd44 100644
--- a/tests/data/test-diff-suppr/test32-report-1.txt
+++ b/tests/data/test-diff-suppr/test32-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar()' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test33-report-0.txt b/tests/data/test-diff-suppr/test33-report-0.txt
index 2dc61e8f..5807f845 100644
--- a/tests/data/test-diff-suppr/test33-report-0.txt
+++ b/tests/data/test-diff-suppr/test33-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(to_keep&)' has some indirect sub-type changes:
+  [C] 'function void bar(to_keep&)' has some indirect sub-type changes:
     parameter 1 of type 'to_keep&' has sub-type changes:
       in referenced type 'class to_keep':
         type size changed from 8 to 32 (in bits)
diff --git a/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt b/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
index 21995e0c..06d04b98 100644
--- a/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
+++ b/tests/data/test-diff-suppr/test39-opaque-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(StructType*)' at test39-opaque-type-v1.c:20:1 has some indirect sub-type changes:
+  [C] 'function void bar(StructType*)' at test39-opaque-type-v1.c:20:1 has some indirect sub-type changes:
     parameter 1 of type 'StructType*' changed:
       in pointed to type 'typedef StructType' at test39-header-v1.h:2:1:
         typedef name changed from StructType to AnotherStructType at test39-header-v1.h:2:1
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
index 09642c52..3484c052 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
     parameter 1 of type 'public_type*' has sub-type changes:
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
index 1f2b6de8..e051f750 100644
--- a/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test4-local-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
+  [C] 'function void foo(public_type*, a_not_private_type*)' has some indirect sub-type changes:
     parameter 1 of type 'public_type*' has sub-type changes:
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
diff --git a/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt b/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
index 57399c5b..4b1681bc 100644
--- a/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
+++ b/tests/data/test-diff-suppr/test41-enumerator-changes-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(EnumType1)' at test41-enumerator-changes-v1.cc:24:1 has some indirect sub-type changes:
+  [C] 'function void bar(EnumType1)' at test41-enumerator-changes-v1.cc:24:1 has some indirect sub-type changes:
     parameter 1 of type 'enum EnumType1' has sub-type changes:
       type size hasn't changed
       1 enumerator insertion:
@@ -13,7 +13,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         'EnumType1::eenum_count' from value '3' to '4' at test41-enumerator-changes-v1.cc:10:1
 
 
-  [C]'function void foo(EnumType0)' at test41-enumerator-changes-v1.cc:20:1 has some indirect sub-type changes:
+  [C] 'function void foo(EnumType0)' at test41-enumerator-changes-v1.cc:20:1 has some indirect sub-type changes:
     parameter 1 of type 'enum EnumType0' has sub-type changes:
       type size hasn't changed
       1 enumerator insertion:
diff --git a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
index a73ca078..601d4f8d 100644
--- a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
+++ b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
+  [C] 'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
     parameter 1 of type 'struct type_to_keep' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
index a73ca078..601d4f8d 100644
--- a/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
+++ b/tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
+  [C] 'function void func0(type_to_keep)' at test42-negative-suppr-type-v1.cc:15:1 has some indirect sub-type changes:
     parameter 1 of type 'struct type_to_keep' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
index 381c583c..30b79879 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       details were reported earlier
 
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
index ff63af68..ca57bbbb 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S*)' has some indirect sub-type changes:
+  [C] 'function void bar(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
index 0ab88da3..072702c9 100644
--- a/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(int, S)' has some indirect sub-type changes:
+  [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
index d2a6de47..2c08c142 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' at test6-fn-suppr-v1.cc:48:1 has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' at test6-fn-suppr-v1.cc:48:1 has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1' at test6-fn-suppr-v1.cc:23:1:
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function int bar(S&)' at test6-fn-suppr-v1.cc:42:1 has some indirect sub-type changes:
+  [C] 'function int bar(S&)' at test6-fn-suppr-v1.cc:42:1 has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S' at test6-fn-suppr-v1.cc:14:1:
         type size changed from 32 to 64 (in bits)
@@ -21,7 +21,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' at test6-fn-suppr-v1.cc:52:1 has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' at test6-fn-suppr-v1.cc:52:1 has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2' at test6-fn-suppr-v1.cc:32:1:
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
index e0ffc2c0..32e1d239 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function int bar(S&)' has some indirect sub-type changes:
+  [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
@@ -21,7 +21,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
index 189cc34c..0a3c7b4d 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'function char bar(int, S2**)' has some indirect sub-type changes:
+  [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
       in pointed to type 'S2*':
         in pointed to type 'struct S2':
diff --git a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
index 5f27ff97..5633bed5 100644
--- a/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S1*)' has some indirect sub-type changes:
+  [C] 'function void bar(S1*)' has some indirect sub-type changes:
     parameter 0 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         size changed from 32 to 64 bits
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
          'int S1::m0' offset changed from 0 to 32
 
-  [C]'function int bar(S&)' has some indirect sub-type changes:
+  [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 0 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         size changed from 32 to 64 bits
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
index bff11e5f..7fd8502c 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
        1 data member change:
         'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
index b444010d..d4d86310 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-2.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
index b444010d..d4d86310 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-3.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-4.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
index 56076a39..af81d0a8 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-7.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
 
 1 Changed variable:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
index bff11e5f..7fd8502c 100644
--- a/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
+++ b/tests/data/test-diff-suppr/test7-var-suppr-report-8.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
 
 2 Changed variables:
 
-  [C]'S0* var0' was changed:
+  [C] 'S0* var0' was changed:
     type of variable changed:
      in pointed to type 'struct S0':
        type size changed from 32 to 64 (in bits)
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
        1 data member change:
         'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
-  [C]'S1* var1' was changed:
+  [C] 'S1* var1' was changed:
     type of variable changed:
      in pointed to type 'struct S1':
        type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt b/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
index 215e41b6..40b936fc 100644
--- a/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
diff --git a/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt b/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
index bb0cc78c..1582fffc 100644
--- a/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
+++ b/tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C]'function void bar(S&)' has some indirect sub-type changes:
+  [C] 'function void bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
           'char S::m1', at offset 32 (in bits)
 
-  [C]'function void foo(S*)' has some indirect sub-type changes:
+  [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
       pointed to type 'struct S' changed, as reported earlier
 
diff --git a/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt b/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
+++ b/tests/data/test-diff-suppr/test9-changed-parm-c-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt b/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
index 0ffd222a..89e0d179 100644
--- a/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
+++ b/tests/data/test-diff-suppr/test9-changed-parm-c-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C]'function int foo(int)' has some indirect sub-type changes:
+  [C] 'function int foo(int)' has some indirect sub-type changes:
     parameter 1 of type 'int' changed:
       type name changed from 'int' to 'char'
       type size changed from 32 to 8 (in bits)
