public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 0/1] do not qualify names in diff report
@ 2021-01-27 12:08 Giuliano Procida
  2021-01-27 12:08 ` [PATCH 1/1] abidiff: do not qualify member " Giuliano Procida
  0 siblings, 1 reply; 3+ messages in thread
From: Giuliano Procida @ 2021-01-27 12:08 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida, maennich

Hi.

This is a small change with a big impact on diffs. Our (Linux kernel,
C) users reported that the name qualifications were not adding
anything useful to the diff reports and the extra verbosity was
impacting readability. Matthias opened Bug 26012.

While we could strip out the qualification in post-processing, I think
this change may be useful to others but it does need some independent
scrutiny.

Regards.

Giuliano Procida (1):
  abidiff: do not qualify member names in diff report

 src/abg-reporter-priv.cc                      |  11 +-
 .../test0-fn-changed-report-0.txt             |   6 +-
 .../test0-fn-changed-report-2.txt             |   6 +-
 .../test5-fn-changed-report-0.txt             |   4 +-
 .../test5-fn-changed-report-1.txt             |   4 +-
 .../test6-var-changed-report-0.txt            |   4 +-
 .../test6-var-changed-report-1.txt            |   4 +-
 .../test7-fn-changed-report-0.txt             |   2 +-
 .../test7-fn-changed-report-1.txt             |   2 +-
 .../test7-fn-changed-report-2.txt             |   2 +-
 .../test8-fn-changed-report-0.txt             |   2 +-
 .../test9-fn-changed-report-0.txt             |   2 +-
 .../qualifier-typedef-array-report-1.txt      |  24 +-
 .../test-fun-param-report.txt                 |   2 +-
 .../test-headers-dir-report-2.txt             |   2 +-
 .../test-leaf-cxx-members-report.txt          |   4 +-
 .../test-leaf-peeling-report.txt              |   2 +-
 .../test-leaf-redundant-report.txt            |   2 +-
 .../test-member-size-report0.txt              |   8 +-
 .../test-member-size-report1.txt              |   6 +-
 .../test-net-change-report0.txt               |   2 +-
 .../test-abidiff/test-PR18791-report0.txt     |  28 +-
 .../test-abidiff/test-qual-type0-report.txt   |   2 +-
 .../data/test-abidiff/test-struct0-report.txt |   4 +-
 .../data/test-abidiff/test-struct1-report.txt |   8 +-
 .../PR25058-liblttng-ctl-report-1.txt         |  52 +-
 tests/data/test-diff-dwarf/test0-report.txt   |   4 +-
 tests/data/test-diff-dwarf/test1-report.txt   |   4 +-
 tests/data/test-diff-dwarf/test10-report.txt  |   4 +-
 tests/data/test-diff-dwarf/test11-report.txt  |   4 +-
 tests/data/test-diff-dwarf/test13-report.txt  |   6 +-
 .../test21-redundant-fn-report-0.txt          |   2 +-
 .../test27-local-base-diff-report.txt         |   4 +-
 tests/data/test-diff-dwarf/test3-report.txt   |   2 +-
 .../test32-fnptr-changes-report-0.txt         |   6 +-
 .../test33-fnref-changes-report-0.txt         |   6 +-
 .../test36-ppc64-aliases-report-0.txt         |   2 +-
 .../test-diff-dwarf/test37-union-report-0.txt |   2 +-
 .../test-diff-dwarf/test38-union-report-0.txt |   2 +-
 .../test-diff-dwarf/test39-union-report-0.txt |   4 +-
 tests/data/test-diff-dwarf/test4-report.txt   |   2 +-
 .../data/test-diff-dwarf/test40-report-0.txt  |  14 +-
 .../test44-anon-struct-union-report-0.txt     |   2 +-
 .../test45-anon-dm-change-report-0.txt        |   6 +-
 .../test-diff-dwarf/test46-rust-report-0.txt  |   2 +-
 tests/data/test-diff-dwarf/test5-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |   4 +-
 .../libtest45-basic-type-change-report-0.txt  |   6 +-
 .../test-PR26739-2-report-0.txt               |   2 +-
 tests/data/test-diff-filter/test0-report.txt  |   6 +-
 tests/data/test-diff-filter/test01-report.txt |   6 +-
 tests/data/test-diff-filter/test1-report.txt  |   4 +-
 tests/data/test-diff-filter/test10-report.txt |   2 +-
 tests/data/test-diff-filter/test11-report.txt |   2 +-
 tests/data/test-diff-filter/test13-report.txt |   2 +-
 .../data/test-diff-filter/test14-0-report.txt |   2 +-
 .../data/test-diff-filter/test14-1-report.txt |   2 +-
 .../data/test-diff-filter/test15-0-report.txt |   2 +-
 .../data/test-diff-filter/test15-1-report.txt |   2 +-
 .../data/test-diff-filter/test16-report-2.txt |   4 +-
 tests/data/test-diff-filter/test16-report.txt |   4 +-
 .../data/test-diff-filter/test17-0-report.txt |   4 +-
 .../data/test-diff-filter/test17-1-report.txt |   4 +-
 tests/data/test-diff-filter/test18-report.txt |   2 +-
 tests/data/test-diff-filter/test2-report.txt  |   8 +-
 .../test25-cyclic-type-report-0.txt           |   2 +-
 .../test25-cyclic-type-report-1.txt           |   4 +-
 ...st26-qualified-redundant-node-report-0.txt |   4 +-
 ...st26-qualified-redundant-node-report-1.txt |   6 +-
 ...t-and-filtered-children-nodes-report-0.txt |   2 +-
 ...t-and-filtered-children-nodes-report-1.txt |   4 +-
 ...t-and-filtered-children-nodes-report-2.txt |   8 +-
 ...t-and-filtered-children-nodes-report-0.txt |   2 +-
 ...t-and-filtered-children-nodes-report-1.txt |   2 +-
 ...st29-finer-redundancy-marking-report-0.txt |   4 +-
 tests/data/test-diff-filter/test3-report.txt  |   4 +-
 .../test30-pr18904-rvalueref-report0.txt      | 108 ++--
 .../test30-pr18904-rvalueref-report1.txt      | 108 ++--
 .../test30-pr18904-rvalueref-report2.txt      | 108 ++--
 .../test31-pr18535-libstdc++-report-0.txt     |  20 +-
 .../test31-pr18535-libstdc++-report-1.txt     |  20 +-
 .../test32-ppc64le-struct-change-report0.txt  |   2 +-
 .../test35-pr18754-no-added-syms-report-0.txt | 108 ++--
 .../data/test-diff-filter/test36-report-0.txt |   6 +-
 .../data/test-diff-filter/test37-report-0.txt |   6 +-
 .../test39/test39-report-0.txt                |   8 +-
 .../test42-leaf-report-output-0.txt           |   2 +-
 .../test44-anonymous-data-member-report-0.txt |   2 +-
 .../test44-anonymous-data-member-report-1.txt |   2 +-
 tests/data/test-diff-filter/test9-report.txt  |   2 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  12 +-
 .../PR24690/PR24690-report-0.txt              |  10 +-
 .../data/test-diff-pkg/dirpkg-1-report-1.txt  |   2 +-
 .../data/test-diff-pkg/dirpkg-3-report-1.txt  |   2 +-
 .../data/test-diff-pkg/dirpkg-3-report-2.txt  |   2 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |  12 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |  20 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |  24 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |  14 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 494 +++++++++---------
 .../symlink-dir-test1-report0.txt             |   2 +-
 .../data/test-diff-pkg/tarpkg-0-report-0.txt  |   2 +-
 .../data/test-diff-pkg/tarpkg-1-report-0.txt  |   2 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt |  96 ++--
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt |   6 +-
 .../libtest48-soname-abixml-report-1.txt      |   2 +-
 .../test0-type-suppr-report-0.txt             |   4 +-
 .../test0-type-suppr-report-3.txt             |   4 +-
 .../test0-type-suppr-report-5.txt             |   4 +-
 .../test0-type-suppr-report-7.txt             |   4 +-
 .../test1-typedef-suppr-report-0.txt          |   8 +-
 .../test1-typedef-suppr-report-2.txt          |   4 +-
 .../test11-add-data-member-report-0.txt       |   4 +-
 .../test12-add-data-member-report-0.txt       |   4 +-
 .../test12-add-data-member-report-2.txt       |   4 +-
 .../test13-suppr-through-pointer-report-0.txt |   2 +-
 .../test13-suppr-through-pointer-report-1.txt |   2 +-
 .../test14-suppr-non-redundant-report-0.txt   |   2 +-
 .../test14-suppr-non-redundant-report-1.txt   |   2 +-
 .../test15-suppr-added-fn-report-0.txt        |   2 +-
 .../test15-suppr-added-fn-report-1.txt        |   2 +-
 .../test15-suppr-added-fn-report-5.txt        |   2 +-
 .../test16-suppr-removed-fn-report-0.txt      |   2 +-
 .../test16-suppr-removed-fn-report-2.txt      |   2 +-
 .../test16-suppr-removed-fn-report-5.txt      |   2 +-
 .../test17-suppr-added-var-report-0.txt       |   2 +-
 .../test17-suppr-added-var-report-2.txt       |   2 +-
 .../test17-suppr-added-var-report-5.txt       |   2 +-
 .../test18-suppr-removed-var-report-0.txt     |   2 +-
 .../test18-suppr-removed-var-report-2.txt     |   2 +-
 .../test18-suppr-removed-var-report-5.txt     |   2 +-
 .../test2-struct-suppr-report-0.txt           |   4 +-
 .../test23-alias-filter-report-0.txt          |   4 +-
 .../test23-alias-filter-report-2.txt          |   4 +-
 .../test24-soname-report-1.txt                |   2 +-
 .../test24-soname-report-10.txt               |   2 +-
 .../test24-soname-report-12.txt               |   2 +-
 .../test24-soname-report-14.txt               |   2 +-
 .../test24-soname-report-16.txt               |   2 +-
 .../test24-soname-report-4.txt                |   2 +-
 .../test25-typedef-report-0.txt               |   4 +-
 .../test26-loc-suppr-report-0.txt             |   2 +-
 .../test26-loc-suppr-report-3.txt             |   2 +-
 .../test29-soname-report-3.txt                |   2 +-
 .../test29-soname-report-6.txt                |   2 +-
 .../test29-soname-report-8.txt                |   2 +-
 .../test3-struct-suppr-report-0.txt           |   8 +-
 .../test3-struct-suppr-report-1.txt           |   4 +-
 .../test3-struct-suppr-report-2.txt           |   4 +-
 .../data/test-diff-suppr/test30-report-0.txt  |   4 +-
 .../data/test-diff-suppr/test31-report-1.txt  |   2 +-
 .../data/test-diff-suppr/test33-report-0.txt  |   2 +-
 .../test-diff-suppr/test35-leaf-report-0.txt  |   2 +-
 .../test-diff-suppr/test36-leaf-report-0.txt  |   4 +-
 .../test4-local-suppr-report-0.txt            |   8 +-
 .../test4-local-suppr-report-1.txt            |   6 +-
 .../test42-negative-suppr-type-report-0.txt   |   2 +-
 .../test42-negative-suppr-type-report-1.txt   |   2 +-
 .../test46-PR25128-report-1.txt               |   2 +-
 .../test46-PR25128-report-2.txt               |   2 +-
 .../test47-non-reachable-types-report-1.txt   |   2 +-
 .../test47-non-reachable-types-report-2.txt   |   2 +-
 .../test47-non-reachable-types-report-4.txt   |   2 +-
 .../test47-non-reachable-types-report-7.txt   |   2 +-
 .../test5-fn-suppr-report-0.txt               |   4 +-
 .../test5-fn-suppr-report-1.txt               |   4 +-
 .../test5-fn-suppr-report-2.txt               |   4 +-
 .../test5-fn-suppr-report-3.txt               |   4 +-
 .../test5-fn-suppr-report-4.txt               |   4 +-
 .../test5-fn-suppr-report-5.txt               |   4 +-
 .../test6-fn-suppr-report-0-1.txt             |   6 +-
 .../test6-fn-suppr-report-0.txt               |   6 +-
 .../test6-fn-suppr-report-1.txt               |   4 +-
 .../test6-fn-suppr-report-2.txt               |   4 +-
 .../test6-fn-suppr-report-3.txt               |   4 +-
 .../test6-fn-suppr-report-4.txt               |   4 +-
 .../test7-var-suppr-report-0.txt              |   8 +-
 .../test7-var-suppr-report-1.txt              |   4 +-
 .../test7-var-suppr-report-2.txt              |   4 +-
 .../test7-var-suppr-report-3.txt              |   4 +-
 .../test7-var-suppr-report-4.txt              |   4 +-
 .../test7-var-suppr-report-7.txt              |   4 +-
 .../test7-var-suppr-report-8.txt              |   8 +-
 .../test8-redundant-fn-report-0.txt           |   2 +-
 .../test8-redundant-fn-report-1.txt           |   2 +-
 185 files changed, 927 insertions(+), 924 deletions(-)

-- 
2.30.0.280.ga3ce27912f-goog


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 1/1] abidiff: do not qualify member names in diff report
  2021-01-27 12:08 [PATCH 0/1] do not qualify names in diff report Giuliano Procida
@ 2021-01-27 12:08 ` Giuliano Procida
  2021-02-08 16:26   ` Dodji Seketeli
  0 siblings, 1 reply; 3+ messages in thread
From: Giuliano Procida @ 2021-01-27 12:08 UTC (permalink / raw)
  To: libabigail; +Cc: dodji, kernel-team, gprocida, maennich

Bug 26012 - abidiff: do not emit qualified name for data members

The enclosing struct (or union or class) is given by the surrounding
diff context. This change eliminates a lot of repetition in the diff
report.

	* src/abg-reporter-priv.cc (represent_data_member): Do not
	qualify member names. (represent): Do not qualify member names.
	* tests/data/test-abicompat/test0-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test0-fn-changed-report-2.txt: Refresh.
	* tests/data/test-abicompat/test5-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test5-fn-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test6-var-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test6-var-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-2.txt: Refresh.
	* tests/data/test-abicompat/test8-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test9-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-fun-param-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-leaf-peeling-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-leaf-redundant-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-member-size-report0.txt: Refresh.
	* tests/data/test-abidiff-exit/test-member-size-report1.txt: Refresh.
	* tests/data/test-abidiff-exit/test-net-change-report0.txt: Refresh.
	* tests/data/test-abidiff/test-PR18791-report0.txt: Refresh.
	* tests/data/test-abidiff/test-qual-type0-report.txt: Refresh.
	* tests/data/test-abidiff/test-struct0-report.txt: Refresh.
	* tests/data/test-abidiff/test-struct1-report.txt: Refresh.
	* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test0-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test1-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test10-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test11-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test13-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test27-local-base-diff-report.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test3-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test37-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test38-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test39-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test4-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test40-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test46-rust-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test5-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test8-report.txt: Refresh.
	* tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test-PR26739-2-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test0-report.txt: Refresh.
	* tests/data/test-diff-filter/test01-report.txt: Refresh.
	* tests/data/test-diff-filter/test1-report.txt: Refresh.
	* tests/data/test-diff-filter/test10-report.txt: Refresh.
	* tests/data/test-diff-filter/test11-report.txt: Refresh.
	* tests/data/test-diff-filter/test13-report.txt: Refresh.
	* tests/data/test-diff-filter/test14-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test14-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test15-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test15-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test16-report-2.txt: Refresh.
	* tests/data/test-diff-filter/test16-report.txt: Refresh.
	* tests/data/test-diff-filter/test17-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test17-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test18-report.txt: Refresh.
	* tests/data/test-diff-filter/test2-report.txt: Refresh.
	* tests/data/test-diff-filter/test25-cyclic-type-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test25-cyclic-type-report-1.txt: Refresh.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt:
	Refresh.
	* tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test3-report.txt: Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt:
	Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt:
	Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt:
	Refresh.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt:
	Refresh.
	* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test36-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test37-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test39/test39-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test42-leaf-report-output-0.txt: Refresh.
	* tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test9-report.txt: Refresh.
	* tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-1-report-1.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-3-report-1.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-3-report-2.txt: Refresh.
	* 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:
	Refresh.
	* tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt:
	Refresh.
	* 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:
	Refresh.
	* tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
	Refresh.
	* tests/data/test-diff-pkg/symlink-dir-test1-report0.txt: Refresh.
	* tests/data/test-diff-pkg/tarpkg-0-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/tarpkg-1-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-5.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-7.txt: Refresh.
	* tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test11-add-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test12-add-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test12-add-data-member-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test23-alias-filter-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test23-alias-filter-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-10.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-12.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-14.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-16.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test25-typedef-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-6.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-8.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test30-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test31-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test33-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test35-leaf-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test36-leaf-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test4-local-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test4-local-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test46-PR25128-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test46-PR25128-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt:
	Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-7.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-8.txt: Refresh.
	* tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt: Refresh.

Signed-off-by: Giuliano Procida <gprocida@google.com>
---
 src/abg-reporter-priv.cc                      |  11 +-
 .../test0-fn-changed-report-0.txt             |   6 +-
 .../test0-fn-changed-report-2.txt             |   6 +-
 .../test5-fn-changed-report-0.txt             |   4 +-
 .../test5-fn-changed-report-1.txt             |   4 +-
 .../test6-var-changed-report-0.txt            |   4 +-
 .../test6-var-changed-report-1.txt            |   4 +-
 .../test7-fn-changed-report-0.txt             |   2 +-
 .../test7-fn-changed-report-1.txt             |   2 +-
 .../test7-fn-changed-report-2.txt             |   2 +-
 .../test8-fn-changed-report-0.txt             |   2 +-
 .../test9-fn-changed-report-0.txt             |   2 +-
 .../qualifier-typedef-array-report-1.txt      |  24 +-
 .../test-fun-param-report.txt                 |   2 +-
 .../test-headers-dir-report-2.txt             |   2 +-
 .../test-leaf-cxx-members-report.txt          |   4 +-
 .../test-leaf-peeling-report.txt              |   2 +-
 .../test-leaf-redundant-report.txt            |   2 +-
 .../test-member-size-report0.txt              |   8 +-
 .../test-member-size-report1.txt              |   6 +-
 .../test-net-change-report0.txt               |   2 +-
 .../test-abidiff/test-PR18791-report0.txt     |  28 +-
 .../test-abidiff/test-qual-type0-report.txt   |   2 +-
 .../data/test-abidiff/test-struct0-report.txt |   4 +-
 .../data/test-abidiff/test-struct1-report.txt |   8 +-
 .../PR25058-liblttng-ctl-report-1.txt         |  52 +-
 tests/data/test-diff-dwarf/test0-report.txt   |   4 +-
 tests/data/test-diff-dwarf/test1-report.txt   |   4 +-
 tests/data/test-diff-dwarf/test10-report.txt  |   4 +-
 tests/data/test-diff-dwarf/test11-report.txt  |   4 +-
 tests/data/test-diff-dwarf/test13-report.txt  |   6 +-
 .../test21-redundant-fn-report-0.txt          |   2 +-
 .../test27-local-base-diff-report.txt         |   4 +-
 tests/data/test-diff-dwarf/test3-report.txt   |   2 +-
 .../test32-fnptr-changes-report-0.txt         |   6 +-
 .../test33-fnref-changes-report-0.txt         |   6 +-
 .../test36-ppc64-aliases-report-0.txt         |   2 +-
 .../test-diff-dwarf/test37-union-report-0.txt |   2 +-
 .../test-diff-dwarf/test38-union-report-0.txt |   2 +-
 .../test-diff-dwarf/test39-union-report-0.txt |   4 +-
 tests/data/test-diff-dwarf/test4-report.txt   |   2 +-
 .../data/test-diff-dwarf/test40-report-0.txt  |  14 +-
 .../test44-anon-struct-union-report-0.txt     |   2 +-
 .../test45-anon-dm-change-report-0.txt        |   6 +-
 .../test-diff-dwarf/test46-rust-report-0.txt  |   2 +-
 tests/data/test-diff-dwarf/test5-report.txt   |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt   |   4 +-
 .../libtest45-basic-type-change-report-0.txt  |   6 +-
 .../test-PR26739-2-report-0.txt               |   2 +-
 tests/data/test-diff-filter/test0-report.txt  |   6 +-
 tests/data/test-diff-filter/test01-report.txt |   6 +-
 tests/data/test-diff-filter/test1-report.txt  |   4 +-
 tests/data/test-diff-filter/test10-report.txt |   2 +-
 tests/data/test-diff-filter/test11-report.txt |   2 +-
 tests/data/test-diff-filter/test13-report.txt |   2 +-
 .../data/test-diff-filter/test14-0-report.txt |   2 +-
 .../data/test-diff-filter/test14-1-report.txt |   2 +-
 .../data/test-diff-filter/test15-0-report.txt |   2 +-
 .../data/test-diff-filter/test15-1-report.txt |   2 +-
 .../data/test-diff-filter/test16-report-2.txt |   4 +-
 tests/data/test-diff-filter/test16-report.txt |   4 +-
 .../data/test-diff-filter/test17-0-report.txt |   4 +-
 .../data/test-diff-filter/test17-1-report.txt |   4 +-
 tests/data/test-diff-filter/test18-report.txt |   2 +-
 tests/data/test-diff-filter/test2-report.txt  |   8 +-
 .../test25-cyclic-type-report-0.txt           |   2 +-
 .../test25-cyclic-type-report-1.txt           |   4 +-
 ...st26-qualified-redundant-node-report-0.txt |   4 +-
 ...st26-qualified-redundant-node-report-1.txt |   6 +-
 ...t-and-filtered-children-nodes-report-0.txt |   2 +-
 ...t-and-filtered-children-nodes-report-1.txt |   4 +-
 ...t-and-filtered-children-nodes-report-2.txt |   8 +-
 ...t-and-filtered-children-nodes-report-0.txt |   2 +-
 ...t-and-filtered-children-nodes-report-1.txt |   2 +-
 ...st29-finer-redundancy-marking-report-0.txt |   4 +-
 tests/data/test-diff-filter/test3-report.txt  |   4 +-
 .../test30-pr18904-rvalueref-report0.txt      | 108 ++--
 .../test30-pr18904-rvalueref-report1.txt      | 108 ++--
 .../test30-pr18904-rvalueref-report2.txt      | 108 ++--
 .../test31-pr18535-libstdc++-report-0.txt     |  20 +-
 .../test31-pr18535-libstdc++-report-1.txt     |  20 +-
 .../test32-ppc64le-struct-change-report0.txt  |   2 +-
 .../test35-pr18754-no-added-syms-report-0.txt | 108 ++--
 .../data/test-diff-filter/test36-report-0.txt |   6 +-
 .../data/test-diff-filter/test37-report-0.txt |   6 +-
 .../test39/test39-report-0.txt                |   8 +-
 .../test42-leaf-report-output-0.txt           |   2 +-
 .../test44-anonymous-data-member-report-0.txt |   2 +-
 .../test44-anonymous-data-member-report-1.txt |   2 +-
 tests/data/test-diff-filter/test9-report.txt  |   2 +-
 ...x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  12 +-
 .../PR24690/PR24690-report-0.txt              |  10 +-
 .../data/test-diff-pkg/dirpkg-1-report-1.txt  |   2 +-
 .../data/test-diff-pkg/dirpkg-3-report-1.txt  |   2 +-
 .../data/test-diff-pkg/dirpkg-3-report-2.txt  |   2 +-
 ...libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |  12 +-
 ...4--libcdio-0.94-2.fc26.x86_64-report.1.txt |  20 +-
 ...-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |  24 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt   |  14 +-
 ...l7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 494 +++++++++---------
 .../symlink-dir-test1-report0.txt             |   2 +-
 .../data/test-diff-pkg/tarpkg-0-report-0.txt  |   2 +-
 .../data/test-diff-pkg/tarpkg-1-report-0.txt  |   2 +-
 ...bb-4.3-3.20141204.fc23.x86_64-report-0.txt |  96 ++--
 ...bb-4.3-3.20141204.fc23.x86_64-report-1.txt |   6 +-
 .../libtest48-soname-abixml-report-1.txt      |   2 +-
 .../test0-type-suppr-report-0.txt             |   4 +-
 .../test0-type-suppr-report-3.txt             |   4 +-
 .../test0-type-suppr-report-5.txt             |   4 +-
 .../test0-type-suppr-report-7.txt             |   4 +-
 .../test1-typedef-suppr-report-0.txt          |   8 +-
 .../test1-typedef-suppr-report-2.txt          |   4 +-
 .../test11-add-data-member-report-0.txt       |   4 +-
 .../test12-add-data-member-report-0.txt       |   4 +-
 .../test12-add-data-member-report-2.txt       |   4 +-
 .../test13-suppr-through-pointer-report-0.txt |   2 +-
 .../test13-suppr-through-pointer-report-1.txt |   2 +-
 .../test14-suppr-non-redundant-report-0.txt   |   2 +-
 .../test14-suppr-non-redundant-report-1.txt   |   2 +-
 .../test15-suppr-added-fn-report-0.txt        |   2 +-
 .../test15-suppr-added-fn-report-1.txt        |   2 +-
 .../test15-suppr-added-fn-report-5.txt        |   2 +-
 .../test16-suppr-removed-fn-report-0.txt      |   2 +-
 .../test16-suppr-removed-fn-report-2.txt      |   2 +-
 .../test16-suppr-removed-fn-report-5.txt      |   2 +-
 .../test17-suppr-added-var-report-0.txt       |   2 +-
 .../test17-suppr-added-var-report-2.txt       |   2 +-
 .../test17-suppr-added-var-report-5.txt       |   2 +-
 .../test18-suppr-removed-var-report-0.txt     |   2 +-
 .../test18-suppr-removed-var-report-2.txt     |   2 +-
 .../test18-suppr-removed-var-report-5.txt     |   2 +-
 .../test2-struct-suppr-report-0.txt           |   4 +-
 .../test23-alias-filter-report-0.txt          |   4 +-
 .../test23-alias-filter-report-2.txt          |   4 +-
 .../test24-soname-report-1.txt                |   2 +-
 .../test24-soname-report-10.txt               |   2 +-
 .../test24-soname-report-12.txt               |   2 +-
 .../test24-soname-report-14.txt               |   2 +-
 .../test24-soname-report-16.txt               |   2 +-
 .../test24-soname-report-4.txt                |   2 +-
 .../test25-typedef-report-0.txt               |   4 +-
 .../test26-loc-suppr-report-0.txt             |   2 +-
 .../test26-loc-suppr-report-3.txt             |   2 +-
 .../test29-soname-report-3.txt                |   2 +-
 .../test29-soname-report-6.txt                |   2 +-
 .../test29-soname-report-8.txt                |   2 +-
 .../test3-struct-suppr-report-0.txt           |   8 +-
 .../test3-struct-suppr-report-1.txt           |   4 +-
 .../test3-struct-suppr-report-2.txt           |   4 +-
 .../data/test-diff-suppr/test30-report-0.txt  |   4 +-
 .../data/test-diff-suppr/test31-report-1.txt  |   2 +-
 .../data/test-diff-suppr/test33-report-0.txt  |   2 +-
 .../test-diff-suppr/test35-leaf-report-0.txt  |   2 +-
 .../test-diff-suppr/test36-leaf-report-0.txt  |   4 +-
 .../test4-local-suppr-report-0.txt            |   8 +-
 .../test4-local-suppr-report-1.txt            |   6 +-
 .../test42-negative-suppr-type-report-0.txt   |   2 +-
 .../test42-negative-suppr-type-report-1.txt   |   2 +-
 .../test46-PR25128-report-1.txt               |   2 +-
 .../test46-PR25128-report-2.txt               |   2 +-
 .../test47-non-reachable-types-report-1.txt   |   2 +-
 .../test47-non-reachable-types-report-2.txt   |   2 +-
 .../test47-non-reachable-types-report-4.txt   |   2 +-
 .../test47-non-reachable-types-report-7.txt   |   2 +-
 .../test5-fn-suppr-report-0.txt               |   4 +-
 .../test5-fn-suppr-report-1.txt               |   4 +-
 .../test5-fn-suppr-report-2.txt               |   4 +-
 .../test5-fn-suppr-report-3.txt               |   4 +-
 .../test5-fn-suppr-report-4.txt               |   4 +-
 .../test5-fn-suppr-report-5.txt               |   4 +-
 .../test6-fn-suppr-report-0-1.txt             |   6 +-
 .../test6-fn-suppr-report-0.txt               |   6 +-
 .../test6-fn-suppr-report-1.txt               |   4 +-
 .../test6-fn-suppr-report-2.txt               |   4 +-
 .../test6-fn-suppr-report-3.txt               |   4 +-
 .../test6-fn-suppr-report-4.txt               |   4 +-
 .../test7-var-suppr-report-0.txt              |   8 +-
 .../test7-var-suppr-report-1.txt              |   4 +-
 .../test7-var-suppr-report-2.txt              |   4 +-
 .../test7-var-suppr-report-3.txt              |   4 +-
 .../test7-var-suppr-report-4.txt              |   4 +-
 .../test7-var-suppr-report-7.txt              |   4 +-
 .../test7-var-suppr-report-8.txt              |   8 +-
 .../test8-redundant-fn-report-0.txt           |   2 +-
 .../test8-redundant-fn-report-1.txt           |   2 +-
 185 files changed, 927 insertions(+), 924 deletions(-)

diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 1a7f09df..bab6c99d 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -239,7 +239,7 @@ represent_data_member(var_decl_sptr d,
       || (!get_member_is_static(d) && !get_data_member_is_laid_out(d)))
     return;
 
-  out << indent << "'" << d->get_pretty_representation() << "'";
+  out << indent << "'" << d->get_pretty_representation(false, false) << "'";
   if (!get_member_is_static(d))
     {
       // Do not emit offset information for data member of a union
@@ -405,7 +405,8 @@ represent(const var_diff_sptr	&diff,
   const uint64_t n_size = get_var_size_in_bits(n);
   const uint64_t o_offset = get_data_member_offset(o);
   const uint64_t n_offset = get_data_member_offset(n);
-  const string o_pretty_representation = o->get_pretty_representation();
+  const string o_pretty_representation =
+    o->get_pretty_representation(false, false);
   // no n_pretty_representation here as it's only needed in a couple of places
   const bool show_size_offset_changes = ctxt->get_allowed_category()
 					& SIZE_OR_OFFSET_CHANGE_CATEGORY;
@@ -432,7 +433,8 @@ represent(const var_diff_sptr	&diff,
 
   if (is_strict_anonymous_data_member_change)
     {
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(false, false);
       const type_base_sptr o_type = o->get_type(), n_type = n->get_type();
       if (o_pretty_representation != n_pretty_representation)
 	{
@@ -472,7 +474,8 @@ represent(const var_diff_sptr	&diff,
       ABG_ASSERT(o_anon != n_anon);
       // So we are looking at a non-anonymous data member change from
       // or to an anonymous data member.
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(false, false);
       out << indent << (o_anon ? "anonymous " : "")
 	  << "data member " << o_pretty_representation;
       show_offset_or_size(" at offset", o_offset, *ctxt, out);
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 e81a8fdd..7e6286dc 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -9,13 +9,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [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)
         2 data member insertions:
-          'char libapp::S1::m1', at offset 32 (in bits)
-          'unsigned int libapp::S1::m2', at offset 64 (in bits)
+          'char m1', at offset 32 (in bits)
+          'unsigned int m2', at offset 64 (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 a9d2efd4..80b07e73 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -9,13 +9,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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
+          'char 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:
     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)
         2 data member insertions:
-          'char libapp::S1::m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:24:1
-          'unsigned int libapp::S1::m2', at offset 64 (in bits) at test0-fn-changed-libapp-v1.cc:25:1
+          'char m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:24:1
+          'unsigned int m2', at offset 64 (in bits) at test0-fn-changed-libapp-v1.cc:25:1
 
diff --git a/tests/data/test-abicompat/test5-fn-changed-report-0.txt b/tests/data/test-abicompat/test5-fn-changed-report-0.txt
index ccde357d..39742594 100644
--- a/tests/data/test-abicompat/test5-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test5-fn-changed-report-0.txt
@@ -6,14 +6,14 @@ have sub-types that are different from what application 'test5-fn-changed-app' e
       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)
+          'char m1', at offset 32 (in bits)
 
   function int foo(S1*):
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 64 to 32 (in bits)
         1 data member deletion:
-          'unsigned char S1::m1', at offset 32 (in bits)
+          'unsigned char m1', at offset 32 (in bits)
 
   method S0::S0():
     implicit parameter 0 of type 'S0*' has sub-type changes:
diff --git a/tests/data/test-abicompat/test5-fn-changed-report-1.txt b/tests/data/test-abicompat/test5-fn-changed-report-1.txt
index dbdcbe5e..635118ed 100644
--- a/tests/data/test-abicompat/test5-fn-changed-report-1.txt
+++ b/tests/data/test-abicompat/test5-fn-changed-report-1.txt
@@ -6,14 +6,14 @@ have sub-types that are different from what application 'test5-fn-changed-app' e
       in pointed to type 'struct S0' at test5-fn-changed-libapp-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::m1', at offset 32 (in bits) at test5-fn-changed-libapp-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test5-fn-changed-libapp-v1.h:4:1
 
   function int foo(S1*):
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1' at test5-fn-changed-libapp-v1.h:9:1:
         type size changed from 64 to 32 (in bits)
         1 data member deletion:
-          'unsigned char S1::m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
+          'unsigned char m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
 
   method S0::S0():
     implicit parameter 0 of type 'S0*' has sub-type changes:
diff --git a/tests/data/test-abicompat/test6-var-changed-report-0.txt b/tests/data/test-abicompat/test6-var-changed-report-0.txt
index f5077879..f40d2d1d 100644
--- a/tests/data/test-abicompat/test6-var-changed-report-0.txt
+++ b/tests/data/test-abicompat/test6-var-changed-report-0.txt
@@ -5,11 +5,11 @@ have sub-types that are different from what application 'test6-var-changed-app'
     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)
+        'char m1', at offset 32 (in bits)
 
   S1* foo:
     in pointed to type 'struct S1':
       type size changed from 64 to 32 (in bits)
       1 data member deletion:
-        'unsigned char S1::m1', at offset 32 (in bits)
+        'unsigned char m1', at offset 32 (in bits)
 
diff --git a/tests/data/test-abicompat/test6-var-changed-report-1.txt b/tests/data/test-abicompat/test6-var-changed-report-1.txt
index 5b78c83c..08b1c7e3 100644
--- a/tests/data/test-abicompat/test6-var-changed-report-1.txt
+++ b/tests/data/test-abicompat/test6-var-changed-report-1.txt
@@ -5,11 +5,11 @@ have sub-types that are different from what application 'test6-var-changed-app'
     in pointed to type 'struct S0' at test6-var-changed-libapp-v1.h:1:1:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S0::m1', at offset 32 (in bits) at test6-var-changed-libapp-v1.h:4:1
+        'char m1', at offset 32 (in bits) at test6-var-changed-libapp-v1.h:4:1
 
   S1* foo:
     in pointed to type 'struct S1' at test6-var-changed-libapp-v1.h:9:1:
       type size changed from 64 to 32 (in bits)
       1 data member deletion:
-        'unsigned char S1::m1', at offset 32 (in bits) at test6-var-changed-libapp-v0.h:11:1
+        'unsigned char m1', at offset 32 (in bits) at test6-var-changed-libapp-v0.h:11:1
 
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 a1c822ac..36952709 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits)
+          'float percentage', at offset 128 (in bits)
 
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-1.txt b/tests/data/test-abicompat/test7-fn-changed-report-1.txt
index 8fae210c..ffdffc98 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-1.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-1.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test7-fn-changed-app' e
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits)
+          'float percentage', at offset 128 (in bits)
 
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-2.txt b/tests/data/test-abicompat/test7-fn-changed-report-2.txt
index d5767e2a..0b1c6961 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-2.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test7-fn-changed-app' e
       in unqualified underlying type 'struct Student' at test7-fn-changed-libapp-v1.h:3:1:
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits) at test7-fn-changed-libapp-v1.h:7:1
+          'float percentage', at offset 128 (in bits) at test7-fn-changed-libapp-v1.h:7:1
 
diff --git a/tests/data/test-abicompat/test8-fn-changed-report-0.txt b/tests/data/test-abicompat/test8-fn-changed-report-0.txt
index f6e94643..b4bef3e5 100644
--- a/tests/data/test-abicompat/test8-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test8-fn-changed-report-0.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test8-fn-changed-app' e
       in pointed to type 'struct S' at test8-fn-changed-libapp-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test8-fn-changed-libapp-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test8-fn-changed-libapp-v1.h:4:1
 
diff --git a/tests/data/test-abicompat/test9-fn-changed-report-0.txt b/tests/data/test-abicompat/test9-fn-changed-report-0.txt
index 4b5a9f19..3a11ffca 100644
--- a/tests/data/test-abicompat/test9-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test9-fn-changed-report-0.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test9-fn-changed-app' e
       in referenced type 'struct S' at test9-fn-changed-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test9-fn-changed-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test9-fn-changed-v1.h:4:1
 
diff --git a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
index 0d73ae03..8105aa7f 100644
--- a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
+++ b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
@@ -8,21 +8,21 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at qualifier-typedef-array-v1.c:10:1:
         type size hasn't changed
         12 data member changes:
-          type of 'A S::c_a' changed:
+          type of 'A c_a' changed:
             entity changed from 'typedef A' to compatible type 'void* const[7]'
               array element type 'void*' changed:
                 entity changed from 'void*' to 'void* const'
                 type size hasn't changed
               type size hasn't changed
-          type of 'A S::v_a' changed:
+          type of 'A v_a' changed:
             entity changed from 'typedef A' to compatible type 'void* volatile[7]'
               array element type 'void*' changed:
                 entity changed from 'void*' to 'void* volatile'
                 type size hasn't changed
               type size hasn't changed
-          type of 'A S::r_a' changed:
+          type of 'A r_a' changed:
             entity changed from 'typedef A' to compatible type 'void*[7]'
-          type of 'B S::c_b' changed:
+          type of 'B c_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void* const[7]'
@@ -30,7 +30,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                   entity changed from 'void*' to 'void* const'
                   type size hasn't changed
                 type size hasn't changed
-          type of 'B S::v_b' changed:
+          type of 'B v_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void* volatile[7]'
@@ -38,41 +38,41 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                   entity changed from 'void*' to 'void* volatile'
                   type size hasn't changed
                 type size hasn't changed
-          type of 'B S::r_b' changed:
+          type of 'B r_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void*[7]'
-          type of 'C S::v_c' changed:
+          type of 'C v_c' changed:
             entity changed from 'typedef C' to compatible type 'const volatile void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'const volatile void* const'
               type name changed from 'void*[7]' to 'volatile void* const[7]'
               type size hasn't changed
-          type of 'C S::r_c' changed:
+          type of 'C r_c' changed:
             entity changed from 'typedef C' to compatible type 'restrict void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'restrict const void* const'
               type name changed from 'void*[7]' to 'restrict void* const[7]'
               type size hasn't changed
-          type of 'D S::v_d' changed:
+          type of 'D v_d' changed:
             entity changed from 'typedef D' to compatible type 'const volatile void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'const volatile void* const'
               type name changed from 'void*[7]' to 'volatile void* const[7]'
               type size hasn't changed
-          type of 'D S::r_d' changed:
+          type of 'D r_d' changed:
             entity changed from 'typedef D' to compatible type 'restrict void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'restrict const void* const'
               type name changed from 'void*[7]' to 'restrict void* const[7]'
               type size hasn't changed
-          type of 'E S::r_e' changed:
+          type of 'E r_e' changed:
             entity changed from 'typedef E' to compatible type 'restrict const volatile void* const[7]'
               array element type 'const volatile void* const' changed:
                 'const volatile void* const' changed to 'restrict const volatile volatile void* const'
               type name changed from 'volatile void* const[7]' to 'restrict volatile void* const[7]'
               type size hasn't changed
-          type of 'F S::r_f' changed:
+          type of 'F r_f' changed:
             entity changed from 'typedef F' to compatible type 'restrict const volatile void* const[7]'
               array element type 'const volatile void* const' changed:
                 'const volatile void* const' changed to 'restrict const volatile volatile void* const'
diff --git a/tests/data/test-abidiff-exit/test-fun-param-report.txt b/tests/data/test-abidiff-exit/test-fun-param-report.txt
index 295cce84..71f41b0e 100644
--- a/tests/data/test-abidiff-exit/test-fun-param-report.txt
+++ b/tests/data/test-abidiff-exit/test-fun-param-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct ops' at test-fun-param-v1.c:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'void (void*, unsigned int, unsigned long int)* ops::bind_class' changed:
+          type of 'void (void*, unsigned int, unsigned long int)* bind_class' changed:
             in pointed to type 'function type void (void*, unsigned int, unsigned long int)':
               parameter 4 of type 'void*' was added
               parameter 5 of type 'unsigned long int' was added
diff --git a/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt b/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
index 75d5a61f..ee3bd02b 100644
--- a/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
+++ b/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
@@ -9,5 +9,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct second_public_struct' at header-b-v1.h:5:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char second_public_struct::m2', at offset 32 (in bits) at header-b-v1.h:8:1
+            'char m2', at offset 32 (in bits) at header-b-v1.h:8:1
 
diff --git a/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt b/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
index 27fdc45c..b7a9022c 100644
--- a/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
@@ -32,9 +32,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
         type name changed from 'int' to 'long int'
         type size changed from 32 to 64 (in bits)
   1 data member deletion:
-    'int ops::deleted_var', at offset 96 (in bits) at test-leaf-cxx-members-v0.cc:5:1
+    'int deleted_var', at offset 96 (in bits) at test-leaf-cxx-members-v0.cc:5:1
   1 data member insertion:
-    'long int ops::added_var', at offset 128 (in bits) at test-leaf-cxx-members-v1.cc:10:1
+    'long int added_var', at offset 128 (in bits) at test-leaf-cxx-members-v1.cc:10:1
   there are data member changes:
     type 'int' of 'ops::changed_var' changed:
       type name changed from 'int' to 'long int'
diff --git a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
index 48f5df8e..7c51164b 100644
--- a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
@@ -19,7 +19,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops2 at test-leaf-peeling-v0.cc:10:1' changed:
   type size changed from 320 to 640 (in bits)
   there are data member changes:
-    'foo ops2::y[10]' size changed from 320 to 640 (in bits) (by +320 bits)
+    'foo y[10]' size changed from 320 to 640 (in bits) (by +320 bits)
 
 'struct ops3 at test-leaf-peeling-v0.cc:14:1' changed:
   type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt b/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
index 581fd28e..7bf63a85 100644
--- a/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
@@ -15,7 +15,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
       type name changed from 'sto2' to 'stn2'
       type size changed from 64 to 128 (in bits)
       1 data member insertion:
-        'double stn2::y', at offset 64 (in bits) at test-leaf-redundant-v1.c:9:1
+        'double y', at offset 64 (in bits) at test-leaf-redundant-v1.c:9:1
 
   [C] 'function void fn3(sto1*)' at test-leaf-redundant-v1.c:18:1 has some sub-type changes:
     parameter 1 of type 'sto1*' changed:
diff --git a/tests/data/test-abidiff-exit/test-member-size-report0.txt b/tests/data/test-abidiff-exit/test-member-size-report0.txt
index c82a5c3d..1c60dbc7 100644
--- a/tests/data/test-abidiff-exit/test-member-size-report0.txt
+++ b/tests/data/test-abidiff-exit/test-member-size-report0.txt
@@ -8,14 +8,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test-member-size-v1.cc:3:1:
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'int S::y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
+          'int y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
         no data member change (1 filtered);
     parameter 2 of type 'T*' has sub-type changes:
       in pointed to type 'struct T' at test-member-size-v1.cc:14:1:
         type size changed from 192 to 256 (in bits)
         2 data member changes:
-          'S T::s' size changed from 128 to 192 (in bits) (by +64 bits)
-          'int T::a' offset changed from 128 to 192 (in bits) (by +64 bits)
+          'S s' size changed from 128 to 192 (in bits) (by +64 bits)
+          'int a' offset changed from 128 to 192 (in bits) (by +64 bits)
 
   [C] 'function void reg2(U*)' at test-member-size-v1.cc:27:1 has some indirect sub-type changes:
     parameter 1 of type 'U*' has sub-type changes:
@@ -26,5 +26,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type size changed from 128 to 192 (in bits)
             1 data member change:
               'S s' size changed from 128 to 192 (in bits) (by +64 bits)
-          'int U::r' offset changed from 128 to 192 (in bits) (by +64 bits)
+          'int r' offset changed from 128 to 192 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-abidiff-exit/test-member-size-report1.txt b/tests/data/test-abidiff-exit/test-member-size-report1.txt
index 76506283..393733af 100644
--- a/tests/data/test-abidiff-exit/test-member-size-report1.txt
+++ b/tests/data/test-abidiff-exit/test-member-size-report1.txt
@@ -6,13 +6,13 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S at test-member-size-v0.cc:3:1' changed:
   type size changed from 128 to 192 (in bits)
   1 data member insertion:
-    'int S::y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
+    'int y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
 
 'struct T at test-member-size-v0.cc:13:1' changed:
   type size changed from 192 to 256 (in bits)
   there are data member changes:
     type 'struct S' of 'T::s' changed, as reported earlier
-    'int T::a' offset changed from 128 to 192 (in bits) (by +64 bits)
+    'int a' offset changed from 128 to 192 (in bits) (by +64 bits)
 
 'struct U at test-member-size-v0.cc:18:1' changed:
   type size changed from 192 to 256 (in bits)
@@ -21,4 +21,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
       type size changed from 128 to 192 (in bits)
       there are data member changes:
         type 'struct S' of 'U::__anonymous_struct__::s' changed, as reported earlier
-    'int U::r' offset changed from 128 to 192 (in bits) (by +64 bits)
+    'int r' offset changed from 128 to 192 (in bits) (by +64 bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report0.txt b/tests/data/test-abidiff-exit/test-net-change-report0.txt
index 66712b01..64ac3a83 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report0.txt
@@ -21,7 +21,7 @@ Variables changes summary: 1 Removed, 1 Changed, 1 Added variables
       in pointed to type 'struct type_changed':
         type size changed from 32 to 64 (in bits)
         1 data member change:
-          type of 'int type_changed::x' changed:
+          type of 'int x' changed:
             type name changed from 'int' to 'long int'
             type size changed from 32 to 64 (in bits)
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 44d986eb..6c236f92 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -16,11 +16,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::connection':
         type size hasn't changed
         1 data member change:
-          type of 'sigc::slot_base* sigc::connection::slot_' changed:
+          type of 'sigc::slot_base* slot_' changed:
             in pointed to type 'class sigc::slot_base':
               type size hasn't changed
               1 data member change:
-                type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+                type of 'sigc::slot_base::rep_type* rep_' changed:
                   in pointed to type 'typedef sigc::slot_base::rep_type':
                     underlying type 'struct sigc::internal::slot_rep' changed:
                       type size hasn't changed
@@ -28,11 +28,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                         'struct sigc::trackable' changed:
                           type size hasn't changed
                           1 data member change:
-                            type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                            type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
                               in pointed to type 'struct sigc::internal::trackable_callback_list':
                                 type size changed from 192 to 256 (in bits)
                                 2 data member changes:
-                                  type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                                  type of 'sigc::internal::trackable_callback_list::callback_list callbacks_' changed:
                                     underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
                                       type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                       type size changed from 128 to 192 (in bits)
@@ -41,23 +41,23 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                                           type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                           type size changed from 128 to 192 (in bits)
                                           1 data member change:
-                                            type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                            type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl _M_impl' changed:
                                               type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
                                               type size changed from 128 to 192 (in bits)
                                               1 data member change:
-                                                type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                                type of 'std::__detail::_List_node_base _M_node' changed:
                                                   type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
                                                   type size changed from 128 to 192 (in bits)
                                                   1 base class insertion:
                                                     struct std::__detail::_List_node_base
                                                   2 data member deletions:
-                                                    'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                                    'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                                    'std::__detail::_List_node_base* _M_next', at offset 0 (in bits)
+                                                    'std::__detail::_List_node_base* _M_prev', at offset 64 (in bits)
                                                   1 data member insertion:
-                                                    'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                                    'unsigned long int _M_data', at offset 128 (in bits)
                                                 and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
                                             and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
-                                  'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                                  'bool clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
   [C] 'method bool sigc::connection::blocked()' has some indirect sub-type changes:
     implicit parameter 0 of type 'const sigc::connection*' has sub-type changes:
@@ -122,7 +122,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::internal::signal_impl':
         type size changed from 192 to 256 (in bits)
         1 data member change:
-          type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+          type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > slots_' changed:
             type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
             type size changed from 128 to 192 (in bits)
             1 base class change:
@@ -130,11 +130,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                 type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
                 type size changed from 128 to 192 (in bits)
                 1 data member change:
-                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl _M_impl' changed:
                     type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
                     type size changed from 128 to 192 (in bits)
                     1 data member change:
-                      type of 'std::__detail::_List_node_base std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed, as reported earlier
+                      type of 'std::__detail::_List_node_base _M_node' changed, as reported earlier
                       and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
                   and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
 
@@ -221,7 +221,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct sigc::trackable' changed:
             details were reported earlier
         1 data member change:
-          type of 'sigc::internal::signal_impl* sigc::signal_base::impl_' changed:
+          type of 'sigc::internal::signal_impl* impl_' changed:
             pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
 
   [C] 'method bool sigc::signal_base::blocked()' has some indirect sub-type changes:
diff --git a/tests/data/test-abidiff/test-qual-type0-report.txt b/tests/data/test-abidiff/test-qual-type0-report.txt
index c91c06b9..cfa35fc3 100644
--- a/tests/data/test-abidiff/test-qual-type0-report.txt
+++ b/tests/data/test-abidiff/test-qual-type0-report.txt
@@ -2,7 +2,7 @@
   'class S0' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char S0::m1', at offset 32 (in bits)
+      'char m1', at offset 32 (in bits)
   'const S0' changed:
     unqualified underlying type 'class S0' changed, as reported earlier
   'const S0&' changed:
diff --git a/tests/data/test-abidiff/test-struct0-report.txt b/tests/data/test-abidiff/test-struct0-report.txt
index f34822c3..81831273 100644
--- a/tests/data/test-abidiff/test-struct0-report.txt
+++ b/tests/data/test-abidiff/test-struct0-report.txt
@@ -2,9 +2,9 @@
   'class s0' changed:
     type size changed from 64 to 96 (in bits)
     1 data member insertion:
-      'char s0::m2', at offset 64 (in bits)
+      'char m2', at offset 64 (in bits)
     1 data member change:
-      type of 'char s0::m1' changed:
+      type of 'char m1' changed:
         type name changed from 'char' to 'unsigned int'
         type size changed from 8 to 32 (in bits)
         type alignment changed from 8 to 32
diff --git a/tests/data/test-abidiff/test-struct1-report.txt b/tests/data/test-abidiff/test-struct1-report.txt
index d74f5200..ec7d5529 100644
--- a/tests/data/test-abidiff/test-struct1-report.txt
+++ b/tests/data/test-abidiff/test-struct1-report.txt
@@ -8,15 +8,15 @@
         parameter 1 of type 's0*' has sub-type changes:
           pointed to type 'class s0' changed, as being reported
     1 data member deletion:
-      'char s0::m1', at offset 96 (in bits)
+      'char m1', at offset 96 (in bits)
     1 data member insertion:
-      'double s0::m01', at offset 128 (in bits)
+      'double m01', at offset 128 (in bits)
     2 data member changes:
-      type of 'int s0::m0' changed:
+      type of 'int m0' changed:
         type name changed from 'int' to 'char'
         type size changed from 32 to 8 (in bits)
         type alignment changed from 32 to 8
-      'unsigned int s0::m2' offset changed from 128 to 192 (in bits) (by +64 bits)
+      'unsigned int m2' offset changed from 128 to 192 (in bits) (by +64 bits)
   'const s0' changed:
     unqualified underlying type 'class s0' changed, as reported earlier
   'const s0*' changed:
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 30185227..8039f516 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
@@ -90,7 +90,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_action':
         type size hasn't changed
         2 data member changes:
-          type of 'action_serialize_cb lttng_action::serialize' changed:
+          type of 'action_serialize_cb serialize' changed:
             underlying type 'typedef ssize_t (lttng_action*, char*)*' changed:
               in pointed to type 'function type typedef ssize_t (lttng_action*, char*)':
                 return type changed:
@@ -103,7 +103,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                   in pointed to type 'char':
                     entity changed from 'char' to 'struct lttng_dynamic_buffer'
                     type size changed from 8 to 192 (in bits)
-          type of 'action_destroy_cb lttng_action::destroy' changed:
+          type of 'action_destroy_cb destroy' changed:
             underlying type 'void (lttng_action*)*' changed:
               in pointed to type 'function type void (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
@@ -122,7 +122,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event_context':
         type size hasn't changed
         1 data member change:
-          type of 'lttng_event_context_type lttng_event_context::ctx' changed:
+          type of 'lttng_event_context_type ctx' changed:
             type size hasn't changed
             2 enumerator insertions:
               'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL' value '20'
@@ -134,19 +134,19 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in unqualified underlying type 'struct lttng_condition':
           type size hasn't changed
           5 data member changes:
-            type of 'lttng_condition_type lttng_condition::type' changed:
+            type of 'lttng_condition_type type' changed:
               type size hasn't changed
               3 enumerator insertions:
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE' value '100'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING' value '103'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
-            type of 'condition_validate_cb lttng_condition::validate' changed:
+            type of 'condition_validate_cb validate' changed:
               underlying type 'bool (const lttng_condition*)*' changed:
                 in pointed to type 'function type bool (const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
-            type of 'condition_serialize_cb lttng_condition::serialize' changed:
+            type of 'condition_serialize_cb serialize' changed:
               underlying type 'typedef ssize_t (const lttng_condition*, char*)*' changed:
                 in pointed to type 'function type typedef ssize_t (const lttng_condition*, char*)':
                   return type changed:
@@ -160,7 +160,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'char':
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
-            type of 'condition_equal_cb lttng_condition::equal' changed:
+            type of 'condition_equal_cb equal' changed:
               underlying type 'bool (const lttng_condition*, const lttng_condition*)*' changed:
                 in pointed to type 'function type bool (const lttng_condition*, const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
@@ -169,7 +169,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                   parameter 2 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
-            type of 'condition_destroy_cb lttng_condition::destroy' changed:
+            type of 'condition_destroy_cb destroy' changed:
               underlying type 'void (lttng_condition*)*' changed:
                 in pointed to type 'function type void (lttng_condition*)':
                   parameter 1 of type 'lttng_condition*' has sub-type changes:
@@ -239,7 +239,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event':
         type size hasn't changed
         1 data member change:
-          type of 'lttng_event_type lttng_event::type' changed:
+          type of 'lttng_event_type type' changed:
             type size hasn't changed
             1 enumerator insertion:
               'lttng_event_type::LTTNG_EVENT_USERSPACE_PROBE' value '6'
@@ -262,8 +262,8 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in unqualified underlying type 'struct lttng_evaluation':
           type size hasn't changed
           3 data member changes:
-            type of 'lttng_condition_type lttng_evaluation::type' changed, as reported earlier
-            type of 'evaluation_serialize_cb lttng_evaluation::serialize' changed:
+            type of 'lttng_condition_type type' changed, as reported earlier
+            type of 'evaluation_serialize_cb serialize' changed:
               underlying type 'typedef ssize_t (lttng_evaluation*, char*)*' changed:
                 in pointed to type 'function type typedef ssize_t (lttng_evaluation*, char*)':
                   return type changed:
@@ -278,7 +278,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'char':
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
-            type of 'evaluation_destroy_cb lttng_evaluation::destroy' changed:
+            type of 'evaluation_destroy_cb destroy' changed:
               underlying type 'void (lttng_evaluation*)*' changed:
                 in pointed to type 'function type void (lttng_evaluation*)':
                   parameter 1 of type 'lttng_evaluation*' has sub-type changes:
@@ -323,9 +323,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_session':
           type size changed from 35008 to 35072 (in bits)
           1 data member deletion:
-            'char lttng_session::padding[12]', at offset 34912 (in bits)
+            'char padding[12]', at offset 34912 (in bits)
           1 data member insertion:
-            'union {char padding[12]; void* ptr;} lttng_session::extended', at offset 34944 (in bits)
+            'union {char padding[12]; void* ptr;} extended', at offset 34944 (in bits)
 
   [C] 'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event**' has sub-type changes:
@@ -338,7 +338,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_event_field':
           type size hasn't changed
           1 data member change:
-            type of 'lttng_event lttng_event_field::event' changed, as reported earlier
+            type of 'lttng_event event' changed, as reported earlier
 
   [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:
@@ -355,11 +355,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_notification':
           type size changed from 192 to 128 (in bits)
           1 data member deletion:
-            'bool lttng_notification::owns_elements', at offset 128 (in bits)
+            'bool owns_elements', at offset 128 (in bits)
           2 data member changes:
-            type of 'lttng_condition* lttng_notification::condition' changed:
+            type of 'lttng_condition* condition' changed:
               pointed to type 'struct lttng_condition' changed, as reported earlier
-            type of 'lttng_evaluation* lttng_notification::evaluation' changed:
+            type of 'lttng_evaluation* evaluation' changed:
               pointed to type 'struct lttng_evaluation' changed, as reported earlier
 
   [C] 'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
@@ -399,9 +399,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_trigger':
         type size hasn't changed
         2 data member changes:
-          type of 'lttng_condition* lttng_trigger::condition' changed:
+          type of 'lttng_condition* condition' changed:
             pointed to type 'struct lttng_condition' changed, as reported earlier
-          type of 'lttng_action* lttng_trigger::action' changed:
+          type of 'lttng_action* action' changed:
             pointed to type 'struct lttng_action' changed, as reported earlier
 
   [C] 'function lttng_trigger* lttng_trigger_create(lttng_condition*, lttng_action*)' has some indirect sub-type changes:
@@ -437,16 +437,16 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct filter_parser_ctx':
         type size hasn't changed
         1 data member change:
-          type of 'filter_ast* filter_parser_ctx::ast' changed:
+          type of 'filter_ast* ast' changed:
             in pointed to type 'struct filter_ast':
               type size changed from 704 to 768 (in bits)
               2 data member changes:
-                type of 'filter_node filter_ast::root' changed:
+                type of 'filter_node root' changed:
                   type size changed from 576 to 640 (in bits)
                   2 data member changes:
-                    type of 'filter_node* filter_node::parent' changed:
+                    type of 'filter_node* parent' changed:
                       pointed to type 'struct filter_node' changed, as being reported
-                    type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} filter_node::u' changed:
+                    type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} u' changed:
                       type size changed from 320 to 384 (in bits)
                       4 data member changes:
                         type of 'struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression' changed:
@@ -509,7 +509,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                                 'unary_op_type::AST_UNARY_BIT_NOT' value '4'
                             type of 'filter_node* child' changed:
                               pointed to type 'struct filter_node' changed, as being reported
-                'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
+                'cds_list_head 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:
     return type changed:
@@ -517,7 +517,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         underlying type 'union YYSTYPE' changed:
           type size hasn't changed
           1 data member change:
-            type of 'filter_node* YYSTYPE::n' changed:
+            type of 'filter_node* n' changed:
               pointed to type 'struct filter_node' changed, as reported earlier
           type changed from:
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 508f216f..33cbaf59 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 64 (in bits)
+              'unsigned int m2', at offset 64 (in bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     'method void S0::member0() const' access changed from 'private' to 'public'
@@ -27,7 +27,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
   [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
diff --git a/tests/data/test-diff-dwarf/test1-report.txt b/tests/data/test-diff-dwarf/test1-report.txt
index 39f6072d..2397d86d 100644
--- a/tests/data/test-diff-dwarf/test1-report.txt
+++ b/tests/data/test-diff-dwarf/test1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
-          'unsigned int S::m01', at offset 32 (in bits)
+          'unsigned int m01', at offset 32 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 52786b54..a88febd3 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1152 to 1280 (in bits)
         2 data member changes:
-          type of 'int S::m0[5][3]' changed:
+          type of 'int m0[5][3]' changed:
             type name changed from 'int[5][3]' to 'int[5][4]'
             array type size changed from 480 to 640
             array type subrange 2 changed length from 3 to 4
-          type of 'int* S::m1[10]' changed:
+          type of 'int* m1[10]' changed:
             array element type 'int*' changed:
               in pointed to type 'int':
                 type name changed from 'int' to 'char'
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 2f9f25a4..59bec93f 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1248 to 1536 (in bits)
         2 data member changes:
-          type of 'int S::m0[5][3]' changed:
+          type of 'int m0[5][3]' changed:
             type name changed from 'int[5][3]' to 'int[6][3]'
             array type size changed from 480 to 576
             array type subrange 1 changed length from 5 to 6
-          type of 'int S::m1[6][4]' changed:
+          type of 'int m1[6][4]' changed:
             type name changed from 'int[6][4]' to 'int[6][5]'
             array type size changed from 768 to 960
             array type subrange 2 changed length from 4 to 5
diff --git a/tests/data/test-diff-dwarf/test13-report.txt b/tests/data/test-diff-dwarf/test13-report.txt
index d2148fe4..fd2a6e6c 100644
--- a/tests/data/test-diff-dwarf/test13-report.txt
+++ b/tests/data/test-diff-dwarf/test13-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 128 to 192 (in bits)
         3 data member changes:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
-          type of 'unsigned int S::m2' changed:
+          type of 'unsigned int m2' changed:
             type name changed from 'unsigned int' to 'long long int'
             type size changed from 32 to 64 (in bits)
-          'unsigned char S::m3' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'unsigned char m3' offset changed from 96 to 128 (in bits) (by +32 bits)
 
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 9b7599d0..21dec527 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
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 a2db4e9e..fd25ef46 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
@@ -18,5 +18,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct base' changed:
             details were reported earlier
         1 data member change:
-          'int S::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-dwarf/test3-report.txt b/tests/data/test-diff-dwarf/test3-report.txt
index b8166a7f..a9687868 100644
--- a/tests/data/test-diff-dwarf/test3-report.txt
+++ b/tests/data/test-diff-dwarf/test3-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct C0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C0::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
 
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 8c6c6f73..3238e4c9 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
@@ -30,14 +30,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
-        type of 'int ()* S::fnptr0' changed:
+        type of 'int ()* fnptr0' changed:
           in pointed to type 'function type int ()':
             parameter 1 of type 'double' was added
-        type of 'int ()* S::fnptr1' changed:
+        type of 'int ()* fnptr1' changed:
           in pointed to type 'function type int ()':
             entity changed from 'function type int ()' to 'void'
             type size changed from 64 to 0 (in bits)
-        type of 'int ()* S::fnptr2' changed:
+        type of 'int ()* fnptr2' changed:
           entity changed from 'int ()*' to 'int'
           type size changed from 64 to 32 (in bits)
 
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 2e886cf6..d16753c7 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
@@ -31,14 +31,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class S':
         type size hasn't changed
         3 data member changes:
-          type of 'int ()& S::fnref0' changed:
+          type of 'int ()& fnref0' changed:
             in referenced type 'function type int ()':
               parameter 1 of type 'double' was added
-          type of 'int ()& S::fnref1' changed:
+          type of 'int ()& fnref1' changed:
             in referenced type 'function type int ()':
               entity changed from 'function type int ()' to 'int*'
               type size hasn't changed
-          type of 'int ()& S::fnref2' changed:
+          type of 'int ()& fnref2' changed:
             in referenced type 'function type int ()':
               entity changed from 'function type int ()' to 'int'
               type size changed from 64 to 32 (in bits)
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 4f4a765f..84a8f1b9 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'int S::m1', at offset 32 (in bits)
+          'int m1', at offset 32 (in bits)
 
   [C] 'method S::S(int)' has some indirect sub-type changes:
     implicit parameter 0 of type 'S*' has sub-type changes:
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 33b0ac1a..e27b449d 100644
--- a/tests/data/test-diff-dwarf/test37-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test37-union-report-0.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'S some_union_type::m2'
+          'S m2'
 
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 fd9708e6..d812a31d 100644
--- a/tests/data/test-diff-dwarf/test38-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test38-union-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size hasn't changed
         1 data member deletion:
-          'int some_union_type::m0'
+          'int m0'
         type changed from:
           union some_union_type{int m0; char m1; S m2;}
         to:
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 560de2ae..c8d3c2ca 100644
--- a/tests/data/test-diff-dwarf/test39-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test39-union-report-0.txt
@@ -8,8 +8,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size changed from 64 to 96 (in bits)
         1 data member change:
-          type of 'S some_union_type::m2' changed:
+          type of 'S m2' changed:
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'char S::S_member2', at offset 64 (in bits)
+              'char S_member2', at offset 64 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test4-report.txt b/tests/data/test-diff-dwarf/test4-report.txt
index 78972227..6e71aeb6 100644
--- a/tests/data/test-diff-dwarf/test4-report.txt
+++ b/tests/data/test-diff-dwarf/test4-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
         1 data member change:
-          'int C0::m0' access changed from 'private' to 'public'
+          'int m0' access changed from 'private' to 'public'
 
diff --git a/tests/data/test-diff-dwarf/test40-report-0.txt b/tests/data/test-diff-dwarf/test40-report-0.txt
index 3f956d7a..f6105b4b 100644
--- a/tests/data/test-diff-dwarf/test40-report-0.txt
+++ b/tests/data/test-diff-dwarf/test40-report-0.txt
@@ -8,17 +8,17 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S2':
         type size changed from 96 to 64 (in bits)
         1 data member deletion:
-          'int S2::to_remove', at offset 0 (in bits)
+          'int to_remove', at offset 0 (in bits)
         2 data member changes:
-          '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)
+          'int m0' offset changed from 32 to 0 (in bits) (by -32 bits)
+          'char m1' offset changed from 64 to 32 (in bits) (by -32 bits)
 
   [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
         1 data member change:
-          type of 'int S3::to_change' changed:
+          type of 'int to_change' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
 
@@ -27,8 +27,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S1':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'long long int S1::inserted_member', at offset 0 (in bits)
+          'long long int inserted_member', at offset 0 (in bits)
         2 data member changes:
-          'int S1::m0' offset changed from 0 to 64 (in bits) (by +64 bits)
-          'char S1::m1' offset changed from 32 to 96 (in bits) (by +64 bits)
+          'int m0' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'char m1' offset changed from 32 to 96 (in bits) (by +64 bits)
 
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 5a8b4f15..df9fc29d 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S0':
         type size hasn't changed
         1 data member change:
-          type of 'union {int d; char c;} S0::m0' changed:
+          type of 'union {int d; char c;} m0' changed:
             entity changed from 'union {int d; char c;}' to 'int'
             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 ada9d3a7..f551acfb 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
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S1':
         type size changed from 96 to 64 (in bits)
         1 data member insertion:
-          'char S1::m01', at offset 32 (in bits)
+          'char m01', at offset 32 (in bits)
         2 data member changes:
-          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
+          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int m0'
           and size changed from 64 to 32 (in bits) (by -32 bits)
-          'char S1::m1' offset changed from 64 to 40 (in bits) (by -24 bits)
+          'char m1' offset changed from 64 to 40 (in bits) (by -24 bits)
 
   [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
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 0562456e..44aa21b8 100644
--- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt
+++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
@@ -9,7 +9,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       type name changed from 'one::Foo' to 'two::Foo'
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'u32 two::Foo::b', at offset 32 (in bits)
+        'u32 b', at offset 32 (in bits)
       1 data member change:
         name of 'one::Foo::a' changed to 'two::Foo::a'
     parameter 2 of type 'u32' was added
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index 6cf7522b..ba721004 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C0':
         type size hasn't changed
         1 data member change:
-          'int C0::m0' access changed from 'private' to 'public'
+          'int m0' access changed from 'private' to 'public'
 
   [C] 'function C0 foo()' has some indirect sub-type changes:
     return type changed:
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 26e0c103..0c54d2ba 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct B0':
         type size hasn't changed
         1 data member change:
-          'char B0::m0' access changed from 'public' to 'private'
+          'char m0' access changed from 'public' to 'private'
 
   [C] 'method S::S()' has some indirect sub-type changes:
     implicit parameter 0 of type 'S*' has sub-type changes:
@@ -24,7 +24,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           class B1
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
           and offset changed from 32 to 64 (in bits) (by +32 bits), access changed from 'public' to 'private'
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 1b3c7d92..947a51b6 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
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0' at test45-basic-type-change-v1.cc:8:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S0::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               type name changed from 'int' to 'char'
               type size changed from 32 to 8 (in bits)
@@ -26,7 +26,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S1' at test45-basic-type-change-v1.cc:13:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S1::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               type name changed from 'int' to 'char'
               type size changed from 32 to 8 (in bits)
@@ -38,7 +38,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S2' at test45-basic-type-change-v1.cc:18:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S2::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               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-PR26739-2-report-0.txt b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
index 88f2930b..a98473b4 100644
--- a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
+++ b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct A' at test-PR26739-2-v1.c:6:1:
         type size hasn't changed
         1 data member change:
-          type of 'const volatile const int A::m[5]' changed:
+          type of 'const volatile const int m[5]' changed:
             entity changed from 'const volatile const int[5]' to compatible type 'typedef array_type1' at test-PR26739-2-v1.c:3:1
               array element type 'const volatile const int' changed:
                 'const volatile const int' changed to 'const int'
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 76b1dd06..269c6b7e 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -14,9 +14,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 32 (in bits)
+              'unsigned int m2', at offset 32 (in bits)
             1 data member change:
-              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     implicit parameter 0 of type 'const S0* const' has sub-type changes:
@@ -28,5 +28,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits)
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index b0e2dcd1..3c59f891 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -14,9 +14,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 32 (in bits)
+              'unsigned int m2', at offset 32 (in bits)
             1 data member change:
-              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     'method void S0::member0() const' access changed from 'private' to 'public'
@@ -29,7 +29,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
   [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test1-report.txt b/tests/data/test-diff-filter/test1-report.txt
index 6fc96cbf..596417e6 100644
--- a/tests/data/test-diff-filter/test1-report.txt
+++ b/tests/data/test-diff-filter/test1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C1::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int C1::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index 3f4821f2..56bc999c 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct S':
           type size changed from 32 to 8 (in bits)
           1 data member deletion:
-            'unsigned int S::m', at offset 0 (in bits)
+            'unsigned int m', at offset 0 (in bits)
 
diff --git a/tests/data/test-diff-filter/test11-report.txt b/tests/data/test-diff-filter/test11-report.txt
index 5c5875b4..a664272a 100644
--- a/tests/data/test-diff-filter/test11-report.txt
+++ b/tests/data/test-diff-filter/test11-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
-          'unsigned int S0::m2', at offset 64 (in bits)
+          'unsigned int m2', at offset 64 (in bits)
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index edec8076..c31c7b40 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           class B1
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
           and offset changed from 32 to 64 (in bits) (by +32 bits)
diff --git a/tests/data/test-diff-filter/test14-0-report.txt b/tests/data/test-diff-filter/test14-0-report.txt
index bbc05f06..458c7bb4 100644
--- a/tests/data/test-diff-filter/test14-0-report.txt
+++ b/tests/data/test-diff-filter/test14-0-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'unsigned int m2', at offset 64 (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 101722b4..1b4bfbda 100644
--- a/tests/data/test-diff-filter/test14-1-report.txt
+++ b/tests/data/test-diff-filter/test14-1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'unsigned int m2', at offset 64 (in bits)
 
   [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test15-0-report.txt b/tests/data/test-diff-filter/test15-0-report.txt
index 3c644e51..ae7488e8 100644
--- a/tests/data/test-diff-filter/test15-0-report.txt
+++ b/tests/data/test-diff-filter/test15-0-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       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)
+          'unsigned int m2', at offset 64 (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 25d2ac42..5279f052 100644
--- a/tests/data/test-diff-filter/test15-1-report.txt
+++ b/tests/data/test-diff-filter/test15-1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       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)
+          'unsigned int m2', at offset 64 (in bits)
 
   [C] 'S* var2' was changed:
     type of variable changed:
diff --git a/tests/data/test-diff-filter/test16-report-2.txt b/tests/data/test-diff-filter/test16-report-2.txt
index f69eabdc..9cee7363 100644
--- a/tests/data/test-diff-filter/test16-report-2.txt
+++ b/tests/data/test-diff-filter/test16-report-2.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
           and offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test16-report.txt b/tests/data/test-diff-filter/test16-report.txt
index e195097f..861e3968 100644
--- a/tests/data/test-diff-filter/test16-report.txt
+++ b/tests/data/test-diff-filter/test16-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test17-0-report.txt b/tests/data/test-diff-filter/test17-0-report.txt
index 20036821..e1ecd47c 100644
--- a/tests/data/test-diff-filter/test17-0-report.txt
+++ b/tests/data/test-diff-filter/test17-0-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test17-1-report.txt b/tests/data/test-diff-filter/test17-1-report.txt
index 0b39c5d4..f43663c4 100644
--- a/tests/data/test-diff-filter/test17-1-report.txt
+++ b/tests/data/test-diff-filter/test17-1-report.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
           and offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test18-report.txt b/tests/data/test-diff-filter/test18-report.txt
index a2a10964..0f315b4e 100644
--- a/tests/data/test-diff-filter/test18-report.txt
+++ b/tests/data/test-diff-filter/test18-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             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 1755df61..afca6b65 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -12,15 +12,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C1':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
-          'int C1::m1', at offset 32 (in bits)
+          'int m1', at offset 32 (in bits)
 
   [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)
         1 data member insertion:
-          'char C0::m2', at offset 0 (in bits)
+          'char m2', at offset 0 (in bits)
         2 data member changes:
-          'E0 C0::m0' offset changed from 0 to 8 (in bits) (by +8 bits)
-          'E1 C0::m1' offset changed from 8 to 16 (in bits) (by +8 bits)
+          'E0 m0' offset changed from 0 to 8 (in bits) (by +8 bits)
+          'E1 m1' offset changed from 8 to 16 (in bits) (by +8 bits)
 
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 4c9d2606..165a1f9b 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
         no data member change (1 filtered);
 
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 0215d892..7d1a6373 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
@@ -8,8 +8,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
 
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 77725e8c..2c64c39f 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
@@ -11,9 +11,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               1 data member changes (1 filtered):
-                type of 'FooStruct::Embedded* S::m1' changed:
+                type of 'FooStruct::Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
-                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
+                      'char m1', at offset 32 (in bits)
 
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 23083ada..9af85bdc 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
@@ -11,12 +11,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               2 data member changes:
-                type of 'FooStruct::Embedded* S::m1' changed:
+                type of 'FooStruct::Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
-                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
-                type of 'FooStruct::Embedded** S::m2' changed:
+                      'char m1', at offset 32 (in bits)
+                type of 'FooStruct::Embedded** m2' changed:
                   in pointed to type 'FooStruct::Embedded*':
                     pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
 
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 45548733..e40324be 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 14f0813c..a9a9187f 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
@@ -8,13 +8,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [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
         1 data member changes (2 filtered):
-          type of 'S0* S::m0' changed:
+          type of 'S0* m0' changed:
             pointed to type 'struct S0' changed, as reported earlier
 
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 7703ecf1..bef3d75f 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
     parameter 1 of type 'S1*' changed:
       in pointed to type 'struct S1':
         entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
@@ -21,12 +21,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         3 data member changes:
-          type of 'S0* S::m0' changed:
+          type of 'S0* m0' changed:
             pointed to type 'struct S0' changed, as reported earlier
-          type of 'S1* S::m1' changed:
+          type of 'S1* m1' changed:
             in pointed to type 'struct S1':
               entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
-          type of 'S2* S::m2' changed:
+          type of 'S2* m2' changed:
             in pointed to type 'struct S2':
               entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
 
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 cd0c04ba..cd5a7fcd 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 e7de99be..f0127c65 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(s&)' has some indirect sub-type changes:
     parameter 1 of type 's&' has sub-type changes:
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 dd8b6b01..ba8629e7 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void baz(base)' has some indirect sub-type changes:
     parameter 1 of type 'struct base' has sub-type changes:
@@ -22,5 +22,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct base' changed:
             details were reported earlier
         1 data member change:
-          'int inherited::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test3-report.txt b/tests/data/test-diff-filter/test3-report.txt
index e7ce5bb5..963688f3 100644
--- a/tests/data/test-diff-filter/test3-report.txt
+++ b/tests/data/test-diff-filter/test3-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'char S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'char m1' offset changed from 0 to 32 (in bits) (by +32 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 2b66ef26..8a8eb518 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine':
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+            'mutex_t m_ptr_lock', at offset 1344 (in bits)
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-            'int Engine::m_num_cores', at offset 3776 (in bits)
-            'int Engine::m_num_threads', at offset 3808 (in bits)
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits)
+            'StreamMap m_stream_map', at offset 3072 (in bits)
+            'mutex_t m_stream_lock', at offset 3456 (in bits)
+            'int m_num_cores', at offset 3776 (in bits)
+            'int m_num_threads', at offset 3808 (in bits)
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits)
+            'DynLibList m_dyn_libs', at offset 4864 (in bits)
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                  'mutex_t m_ptr_lock', at offset 384 (in bits)
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> >
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> >
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits)
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor':
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits)
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits)
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits)
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits)
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits)
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits)
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits)
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
+            'bool m_wait_all_devices', at offset 320 (in bits)
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits)
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits)
+            '_Offload_stream m_stream', at offset 1984 (in bits)
+            'bool m_initial_need_runfunction', at offset 2248 (in bits)
+            'bool m_out_with_preallocated', at offset 2256 (in bits)
+            'bool m_preallocated_alloc', at offset 2264 (in bits)
+            'bool m_traceback_called', at offset 2272 (in bits)
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc':
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra':
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                  'void* alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits)
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges':
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                        'Arr_Desc* arr_desc', at offset 0 (in bits)
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
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 67345abd..08cffbaf 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine' at offload_engine.h:395:1:
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
+            'mutex_t m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
-            'int Engine::m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
-            'int Engine::m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
+            'StreamMap m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
+            'mutex_t m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
+            'int m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
+            'int m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
+            'DynLibList m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
+                  'mutex_t m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits) at offload_host.h:288:1
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits) at offload_host.h:326:1
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits) at offload_host.h:329:1
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits) at offload_host.h:332:1
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits) at offload_host.h:347:1
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits) at offload_host.h:352:1
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits) at offload_host.h:357:1
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits) at offload_host.h:360:1
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits) at offload_host.h:362:1
+            'bool m_wait_all_devices', at offset 320 (in bits) at offload_host.h:288:1
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits) at offload_host.h:326:1
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits) at offload_host.h:329:1
+            '_Offload_stream m_stream', at offset 1984 (in bits) at offload_host.h:332:1
+            'bool m_initial_need_runfunction', at offset 2248 (in bits) at offload_host.h:347:1
+            'bool m_out_with_preallocated', at offset 2256 (in bits) at offload_host.h:352:1
+            'bool m_preallocated_alloc', at offset 2264 (in bits) at offload_host.h:357:1
+            'bool m_traceback_called', at offset 2272 (in bits) at offload_host.h:360:1
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits) at offload_host.h:362:1
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc' at offload_common.h:254:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits) at offload_host.h:222:1
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
+                  'void* alloc', at offset 320 (in bits) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits) at cean_util.h:59:1
+                        'Arr_Desc* arr_desc', at offset 0 (in bits) at cean_util.h:59:1
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.cpp:409:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
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 47bb77ac..06aa3574 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine' at offload_engine.h:395:1:
           type size changed from 0x158 to 0x2b0 (in bytes)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
+            'mutex_t m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
-            'StreamMap Engine::m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
-            'mutex_t Engine::m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
-            'int Engine::m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
-            'int Engine::m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
-            'std::bitset<1024ul> Engine::m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
-            'DynLibList Engine::m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
+            'PtrDataTable m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
+            'StreamMap m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
+            'mutex_t m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
+            'int m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
+            'int m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
+            'std::bitset<1024ul> m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
+            'DynLibList m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 0x30 to 0x58 (in bytes)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
+                  'mutex_t m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                              'std::_Rb_tree_node_base _M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 0x1 to 0x30 (in bytes)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
+                                  'std::_Rb_tree_node_base _M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
-            'mutex_t Engine::m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
+            'mutex_t m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 0x180 to 0x1c0
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
           type size changed from 0x118 to 0x128 (in bytes)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 0x28 (in bytes) at offload_host.h:288:1
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 0xe4 (in bytes) at offload_host.h:326:1
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 0xf4 (in bytes) at offload_host.h:329:1
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 0xf8 (in bytes) at offload_host.h:332:1
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 0x119 (in bytes) at offload_host.h:347:1
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 0x11a (in bytes) at offload_host.h:352:1
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 0x11b (in bytes) at offload_host.h:357:1
-            'bool OffloadDescriptor::m_traceback_called', at offset 0x11c (in bytes) at offload_host.h:360:1
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 0x120 (in bytes) at offload_host.h:362:1
+            'bool m_wait_all_devices', at offset 0x28 (in bytes) at offload_host.h:288:1
+            'uint32_t m_in_deps_allocated', at offset 0xe4 (in bytes) at offload_host.h:326:1
+            'uint32_t m_out_deps_allocated', at offset 0xf4 (in bytes) at offload_host.h:329:1
+            '_Offload_stream m_stream', at offset 0xf8 (in bytes) at offload_host.h:332:1
+            'bool m_initial_need_runfunction', at offset 0x119 (in bytes) at offload_host.h:347:1
+            'bool m_out_with_preallocated', at offset 0x11a (in bytes) at offload_host.h:352:1
+            'bool m_preallocated_alloc', at offset 0x11b (in bytes) at offload_host.h:357:1
+            'bool m_traceback_called', at offset 0x11c (in bytes) at offload_host.h:360:1
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 0x120 (in bytes) at offload_host.h:362:1
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
+            'const bool m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc' at offload_common.h:254:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
                 type size changed from 0x48 to 0x50 (in bytes)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
+                  'void* alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
                       type size changed from 0x40 to 0x48 (in bytes)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
+                        'Arr_Desc* arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
+                        'void* ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
+                        'int64_t current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
+                        'int64_t range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
+                        'int64_t range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
+                        'int last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
+                        'int64_t init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                        'CeanReadDim Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
                   and offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
+                  'bool is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
+            'OffloadHostTimerData* m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
+            'uint64_t m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
+            'uint64_t m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
+            'bool m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.cpp:409:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
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 10677fcc..4338192b 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
@@ -32,14 +32,14 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits)
+          'void (void*)* __padding', at offset 32 (in bits)
         6 data member changes:
-          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__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)
+          'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'method virtual std::__future_base::_Async_state_common::~_Async_state_common(int)' has some indirect sub-type changes:
     implicit parameter 0 of type 'std::__future_base::_Async_state_common*' has sub-type changes:
@@ -54,13 +54,13 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
                   entity changed from 'std::__future_base::_State_base*' to 'void'
                   type size changed from 32 to 0 (in bits)
             1 data member changes (1 filtered):
-              type of 'std::__future_base::_State_base::_Ptr_type std::__future_base::_State_base::_M_result' changed:
+              type of 'std::__future_base::_State_base::_Ptr_type _M_result' changed:
                 underlying type 'typedef std::__future_base::_Ptr' changed:
                   underlying type 'class std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' changed:
                     type name changed from 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' to 'std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>'
                     type size hasn't changed
                     1 data member change:
-                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::_M_t' changed:
+                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type _M_t' changed:
                         typedef name changed from std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type to std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>::__tuple_type
                         underlying type 'class std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' changed:
                           type name changed from 'std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' to 'std::tuple<std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter>'
@@ -85,7 +85,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
           type size hasn't changed
           no member function changes (14 filtered);
           1 data member change:
-            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_M_codecvt' changed:
+            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* _M_codecvt' changed:
               in pointed to type 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                 in unqualified underlying type 'typedef std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                   underlying type 'class std::codecvt<wchar_t, char, __mbstate_t>' changed:
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 84667bec..15945ca8 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
@@ -32,14 +32,14 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits) at unwind-cxx.h:120:1
+          'void (void*)* __padding', at offset 32 (in bits) at unwind-cxx.h:120:1
         6 data member changes:
-          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__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)
+          'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'method virtual std::__future_base::_Async_state_common::~_Async_state_common(int)' at compatibility-thread-c++0x.cc:117:1 has some indirect sub-type changes:
     implicit parameter 0 of type 'std::__future_base::_Async_state_common*' has sub-type changes:
@@ -54,13 +54,13 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
                   entity changed from 'std::__future_base::_State_base*' to 'void'
                   type size changed from 32 to 0 (in bits)
             1 data member changes (1 filtered):
-              type of 'std::__future_base::_State_base::_Ptr_type std::__future_base::_State_base::_M_result' changed:
+              type of 'std::__future_base::_State_base::_Ptr_type _M_result' changed:
                 underlying type 'typedef std::__future_base::_Ptr' at future:253:1 changed:
                   underlying type 'class std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' at unique_ptr.h:109:1 changed:
                     type name changed from 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' to 'std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>'
                     type size hasn't changed
                     1 data member change:
-                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::_M_t' changed:
+                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type _M_t' changed:
                         typedef name changed from std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type to std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>::__tuple_type at unique_ptr.h:146:1
                         underlying type 'class std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' at tuple:521:1 changed:
                           type name changed from 'std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' to 'std::tuple<std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter>'
@@ -85,7 +85,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
           type size hasn't changed
           no member function changes (14 filtered);
           1 data member change:
-            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_M_codecvt' changed:
+            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* _M_codecvt' changed:
               in pointed to type 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                 in unqualified underlying type 'typedef std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type' at fstream:86:1:
                   underlying type 'class std::codecvt<wchar_t, char, __mbstate_t>' at codecvt.h:398:1 changed:
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 6172cccf..30085392 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 fefee3a9..60883808 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
@@ -96,40 +96,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine':
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+            'mutex_t m_ptr_lock', at offset 1344 (in bits)
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-            'int Engine::m_num_cores', at offset 3776 (in bits)
-            'int Engine::m_num_threads', at offset 3808 (in bits)
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits)
+            'StreamMap m_stream_map', at offset 3072 (in bits)
+            'mutex_t m_stream_lock', at offset 3456 (in bits)
+            'int m_num_cores', at offset 3776 (in bits)
+            'int m_num_threads', at offset 3808 (in bits)
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits)
+            'DynLibList m_dyn_libs', at offset 4864 (in bits)
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                  'mutex_t m_ptr_lock', at offset 384 (in bits)
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> >
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -137,15 +137,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> >
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits)
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -157,23 +157,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor':
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits)
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits)
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits)
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits)
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits)
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits)
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits)
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
+            'bool m_wait_all_devices', at offset 320 (in bits)
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits)
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits)
+            '_Offload_stream m_stream', at offset 1984 (in bits)
+            'bool m_initial_need_runfunction', at offset 2248 (in bits)
+            'bool m_out_with_preallocated', at offset 2256 (in bits)
+            'bool m_preallocated_alloc', at offset 2264 (in bits)
+            'bool m_traceback_called', at offset 2272 (in bits)
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc':
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -181,34 +181,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra':
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                  'void* alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits)
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges':
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                        'Arr_Desc* arr_desc', at offset 0 (in bits)
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -337,7 +337,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
diff --git a/tests/data/test-diff-filter/test36-report-0.txt b/tests/data/test-diff-filter/test36-report-0.txt
index 12916d66..86a7f3e8 100644
--- a/tests/data/test-diff-filter/test36-report-0.txt
+++ b/tests/data/test-diff-filter/test36-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-1-v1.c:6:1:
         type size hasn't changed
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
 
@@ -17,10 +17,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-2-v1.c:6:1:
         type size hasn't changed
         2 data member changes:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
-          type of 'int S::m1' changed:
+          type of 'int m1' changed:
             type name changed from 'int' to 'unsigned int'
             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 582a7b3a..dc4483fb 100644
--- a/tests/data/test-diff-filter/test37-report-0.txt
+++ b/tests/data/test-diff-filter/test37-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct A' at test37-v1.cc:3:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int A::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
 
@@ -17,7 +17,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct B' at test37-v1.cc:8:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int B::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
 
@@ -26,7 +26,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct C' at test37-v1.cc:13:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int C::m0' changed:
+          type of 'int m0' 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/test39/test39-report-0.txt b/tests/data/test-diff-filter/test39/test39-report-0.txt
index d7f3e24d..dd030b3a 100644
--- a/tests/data/test-diff-filter/test39/test39-report-0.txt
+++ b/tests/data/test-diff-filter/test39/test39-report-0.txt
@@ -8,20 +8,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
         1 data member change:
-          type of 'opaque_type* container_type::s' changed:
+          type of 'opaque_type* s' changed:
             in pointed to type 'struct opaque_type' at test39-b-v1.c:3:1:
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
+                'char 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:
     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
         1 data member change:
-          type of 'opaque_type* container_type::s' changed:
+          type of 'opaque_type* s' changed:
             in pointed to type 'struct opaque_type' at test39-c-v1.c:3:1:
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'unsigned char opaque_type::m1', at offset 32 (in bits) at test39-c-v1.c:6:1
+                'unsigned char m1', at offset 32 (in bits) at test39-c-v1.c:6:1
 
diff --git a/tests/data/test-diff-filter/test42-leaf-report-output-0.txt b/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
index d40a1374..8cfc21dd 100644
--- a/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
+++ b/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
@@ -6,6 +6,6 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf at test42-leaf-report-v0.cc:4:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf::m1', at offset 32 (in bits) at test42-leaf-report-v1.cc:7:1
+    'char m1', at offset 32 (in bits) at test42-leaf-report-v1.cc:7:1
   one impacted interface:
     function void fn(C&)
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 ed68b550..11e1ef02 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
@@ -13,5 +13,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           to:
             struct {int b; float c; char e;}
           and size changed from 64 to 96 (in bits) (by +32 bits)
-          'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int d' offset changed from 96 to 128 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
index 0979891a..13280bcb 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
@@ -11,4 +11,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     to:
       struct {int b; float c; char e;}
     and size changed from 64 to 96 (in bits) (by +32 bits)
-    'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+    'int d' offset changed from 96 to 128 (in bits) (by +32 bits)
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index 12797e99..5f5745b6 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct S':
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S::m0', at offset 0 (in bits)
+            'int m0', at offset 0 (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 6358be7b..fceae9d5 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
@@ -11,14 +11,14 @@
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
           1 data member change:
-            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* gl_h__gluint_vec___XUP::P_BOUNDS' changed:
+            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
                 type size hasn't changed
                 2 data member changes:
-                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::LB0' changed:
+                  type of 'integer LB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
-                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::UB0' changed:
+                  type of 'integer UB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
 
@@ -27,14 +27,14 @@
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
           1 data member change:
-            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* gtk__glarea__attributes_array___XUP::P_BOUNDS' changed:
+            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
                 type size hasn't changed
                 2 data member changes:
-                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::LB0' changed:
+                  type of 'integer LB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
-                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::UB0' changed:
+                  type of 'integer UB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 4dd8f2e7..4b5976be 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -33,12 +33,12 @@
     [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
-        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* _FlatpakTransactionClass::end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
+        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
       4 data member changes (3 filtered):
-        'typedef gboolean (FlatpakTransaction*)* _FlatpakTransactionClass::ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* _FlatpakTransactionClass::add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* _FlatpakTransactionClass::run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-        'gpointer _FlatpakTransactionClass::padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*)* ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+        'gpointer padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
 
   3 added types unreachable from any public interface:
 
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 6b475942..2d53dc68 100644
--- a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits)
+            'char mem1', at offset 32 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 6a48bb59..e705a721 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S1':
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S1::mem2', at offset 0 (in bits)
+            'int mem2', at offset 0 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 cff94ef5..8f40db21 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S1' at obj-v0.cc:15:1:
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S1::mem2', at offset 0 (in bits) at obj-v0.cc:17:1
+            'int mem2', at offset 0 (in bits) at obj-v0.cc:17:1
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 2172e1c4..5ef6a7e8 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
@@ -16,19 +16,19 @@
           in pointed to type 'struct _IceConn' at ICEconn.h:131:1:
             type size hasn't changed
             2 data member changes (2 filtered):
-              type of 'IceListenObj _IceConn::listen_obj' changed:
+              type of 'IceListenObj listen_obj' changed:
                 underlying type '_IceListenObj*' changed:
                   in pointed to type 'struct _IceListenObj' at ICElibint.h:120:1:
                     type size hasn't changed
                     1 data member change:
-                      type of '_XtransConnInfo* _IceListenObj::trans_conn' changed:
+                      type of '_XtransConnInfo* trans_conn' changed:
                         in pointed to type 'struct _XtransConnInfo' at Xtransint.h:136:1:
                           type size changed from 640 to 768 (in bits)
                           2 data member insertions:
-                            '_XtransConnFd* _XtransConnInfo::recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
-                            '_XtransConnFd* _XtransConnInfo::send_fds', at offset 704 (in bits) at Xtransint.h:149:1
+                            '_XtransConnFd* recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
+                            '_XtransConnFd* send_fds', at offset 704 (in bits) at Xtransint.h:149:1
                           no data member change (1 filtered);
-              type of '_IcePingWait* _IceConn::ping_waits' changed:
+              type of '_IcePingWait* ping_waits' changed:
                 in pointed to type 'struct _IcePingWait' at ICEconn.h:48:1:
                   entity changed from 'struct _IcePingWait' to compatible type 'typedef _IcePingWait' at ICEconn.h:48:1
 
@@ -53,7 +53,7 @@
           entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
             type size hasn't changed
             1 data member changes (2 filtered):
-              type of '_IceWatchedConnection* _IceWatchProc::watched_connections' changed:
+              type of '_IceWatchedConnection* watched_connections' changed:
                 in pointed to type 'struct _IceWatchedConnection' at ICElibint.h:315:1:
                   entity changed from 'struct _IceWatchedConnection' to compatible type 'typedef _IceWatchedConnection' at ICElibint.h:315: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 cba145c5..77ff400e 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
@@ -14,24 +14,24 @@
                 underlying type 'struct cdio_dvd_disckey' at dvd.h:100:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    'unsigned int cdio_dvd_disckey::agid' offset changed from 30 to 22 (in bits) (by -8 bits)
+                    'unsigned int agid' offset changed from 30 to 22 (in bits) (by -8 bits)
               type of 'cdio_dvd_physical_t physical' changed:
                 underlying type 'struct cdio_dvd_physical' at dvd.h:86:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    type of 'cdio_dvd_layer_t cdio_dvd_physical::layer[4]' changed:
+                    type of 'cdio_dvd_layer_t layer[4]' changed:
                       array element type 'typedef cdio_dvd_layer_t' changed:
                         underlying type 'struct cdio_dvd_layer' at dvd.h:65:1 changed:
                           type size hasn't changed
                           8 data member changes:
-                            'unsigned int cdio_dvd_layer::track_density' offset changed from 21 to 5 (in bits) (by -16 bits)
-                            'unsigned int cdio_dvd_layer::bca' offset changed from 24 to 0 (in bits) (by -24 bits)
-                            'unsigned int cdio_dvd_layer::disc_size' offset changed from 24 to 16 (in bits) (by -8 bits)
-                            'unsigned int cdio_dvd_layer::linear_density' offset changed from 25 to 1 (in bits) (by -24 bits)
-                            'unsigned int cdio_dvd_layer::nlayers' offset changed from 25 to 9 (in bits) (by -16 bits)
-                            'unsigned int cdio_dvd_layer::track_path' offset changed from 27 to 11 (in bits) (by -16 bits)
-                            'unsigned int cdio_dvd_layer::layer_type' offset changed from 28 to 12 (in bits) (by -16 bits)
-                            'unsigned int cdio_dvd_layer::min_rate' offset changed from 28 to 20 (in bits) (by -8 bits)
+                            'unsigned int track_density' offset changed from 21 to 5 (in bits) (by -16 bits)
+                            'unsigned int bca' offset changed from 24 to 0 (in bits) (by -24 bits)
+                            'unsigned int disc_size' offset changed from 24 to 16 (in bits) (by -8 bits)
+                            'unsigned int linear_density' offset changed from 25 to 1 (in bits) (by -24 bits)
+                            'unsigned int nlayers' offset changed from 25 to 9 (in bits) (by -16 bits)
+                            'unsigned int track_path' offset changed from 27 to 11 (in bits) (by -16 bits)
+                            'unsigned int layer_type' offset changed from 28 to 12 (in bits) (by -16 bits)
+                            'unsigned int min_rate' offset changed from 28 to 20 (in bits) (by -8 bits)
                       type size hasn't changed
 
     [C] 'function discmode_t mmc_get_dvd_struct_physical_private(void*, mmc_run_cmd_fn_t, cdio_dvd_struct_t*)' at mmc.c:450:1 has some indirect sub-type changes:
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 8be4acf9..c45d1524 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
@@ -18,11 +18,11 @@
           in pointed to type 'struct sigc::connection':
             type size hasn't changed
             1 data member change:
-              type of 'sigc::slot_base* sigc::connection::slot_' changed:
+              type of 'sigc::slot_base* slot_' changed:
                 in pointed to type 'class sigc::slot_base':
                   type size hasn't changed
                   1 data member change:
-                    type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+                    type of 'sigc::slot_base::rep_type* rep_' changed:
                       in pointed to type 'typedef sigc::slot_base::rep_type':
                         underlying type 'struct sigc::internal::slot_rep' changed:
                           type size hasn't changed
@@ -30,11 +30,11 @@
                             'struct sigc::trackable' changed:
                               type size hasn't changed
                               1 data member change:
-                                type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                                type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
                                   in pointed to type 'struct sigc::internal::trackable_callback_list':
                                     type size changed from 192 to 256 (in bits)
                                     2 data member changes:
-                                      type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                                      type of 'sigc::internal::trackable_callback_list::callback_list callbacks_' changed:
                                         underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
                                           type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                           type size changed from 128 to 192 (in bits)
@@ -43,23 +43,23 @@
                                               type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                               type size changed from 128 to 192 (in bits)
                                               1 data member change:
-                                                type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                                type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl _M_impl' changed:
                                                   type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
                                                   type size changed from 128 to 192 (in bits)
                                                   1 data member change:
-                                                    type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                                    type of 'std::__detail::_List_node_base _M_node' changed:
                                                       type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
                                                       type size changed from 128 to 192 (in bits)
                                                       1 base class insertion:
                                                         struct std::__detail::_List_node_base
                                                       2 data member deletions:
-                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                                        'std::__detail::_List_node_base* _M_next', at offset 0 (in bits)
+                                                        'std::__detail::_List_node_base* _M_prev', at offset 64 (in bits)
                                                       1 data member insertion:
-                                                        'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                                        'unsigned long int _M_data', at offset 128 (in bits)
                                                     and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
                                                 and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
-                                      'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                                      'bool clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
     [C] 'method void sigc::internal::signal_impl::block(bool)' has some indirect sub-type changes:
       implicit parameter 0 of type 'sigc::internal::signal_impl* const' has sub-type changes:
@@ -67,7 +67,7 @@
           in pointed to type 'struct sigc::internal::signal_impl':
             type size changed from 192 to 256 (in bits)
             1 data member change:
-              type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+              type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > slots_' changed:
                 type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
                 type size changed from 128 to 192 (in bits)
                 1 base class change:
@@ -75,7 +75,7 @@
                     type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
                     type size changed from 128 to 192 (in bits)
                     1 data member change:
-                      type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                      type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl _M_impl' changed:
                         type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
                         type size changed from 128 to 192 (in bits)
                         1 data member change:
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 f484d0c6..9afaed4e 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
@@ -40,9 +40,9 @@
           underlying type 'struct SSLCipherSuiteInfoStr' at sslt.h:178:1 changed:
             type size hasn't changed
             1 data member insertion:
-              'SSLAuthType SSLCipherSuiteInfoStr::authType', at offset 736 (in bits) at sslt.h:250:1
+              'SSLAuthType authType', at offset 736 (in bits) at sslt.h:250:1
             1 data member changes (3 filtered):
-              type of 'SSLAuthType SSLCipherSuiteInfoStr::authAlgorithm' changed:
+              type of 'SSLAuthType authAlgorithm' changed:
                 underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed:
                   type size hasn't changed
                   1 enumerator deletion:
@@ -79,27 +79,27 @@
           underlying type 'struct NSSCMSContentInfoStr' at cmst.h:131:1 changed:
             type size hasn't changed
             1 data member changes (2 filtered):
-              type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed:
+              type of 'NSSCMSContent content' changed:
                 underlying type 'union NSSCMSContentUnion' at cmst.h:118:1 changed:
                   type size hasn't changed
                   1 data member changes (3 filtered):
-                    type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
+                    type of 'NSSCMSEncryptedData* encryptedData' changed:
                       in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
                         underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:468:1 changed:
                           type size hasn't changed
                           1 data member changes (1 filtered):
-                            type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
+                            type of 'NSSCMSAttribute** unprotectedAttr' changed:
                               in pointed to type 'NSSCMSAttribute*':
                                 in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
                                   underlying type 'struct NSSCMSAttributeStr' at cmst.h:487:1 changed:
                                     type size hasn't changed
                                     1 data member change:
-                                      type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
+                                      type of 'SECOidData* typeTag' changed:
                                         in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
                                           underlying type 'struct SECOidDataStr' at secoidt.h:500:1 changed:
                                             type size hasn't changed
                                             1 data member change:
-                                              type of 'SECOidTag SECOidDataStr::offset' changed:
+                                              type of 'SECOidTag offset' changed:
                                                 underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
                                                   type size hasn't changed
                                                   1 enumerator insertion:
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 5463d5e1..7f9a4ede 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
@@ -25,63 +25,63 @@
           underlying type 'struct QXLInstance' at spice.h:259:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'QXLState* QXLInstance::st' changed:
+              type of 'QXLState* st' changed:
                 in pointed to type 'typedef QXLState' at spice-qxl.h:35:1:
                   underlying type 'struct QXLState' at reds.h:93:1 changed:
                     type size hasn't changed
                     1 data member change:
-                      type of 'RedDispatcher* QXLState::dispatcher' changed:
+                      type of 'RedDispatcher* dispatcher' changed:
                         in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
                           underlying type 'struct RedDispatcher' at red_dispatcher.c:53:1 changed:
                             type size changed from 3264 to 3328 (in bits)
                             13 data member changes:
-                              type of 'QXLInstance* RedDispatcher::qxl' changed:
+                              type of 'QXLInstance* qxl' changed:
                                 in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                   underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'Dispatcher RedDispatcher::dispatcher' changed:
+                              type of 'Dispatcher dispatcher' changed:
                                 underlying type 'struct Dispatcher' at dispatcher.h:22:1 changed:
                                   type size changed from 960 to 1024 (in bits)
                                   1 data member insertion:
-                                    'dispatcher_handle_any_message Dispatcher::any_handler', at offset 960 (in bits) at dispatcher.h:56:1
+                                    'dispatcher_handle_any_message any_handler', at offset 960 (in bits) at dispatcher.h:56:1
                                   1 data member change:
-                                    type of 'SpiceCoreInterface* Dispatcher::recv_core' changed:
+                                    type of 'SpiceCoreInterface* recv_core' changed:
                                       in pointed to type 'typedef SpiceCoreInterface' at spice-core.h:56:1:
                                         underlying type 'struct SpiceCoreInterface' at spice.h:82:1 changed:
                                           type size hasn't changed
                                           3 data member changes:
-                                            type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* SpiceCoreInterface::watch_add' changed:
+                                            type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* watch_add' changed:
                                               in pointed to type 'function type SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)':
                                                 return type changed:
                                                   in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                     underlying type 'struct SpiceWatch' at red_worker.c:268:1 changed:
                                                       type size hasn't changed
                                                       1 data member change:
-                                                        type of 'RedWorker* SpiceWatch::worker' changed:
+                                                        type of 'RedWorker* worker' changed:
                                                           in pointed to type 'struct RedWorker' at red_worker.c:932:1:
                                                             type size changed from 15520192 to 14876992 (in bits)
                                                             1 data member deletion:
-                                                              'uint32_t RedWorker::preload_group_id', at offset 15379968 (in bits) at red_worker.c:992:1
+                                                              'uint32_t preload_group_id', at offset 15379968 (in bits) at red_worker.c:992:1
                                                             1 data member insertion:
-                                                              'FILE* RedWorker::record_fd', at offset 14876928 (in bits) at red_worker.c:1037:1
+                                                              'FILE* record_fd', at offset 14876928 (in bits) at red_worker.c:1037:1
                                                             37 data member changes (2 filtered):
-                                                              type of 'DisplayChannel* RedWorker::display_channel' changed:
+                                                              type of 'DisplayChannel* display_channel' changed:
                                                                 in pointed to type 'typedef DisplayChannel' at red_worker.c:434:1:
                                                                   underlying type 'struct DisplayChannel' at red_worker.c:715:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'CommonChannel DisplayChannel::common' changed:
+                                                                      type of 'CommonChannel common' changed:
                                                                         underlying type 'struct CommonChannel' at red_worker.c:650:1 changed:
                                                                           type size hasn't changed
                                                                           2 data member changes:
-                                                                            type of 'RedChannel CommonChannel::base' changed:
+                                                                            type of 'RedChannel base' changed:
                                                                               underlying type 'struct RedChannel' at red_channel.h:303:1 changed:
                                                                                 type size hasn't changed
                                                                                 3 data member changes:
-                                                                                  type of 'SpiceCoreInterface* RedChannel::core' changed:
+                                                                                  type of 'SpiceCoreInterface* core' changed:
                                                                                     in pointed to type 'typedef SpiceCoreInterface':
                                                                                       entity changed from 'typedef SpiceCoreInterface' to 'const SpiceCoreInterface'
                                                                                       type size hasn't changed
-                                                                                  type of 'ChannelCbs RedChannel::channel_cbs' changed:
+                                                                                  type of 'ChannelCbs channel_cbs' changed:
                                                                                     underlying type 'struct {channel_configure_socket_proc config_socket; channel_disconnect_proc on_disconnect; channel_send_pipe_item_proc send_item; channel_hold_pipe_item_proc hold_item; channel_release_pipe_item_proc release_item; channel_alloc_msg_recv_buf_proc alloc_recv_buf; channel_release_msg_recv_buf_proc release_recv_buf; channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark; channel_handle_migrate_data_proc handle_migrate_data; channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial;}' at red_channel.h:195:1 changed:
                                                                                       type size hasn't changed
                                                                                       10 data member changes:
@@ -93,135 +93,135 @@
                                                                                                   underlying type 'struct RedChannelClient' at red_channel.h:247:1 changed:
                                                                                                     type size hasn't changed
                                                                                                     3 data member changes:
-                                                                                                      type of 'RedChannel* RedChannelClient::channel' changed:
+                                                                                                      type of 'RedChannel* channel' changed:
                                                                                                         in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
                                                                                                           underlying type 'struct RedChannel' changed, as being reported
-                                                                                                      type of 'RedClient* RedChannelClient::client' changed:
+                                                                                                      type of 'RedClient* client' changed:
                                                                                                         in pointed to type 'typedef RedClient' at red_channel.h:132:1:
                                                                                                           underlying type 'struct RedClient' at red_channel.h:561:1 changed:
                                                                                                             type size hasn't changed
                                                                                                             1 data member change:
-                                                                                                              type of 'MainChannelClient* RedClient::mcc' changed:
+                                                                                                              type of 'MainChannelClient* mcc' changed:
                                                                                                                 in pointed to type 'typedef MainChannelClient' at red_channel.h:133:1:
                                                                                                                   underlying type 'struct MainChannelClient' at main_channel.c:145:1 changed:
                                                                                                                     type size hasn't changed
                                                                                                                     1 data member change:
-                                                                                                                      type of 'RedChannelClient MainChannelClient::base' changed:
+                                                                                                                      type of 'RedChannelClient base' changed:
                                                                                                                         underlying type 'struct RedChannelClient' changed, as being reported
-                                                                                                      type of 'RedsStream* RedChannelClient::stream' changed:
+                                                                                                      type of 'RedsStream* stream' changed:
                                                                                                         in pointed to type 'typedef RedsStream' at reds_stream.h:31:1:
                                                                                                           underlying type 'struct RedsStream' at reds.h:68:1 changed:
                                                                                                             type size changed from 1280 to 256 (in bits)
                                                                                                             5 data member deletions:
-                                                                                                              'RedsSASL RedsStream::sasl', at offset 256 (in bits) at reds.h:78:1
-                                                                                                              'SpiceChannelEventInfo* RedsStream::info', at offset 1024 (in bits) at reds.h:85:1
-                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::read', at offset 1088 (in bits) at reds.h:88:1
-                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::write', at offset 1152 (in bits) at reds.h:89:1
-                                                                                                              'typedef ssize_t (RedsStream*, const iovec*, int)* RedsStream::writev', at offset 1216 (in bits) at reds.h:90:1
+                                                                                                              'RedsSASL sasl', at offset 256 (in bits) at reds.h:78:1
+                                                                                                              'SpiceChannelEventInfo* info', at offset 1024 (in bits) at reds.h:85:1
+                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* read', at offset 1088 (in bits) at reds.h:88:1
+                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* write', at offset 1152 (in bits) at reds.h:89:1
+                                                                                                              'typedef ssize_t (RedsStream*, const iovec*, int)* writev', at offset 1216 (in bits) at reds.h:90:1
                                                                                                             2 data member changes:
-                                                                                                              type of 'SSL* RedsStream::ssl' changed:
+                                                                                                              type of 'SSL* ssl' changed:
                                                                                                                 in pointed to type 'typedef SSL' at reds_stream.h:32:1:
                                                                                                                   typedef name changed from SSL to RedsStreamPrivate at reds_stream.h:32:1
                                                                                                                   underlying type 'struct ssl_st' at ssl.h:1065:1 changed:
                                                                                                                     type name changed from 'ssl_st' to 'RedsStreamPrivate'
                                                                                                                     type size changed from 5504 to 0 (in bits)
                                                                                                                     94 data member deletions:
-                                                                                                                      'int ssl_st::version', at offset 0 (in bits) at ssl.h:1070:1
-                                                                                                                      'int ssl_st::type', at offset 32 (in bits) at ssl.h:1071:1
-                                                                                                                      'const SSL_METHOD* ssl_st::method', at offset 64 (in bits) at ssl.h:1073:1
-                                                                                                                      'BIO* ssl_st::rbio', at offset 128 (in bits) at ssl.h:1080:1
-                                                                                                                      'BIO* ssl_st::wbio', at offset 192 (in bits) at ssl.h:1081:1
-                                                                                                                      'BIO* ssl_st::bbio', at offset 256 (in bits) at ssl.h:1082:1
-                                                                                                                      'int ssl_st::rwstate', at offset 320 (in bits) at ssl.h:1093:1
-                                                                                                                      'int ssl_st::in_handshake', at offset 352 (in bits) at ssl.h:1096:1
-                                                                                                                      'int (SSL*)* ssl_st::handshake_func', at offset 384 (in bits) at ssl.h:1097:1
-                                                                                                                      'int ssl_st::server', at offset 448 (in bits) at ssl.h:1107:1
-                                                                                                                      'int ssl_st::new_session', at offset 480 (in bits) at ssl.h:1109:1
-                                                                                                                      'int ssl_st::quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
-                                                                                                                      'int ssl_st::shutdown', at offset 544 (in bits) at ssl.h:1114:1
-                                                                                                                      'int ssl_st::state', at offset 576 (in bits) at ssl.h:1116:1
-                                                                                                                      'int ssl_st::rstate', at offset 608 (in bits) at ssl.h:1117:1
-                                                                                                                      'BUF_MEM* ssl_st::init_buf', at offset 640 (in bits) at ssl.h:1119:1
-                                                                                                                      'void* ssl_st::init_msg', at offset 704 (in bits) at ssl.h:1120:1
-                                                                                                                      'int ssl_st::init_num', at offset 768 (in bits) at ssl.h:1121:1
-                                                                                                                      'int ssl_st::init_off', at offset 800 (in bits) at ssl.h:1122:1
-                                                                                                                      'unsigned char* ssl_st::packet', at offset 832 (in bits) at ssl.h:1125:1
-                                                                                                                      'unsigned int ssl_st::packet_length', at offset 896 (in bits) at ssl.h:1126:1
-                                                                                                                      'ssl2_state_st* ssl_st::s2', at offset 960 (in bits) at ssl.h:1128:1
-                                                                                                                      'ssl3_state_st* ssl_st::s3', at offset 1024 (in bits) at ssl.h:1129:1
-                                                                                                                      'dtls1_state_st* ssl_st::d1', at offset 1088 (in bits) at ssl.h:1130:1
-                                                                                                                      'int ssl_st::read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                                                                                      'void (int, int, int, void*, typedef size_t, SSL*, void*)* ssl_st::msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
-                                                                                                                      'void* ssl_st::msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
-                                                                                                                      'int ssl_st::hit', at offset 1344 (in bits) at ssl.h:1139:1
-                                                                                                                      'X509_VERIFY_PARAM* ssl_st::param', at offset 1408 (in bits) at ssl.h:1141:1
-                                                                                                                      'stack_st_SSL_CIPHER* ssl_st::cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
-                                                                                                                      'stack_st_SSL_CIPHER* ssl_st::cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
-                                                                                                                      'int ssl_st::mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
-                                                                                                                      'EVP_CIPHER_CTX* ssl_st::enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
-                                                                                                                      'EVP_MD_CTX* ssl_st::read_hash', at offset 1728 (in bits) at ssl.h:1156:1
-                                                                                                                      'COMP_CTX* ssl_st::expand', at offset 1792 (in bits) at ssl.h:1158:1
-                                                                                                                      'EVP_CIPHER_CTX* ssl_st::enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
-                                                                                                                      'EVP_MD_CTX* ssl_st::write_hash', at offset 1920 (in bits) at ssl.h:1164:1
-                                                                                                                      'COMP_CTX* ssl_st::compress', at offset 1984 (in bits) at ssl.h:1166:1
-                                                                                                                      'cert_st* ssl_st::cert', at offset 2048 (in bits) at ssl.h:1175:1
-                                                                                                                      'unsigned int ssl_st::sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
-                                                                                                                      'unsigned char ssl_st::sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
-                                                                                                                      'SSL_SESSION* ssl_st::session', at offset 2432 (in bits) at ssl.h:1183:1
-                                                                                                                      'GEN_SESSION_CB ssl_st::generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
-                                                                                                                      'int ssl_st::verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
-                                                                                                                      'int (int, X509_STORE_CTX*)* ssl_st::verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
-                                                                                                                      'void (const SSL*, int, int)* ssl_st::info_callback', at offset 2688 (in bits) at ssl.h:1193:1
-                                                                                                                      'int ssl_st::error', at offset 2752 (in bits) at ssl.h:1195:1
-                                                                                                                      'int ssl_st::error_code', at offset 2784 (in bits) at ssl.h:1196:1
-                                                                                                                      'KSSL_CTX* ssl_st::kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
-                                                                                                                      'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* ssl_st::psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
-                                                                                                                      'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* ssl_st::psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
-                                                                                                                      'SSL_CTX* ssl_st::ctx', at offset 3008 (in bits) at ssl.h:1210:1
-                                                                                                                      'int ssl_st::debug', at offset 3072 (in bits) at ssl.h:1213:1
-                                                                                                                      'long int ssl_st::verify_result', at offset 3136 (in bits) at ssl.h:1216:1
-                                                                                                                      'CRYPTO_EX_DATA ssl_st::ex_data', at offset 3200 (in bits) at ssl.h:1217:1
-                                                                                                                      'stack_st_X509_NAME* ssl_st::client_CA', at offset 3328 (in bits) at ssl.h:1220:1
-                                                                                                                      'int ssl_st::references', at offset 3392 (in bits) at ssl.h:1222:1
-                                                                                                                      'unsigned long int ssl_st::options', at offset 3456 (in bits) at ssl.h:1223:1
-                                                                                                                      'unsigned long int ssl_st::mode', at offset 3520 (in bits) at ssl.h:1224:1
-                                                                                                                      'long int ssl_st::max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
-                                                                                                                      'int ssl_st::first_packet', at offset 3648 (in bits) at ssl.h:1226:1
-                                                                                                                      'int ssl_st::client_version', at offset 3680 (in bits) at ssl.h:1227:1
-                                                                                                                      'unsigned int ssl_st::max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
-                                                                                                                      'void (SSL*, int, int, unsigned char*, int, void*)* ssl_st::tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
-                                                                                                                      'void* ssl_st::tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
-                                                                                                                      'char* ssl_st::tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
-                                                                                                                      'int ssl_st::servername_done', at offset 3968 (in bits) at ssl.h:1237:1
-                                                                                                                      'int ssl_st::tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
-                                                                                                                      'int ssl_st::tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
-                                                                                                                      'stack_st_OCSP_RESPID* ssl_st::tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
-                                                                                                                      'X509_EXTENSIONS* ssl_st::tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
-                                                                                                                      'int ssl_st::tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
-                                                                                                                      'int ssl_st::tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
-                                                                                                                      'size_t ssl_st::tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
-                                                                                                                      'size_t ssl_st::tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
-                                                                                                                      'void* ssl_st::tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
-                                                                                                                      'size_t ssl_st::tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
-                                                                                                                      'TLS_SESSION_TICKET_EXT* ssl_st::tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
-                                                                                                                      'tls_session_ticket_ext_cb_fn ssl_st::tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
-                                                                                                                      'void* ssl_st::tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
-                                                                                                                      'tls_session_secret_cb_fn ssl_st::tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
-                                                                                                                      'void* ssl_st::tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
-                                                                                                                      'SSL_CTX* ssl_st::initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
-                                                                                                                      'unsigned char* ssl_st::next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
-                                                                                                                      'unsigned char ssl_st::next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
-                                                                                                                      'stack_st_SRTP_PROTECTION_PROFILE* ssl_st::srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
-                                                                                                                      'SRTP_PROTECTION_PROFILE* ssl_st::srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
-                                                                                                                      'unsigned int ssl_st::tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
-                                                                                                                      'unsigned int ssl_st::tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
-                                                                                                                      'unsigned int ssl_st::tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
-                                                                                                                      'int ssl_st::renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
+                                                                                                                      'int version', at offset 0 (in bits) at ssl.h:1070:1
+                                                                                                                      'int type', at offset 32 (in bits) at ssl.h:1071:1
+                                                                                                                      'const SSL_METHOD* method', at offset 64 (in bits) at ssl.h:1073:1
+                                                                                                                      'BIO* rbio', at offset 128 (in bits) at ssl.h:1080:1
+                                                                                                                      'BIO* wbio', at offset 192 (in bits) at ssl.h:1081:1
+                                                                                                                      'BIO* bbio', at offset 256 (in bits) at ssl.h:1082:1
+                                                                                                                      'int rwstate', at offset 320 (in bits) at ssl.h:1093:1
+                                                                                                                      'int in_handshake', at offset 352 (in bits) at ssl.h:1096:1
+                                                                                                                      'int (SSL*)* handshake_func', at offset 384 (in bits) at ssl.h:1097:1
+                                                                                                                      'int server', at offset 448 (in bits) at ssl.h:1107:1
+                                                                                                                      'int new_session', at offset 480 (in bits) at ssl.h:1109:1
+                                                                                                                      'int quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
+                                                                                                                      'int shutdown', at offset 544 (in bits) at ssl.h:1114:1
+                                                                                                                      'int state', at offset 576 (in bits) at ssl.h:1116:1
+                                                                                                                      'int rstate', at offset 608 (in bits) at ssl.h:1117:1
+                                                                                                                      'BUF_MEM* init_buf', at offset 640 (in bits) at ssl.h:1119:1
+                                                                                                                      'void* init_msg', at offset 704 (in bits) at ssl.h:1120:1
+                                                                                                                      'int init_num', at offset 768 (in bits) at ssl.h:1121:1
+                                                                                                                      'int init_off', at offset 800 (in bits) at ssl.h:1122:1
+                                                                                                                      'unsigned char* packet', at offset 832 (in bits) at ssl.h:1125:1
+                                                                                                                      'unsigned int packet_length', at offset 896 (in bits) at ssl.h:1126:1
+                                                                                                                      'ssl2_state_st* s2', at offset 960 (in bits) at ssl.h:1128:1
+                                                                                                                      'ssl3_state_st* s3', at offset 1024 (in bits) at ssl.h:1129:1
+                                                                                                                      'dtls1_state_st* d1', at offset 1088 (in bits) at ssl.h:1130:1
+                                                                                                                      'int read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
+                                                                                                                      'void (int, int, int, void*, typedef size_t, SSL*, void*)* msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
+                                                                                                                      'void* msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
+                                                                                                                      'int hit', at offset 1344 (in bits) at ssl.h:1139:1
+                                                                                                                      'X509_VERIFY_PARAM* param', at offset 1408 (in bits) at ssl.h:1141:1
+                                                                                                                      'stack_st_SSL_CIPHER* cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
+                                                                                                                      'stack_st_SSL_CIPHER* cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
+                                                                                                                      'int mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
+                                                                                                                      'EVP_CIPHER_CTX* enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
+                                                                                                                      'EVP_MD_CTX* read_hash', at offset 1728 (in bits) at ssl.h:1156:1
+                                                                                                                      'COMP_CTX* expand', at offset 1792 (in bits) at ssl.h:1158:1
+                                                                                                                      'EVP_CIPHER_CTX* enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
+                                                                                                                      'EVP_MD_CTX* write_hash', at offset 1920 (in bits) at ssl.h:1164:1
+                                                                                                                      'COMP_CTX* compress', at offset 1984 (in bits) at ssl.h:1166:1
+                                                                                                                      'cert_st* cert', at offset 2048 (in bits) at ssl.h:1175:1
+                                                                                                                      'unsigned int sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
+                                                                                                                      'unsigned char sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
+                                                                                                                      'SSL_SESSION* session', at offset 2432 (in bits) at ssl.h:1183:1
+                                                                                                                      'GEN_SESSION_CB generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
+                                                                                                                      'int verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
+                                                                                                                      'int (int, X509_STORE_CTX*)* verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
+                                                                                                                      'void (const SSL*, int, int)* info_callback', at offset 2688 (in bits) at ssl.h:1193:1
+                                                                                                                      'int error', at offset 2752 (in bits) at ssl.h:1195:1
+                                                                                                                      'int error_code', at offset 2784 (in bits) at ssl.h:1196:1
+                                                                                                                      'KSSL_CTX* kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
+                                                                                                                      'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
+                                                                                                                      'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
+                                                                                                                      'SSL_CTX* ctx', at offset 3008 (in bits) at ssl.h:1210:1
+                                                                                                                      'int debug', at offset 3072 (in bits) at ssl.h:1213:1
+                                                                                                                      'long int verify_result', at offset 3136 (in bits) at ssl.h:1216:1
+                                                                                                                      'CRYPTO_EX_DATA ex_data', at offset 3200 (in bits) at ssl.h:1217:1
+                                                                                                                      'stack_st_X509_NAME* client_CA', at offset 3328 (in bits) at ssl.h:1220:1
+                                                                                                                      'int references', at offset 3392 (in bits) at ssl.h:1222:1
+                                                                                                                      'unsigned long int options', at offset 3456 (in bits) at ssl.h:1223:1
+                                                                                                                      'unsigned long int mode', at offset 3520 (in bits) at ssl.h:1224:1
+                                                                                                                      'long int max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
+                                                                                                                      'int first_packet', at offset 3648 (in bits) at ssl.h:1226:1
+                                                                                                                      'int client_version', at offset 3680 (in bits) at ssl.h:1227:1
+                                                                                                                      'unsigned int max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
+                                                                                                                      'void (SSL*, int, int, unsigned char*, int, void*)* tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
+                                                                                                                      'void* tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
+                                                                                                                      'char* tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
+                                                                                                                      'int servername_done', at offset 3968 (in bits) at ssl.h:1237:1
+                                                                                                                      'int tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
+                                                                                                                      'int tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
+                                                                                                                      'stack_st_OCSP_RESPID* tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
+                                                                                                                      'X509_EXTENSIONS* tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
+                                                                                                                      'unsigned char* tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
+                                                                                                                      'int tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
+                                                                                                                      'int tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
+                                                                                                                      'size_t tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
+                                                                                                                      'unsigned char* tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
+                                                                                                                      'size_t tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
+                                                                                                                      'unsigned char* tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
+                                                                                                                      'void* tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
+                                                                                                                      'size_t tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
+                                                                                                                      'TLS_SESSION_TICKET_EXT* tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
+                                                                                                                      'tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
+                                                                                                                      'void* tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
+                                                                                                                      'tls_session_secret_cb_fn tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
+                                                                                                                      'void* tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
+                                                                                                                      'SSL_CTX* initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
+                                                                                                                      'unsigned char* next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
+                                                                                                                      'unsigned char next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
+                                                                                                                      'stack_st_SRTP_PROTECTION_PROFILE* srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
+                                                                                                                      'SRTP_PROTECTION_PROFILE* srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
+                                                                                                                      'unsigned int tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
+                                                                                                                      'unsigned int tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
+                                                                                                                      'unsigned int tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
+                                                                                                                      'int renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
                                                                                                               and name of 'RedsStream::ssl' changed to 'RedsStream::priv' at reds_stream.h:42:1
-                                                                                                              type of 'SpiceWatch* RedsStream::watch' changed:
+                                                                                                              type of 'SpiceWatch* watch' changed:
                                                                                                                 in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                                                                                   underlying type 'struct SpiceWatch' changed, as being reported
                                                                                         type of 'channel_disconnect_proc on_disconnect' changed:
@@ -269,7 +269,7 @@
                                                                                             in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
                                                                                               parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                                 pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                                                                  type of 'ClientCbs RedChannel::client_cbs' changed:
+                                                                                  type of 'ClientCbs client_cbs' changed:
                                                                                     underlying type 'struct {channel_client_connect_proc connect; channel_client_disconnect_proc disconnect; channel_client_migrate_proc migrate;}' at red_channel.h:213:1 changed:
                                                                                       type size hasn't changed
                                                                                       3 data member changes:
@@ -293,91 +293,91 @@
                                                                                             in pointed to type 'function type void (RedChannelClient*)':
                                                                                               parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                                 pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                                                            type of 'RedWorker* CommonChannel::worker' changed:
+                                                                            type of 'RedWorker* worker' changed:
                                                                               pointed to type 'struct RedWorker' changed, as being reported
-                                                              type of 'CursorChannel* RedWorker::cursor_channel' changed:
+                                                              type of 'CursorChannel* cursor_channel' changed:
                                                                 in pointed to type 'typedef CursorChannel' at red_worker.c:774:1:
                                                                   underlying type 'struct CursorChannel' at red_worker.c:750:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'CommonChannel CursorChannel::common' changed, as reported earlier
-                                                              type of 'QXLInstance* RedWorker::qxl' changed:
+                                                                      type of 'CommonChannel common' changed, as reported earlier
+                                                              type of 'QXLInstance* qxl' changed:
                                                                 in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                                                   underlying type 'struct QXLInstance' changed, as being reported
-                                                              type of 'RedDispatcher* RedWorker::red_dispatcher' changed:
+                                                              type of 'RedDispatcher* red_dispatcher' changed:
                                                                 in pointed to type 'typedef RedDispatcher':
                                                                   entity changed from 'typedef RedDispatcher' to compatible type 'struct RedDispatcher'
                                                                     details are being reported
-                                                              type of 'SpiceWatch RedWorker::watches[20]' changed:
+                                                              type of 'SpiceWatch watches[20]' changed:
                                                                 array element type 'struct SpiceWatch' changed:
                                                                   details are being reported
                                                                 type size hasn't changed
-                                                              type of 'MonitorsConfig* RedWorker::monitors_config' changed:
+                                                              type of 'MonitorsConfig* monitors_config' changed:
                                                                 in pointed to type 'typedef MonitorsConfig' at red_worker.c:361:1:
                                                                   underlying type 'struct MonitorsConfig' at red_worker.c:344:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'RedWorker* MonitorsConfig::worker' changed:
+                                                                      type of 'RedWorker* worker' changed:
                                                                         pointed to type 'struct RedWorker' changed, as being reported
-                                                              type of '_Drawable RedWorker::drawables[1000]' changed:
+                                                              type of '_Drawable drawables[1000]' changed:
                                                                 array element type 'typedef _Drawable' changed:
                                                                   underlying type 'struct _Drawable' at red_worker.c:874:1 changed:
                                                                     type size changed from 3200 to 2560 (in bits)
                                                                     1 data member change:
-                                                                      type of 'union {Drawable drawable; _Drawable* next;} _Drawable::u' changed:
+                                                                      type of 'union {Drawable drawable; _Drawable* next;} u' changed:
                                                                         type size changed from 3200 to 2560 (in bits)
                                                                         2 data member changes:
                                                                           type of 'Drawable drawable' changed:
                                                                             underlying type 'struct Drawable' at red_worker.c:838:1 changed:
                                                                               type size changed from 3200 to 2560 (in bits)
                                                                               2 data member deletions:
-                                                                                'uint8_t* Drawable::backed_surface_data', at offset 2368 (in bits) at red_worker.c:864:1
-                                                                                'DependItem Drawable::pipe_depend_items[3]', at offset 2432 (in bits) at red_worker.c:865:1
+                                                                                'uint8_t* backed_surface_data', at offset 2368 (in bits) at red_worker.c:864:1
+                                                                                'DependItem pipe_depend_items[3]', at offset 2432 (in bits) at red_worker.c:865:1
                                                                               6 data member changes (1 filtered):
-                                                                                type of 'Stream* Drawable::stream' changed:
+                                                                                type of 'Stream* stream' changed:
                                                                                   in pointed to type 'typedef Stream' at red_worker.c:443:1:
                                                                                     underlying type 'struct Stream' at red_worker.c:433:1 changed:
                                                                                       type size changed from 896 to 832 (in bits)
                                                                                       2 data member deletions:
-                                                                                        'SpiceTimer* Stream::input_fps_timer', at offset 640 (in bits) at red_worker.c:444:1
-                                                                                        'uint64_t Stream::input_fps_timer_start', at offset 768 (in bits) at red_worker.c:446:1
+                                                                                        'SpiceTimer* input_fps_timer', at offset 640 (in bits) at red_worker.c:444:1
+                                                                                        'uint64_t input_fps_timer_start', at offset 768 (in bits) at red_worker.c:446:1
                                                                                       1 data member insertion:
-                                                                                        'uint64_t Stream::input_fps_start_time', at offset 704 (in bits) at red_worker.c:456:1
+                                                                                        'uint64_t input_fps_start_time', at offset 704 (in bits) at red_worker.c:456:1
                                                                                       4 data member changes:
-                                                                                        type of 'Drawable* Stream::current' changed:
+                                                                                        type of 'Drawable* current' changed:
                                                                                           in pointed to type 'typedef Drawable' at red_worker.c:432:1:
                                                                                             underlying type 'struct Drawable' changed, as being reported
-                                                                                        type of 'Stream* Stream::next' changed:
+                                                                                        type of 'Stream* next' changed:
                                                                                           in pointed to type 'typedef Stream' at red_worker.c:443:1:
                                                                                             underlying type 'struct Stream' changed, as being reported
-                                                                                        'uint32_t Stream::num_input_frames' offset changed from 704 to 640 (in bits) (by -64 bits)
-                                                                                        'uint32_t Stream::input_fps' offset changed from 832 to 768 (in bits) (by -64 bits)
-                                                                                type of 'Stream* Drawable::sized_stream' changed:
+                                                                                        'uint32_t num_input_frames' offset changed from 704 to 640 (in bits) (by -64 bits)
+                                                                                        'uint32_t input_fps' offset changed from 832 to 768 (in bits) (by -64 bits)
+                                                                                type of 'Stream* sized_stream' changed:
                                                                                   pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
-                                                                                type of 'DependItem Drawable::depend_items[3]' changed:
+                                                                                type of 'DependItem depend_items[3]' changed:
                                                                                   array element type 'typedef DependItem' changed:
                                                                                     underlying type 'struct DependItem' at red_worker.c:825:1 changed:
                                                                                       type size hasn't changed
                                                                                       1 data member change:
-                                                                                        type of 'Drawable* DependItem::drawable' changed:
+                                                                                        type of 'Drawable* drawable' changed:
                                                                                           in pointed to type 'typedef Drawable' at red_worker.c:432:1:
                                                                                             underlying type 'struct Drawable' changed, as being reported
                                                                                   type size hasn't changed
-                                                                                'int Drawable::surface_id' offset changed from 3008 to 2368 (in bits) (by -640 bits)
-                                                                                'int Drawable::surfaces_dest[3]' offset changed from 3040 to 2400 (in bits) (by -640 bits)
-                                                                                'uint32_t Drawable::process_commands_generation' offset changed from 3136 to 2496 (in bits) (by -640 bits)
+                                                                                'int surface_id' offset changed from 3008 to 2368 (in bits) (by -640 bits)
+                                                                                'int surfaces_dest[3]' offset changed from 3040 to 2400 (in bits) (by -640 bits)
+                                                                                'uint32_t process_commands_generation' offset changed from 3136 to 2496 (in bits) (by -640 bits)
                                                                           type of '_Drawable* next' changed:
                                                                             in pointed to type 'typedef _Drawable' at red_worker.c:865:1:
                                                                               underlying type 'struct _Drawable' changed, as being reported
                                                                 array type size changed from 3200000 to 2560000
-                                                              type of '_Drawable* RedWorker::free_drawables' changed:
+                                                              type of '_Drawable* free_drawables' changed:
                                                                 pointed to type 'typedef _Drawable' changed at red_worker.c:873:1, as reported earlier
                                                               and offset changed from 15366720 to 14726720 (in bits) (by -640000 bits)
-                                                              '_CursorItem RedWorker::cursor_items[100]' offset changed from 15366784 to 14726784 (in bits) (by -640000 bits)
-                                                              '_CursorItem* RedWorker::free_cursor_items' offset changed from 15379584 to 14739584 (in bits) (by -640000 bits)
-                                                              'RedMemSlotInfo RedWorker::mem_slots' offset changed from 15379648 to 14739648 (in bits) (by -640000 bits)
-                                                              'ImageCache RedWorker::image_cache' offset changed from 15380032 to 14739968 (in bits) (by -640064 bits)
-                                                              type of 'spice_image_compression_t RedWorker::image_compression' changed:
+                                                              '_CursorItem cursor_items[100]' offset changed from 15366784 to 14726784 (in bits) (by -640000 bits)
+                                                              '_CursorItem* free_cursor_items' offset changed from 15379584 to 14739584 (in bits) (by -640000 bits)
+                                                              'RedMemSlotInfo mem_slots' offset changed from 15379648 to 14739648 (in bits) (by -640000 bits)
+                                                              'ImageCache image_cache' offset changed from 15380032 to 14739968 (in bits) (by -640064 bits)
+                                                              type of 'spice_image_compression_t image_compression' 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:
                                                                   type name changed from '__anonymous_enum__2' to 'SpiceImageCompression'
@@ -401,23 +401,23 @@
                                                                     'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_LZ4' value '7'
                                                                     'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
                                                               and offset changed from 15445824 to 14805760 (in bits) (by -640064 bits)
-                                                              'spice_wan_compression_t RedWorker::jpeg_state' offset changed from 15445856 to 14805792 (in bits) (by -640064 bits)
-                                                              'spice_wan_compression_t RedWorker::zlib_glz_state' offset changed from 15445888 to 14805824 (in bits) (by -640064 bits)
-                                                              'uint32_t RedWorker::mouse_mode' offset changed from 15445920 to 14805856 (in bits) (by -640064 bits)
-                                                              'uint32_t RedWorker::streaming_video' offset changed from 15445952 to 14805888 (in bits) (by -640064 bits)
-                                                              type of 'Stream RedWorker::streams_buf[50]' changed:
+                                                              'spice_wan_compression_t jpeg_state' offset changed from 15445856 to 14805792 (in bits) (by -640064 bits)
+                                                              'spice_wan_compression_t zlib_glz_state' offset changed from 15445888 to 14805824 (in bits) (by -640064 bits)
+                                                              'uint32_t mouse_mode' offset changed from 15445920 to 14805856 (in bits) (by -640064 bits)
+                                                              'uint32_t streaming_video' offset changed from 15445952 to 14805888 (in bits) (by -640064 bits)
+                                                              type of 'Stream streams_buf[50]' changed:
                                                                 array element type 'typedef Stream' changed:
                                                                   underlying type 'struct Stream' changed at red_worker.c:433:1, as reported earlier
                                                                 array type size changed from 44800 to 41600
                                                               and offset changed from 15446016 to 14805952 (in bits) (by -640064 bits)
-                                                              type of 'Stream* RedWorker::free_streams' changed:
+                                                              type of 'Stream* free_streams' changed:
                                                                 pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
                                                               and offset changed from 15490816 to 14847552 (in bits) (by -643264 bits)
-                                                              'Ring RedWorker::streams' offset changed from 15490880 to 14847616 (in bits) (by -643264 bits)
-                                                              'ItemTrace RedWorker::items_trace[8]' offset changed from 15491008 to 14847744 (in bits) (by -643264 bits)
-                                                              'uint32_t RedWorker::next_item_trace' offset changed from 15494080 to 14850816 (in bits) (by -643264 bits)
-                                                              'uint64_t RedWorker::streams_size_total' offset changed from 15494144 to 14850880 (in bits) (by -643264 bits)
-                                                              type of 'QuicData RedWorker::quic_data' changed:
+                                                              'Ring streams' offset changed from 15490880 to 14847616 (in bits) (by -643264 bits)
+                                                              'ItemTrace items_trace[8]' offset changed from 15491008 to 14847744 (in bits) (by -643264 bits)
+                                                              'uint32_t next_item_trace' offset changed from 15494080 to 14850816 (in bits) (by -643264 bits)
+                                                              'uint64_t streams_size_total' offset changed from 15494144 to 14850880 (in bits) (by -643264 bits)
+                                                              type of 'QuicData quic_data' changed:
                                                                 underlying type 'struct {QuicUsrContext usr; EncoderData data;}' at red_worker.c:577:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
@@ -430,95 +430,95 @@
                                                                               underlying type 'struct DisplayChannelClient' at red_worker.c:672:1 changed:
                                                                                 type size hasn't changed
                                                                                 5 data member changes:
-                                                                                  type of 'CommonChannelClient DisplayChannelClient::common' changed:
+                                                                                  type of 'CommonChannelClient common' changed:
                                                                                     underlying type 'struct CommonChannelClient' at red_worker.c:662:1 changed:
                                                                                       type size hasn't changed
                                                                                       2 data member changes:
-                                                                                        type of 'RedChannelClient CommonChannelClient::base' changed, as reported earlier
-                                                                                        type of 'RedWorker* CommonChannelClient::worker' changed:
+                                                                                        type of 'RedChannelClient base' changed, as reported earlier
+                                                                                        type of 'RedWorker* worker' changed:
                                                                                           pointed to type 'struct RedWorker' changed, as being reported
-                                                                                  type of 'PixmapCache* DisplayChannelClient::pixmap_cache' changed:
+                                                                                  type of 'PixmapCache* pixmap_cache' changed:
                                                                                     in pointed to type 'typedef PixmapCache' at red_worker.c:527:1:
                                                                                       underlying type 'struct PixmapCache' at red_worker.c:518:1 changed:
                                                                                         type size hasn't changed
                                                                                         1 data member change:
-                                                                                          type of 'RedClient* PixmapCache::client' changed:
+                                                                                          type of 'RedClient* client' changed:
                                                                                             pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                                                                  type of 'GlzSharedDictionary* DisplayChannelClient::glz_dict' changed:
+                                                                                  type of 'GlzSharedDictionary* glz_dict' changed:
                                                                                     in pointed to type 'typedef GlzSharedDictionary' at red_worker.c:663:1:
                                                                                       underlying type 'struct GlzSharedDictionary' at red_worker.c:638:1 changed:
                                                                                         type size hasn't changed
                                                                                         1 data member change:
-                                                                                          type of 'RedClient* GlzSharedDictionary::client' changed:
+                                                                                          type of 'RedClient* client' changed:
                                                                                             pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                                                                  type of 'GlzData DisplayChannelClient::glz_data' changed:
+                                                                                  type of 'GlzData glz_data' changed:
                                                                                     underlying type 'struct {GlzEncoderUsrContext usr; EncoderData data;}' at red_worker.c:587:1 changed:
                                                                                       type size hasn't changed
                                                                                       1 data member change:
                                                                                         type of 'EncoderData data' changed:
                                                                                           underlying type 'struct {DisplayChannelClient* dcc; RedCompressBuf* bufs_head; RedCompressBuf* bufs_tail; jmp_buf jmp_env; union {struct {SpiceChunks* chunks; int next; int stride; int reverse;} lines_data; struct {RedCompressBuf* next; int size_left;} compressed_data;} u; char message_buf[512];}' changed, as being reported
-                                                                                  type of 'StreamAgent DisplayChannelClient::stream_agents[50]' changed:
+                                                                                  type of 'StreamAgent stream_agents[50]' changed:
                                                                                     array element type 'typedef StreamAgent' changed:
                                                                                       underlying type 'struct StreamAgent' at red_worker.c:464:1 changed:
                                                                                         type size hasn't changed
                                                                                         2 data member changes:
-                                                                                          type of 'Stream* StreamAgent::stream' changed:
+                                                                                          type of 'Stream* stream' changed:
                                                                                             pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
-                                                                                          type of 'DisplayChannelClient* StreamAgent::dcc' changed:
+                                                                                          type of 'DisplayChannelClient* dcc' changed:
                                                                                             in pointed to type 'typedef DisplayChannelClient' at red_worker.c:435:1:
                                                                                               underlying type 'struct DisplayChannelClient' changed, as being reported
                                                                                     type size hasn't changed
                                                               and offset changed from 15494208 to 14850944 (in bits) (by -643264 bits)
-                                                              'QuicContext* RedWorker::quic' offset changed from 15500736 to 14857472 (in bits) (by -643264 bits)
-                                                              type of 'LzData RedWorker::lz_data' changed:
+                                                              'QuicContext* quic' offset changed from 15500736 to 14857472 (in bits) (by -643264 bits)
+                                                              type of 'LzData lz_data' changed:
                                                                 underlying type 'struct {LzUsrContext usr; EncoderData data;}' at red_worker.c:582:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15500800 to 14857536 (in bits) (by -643264 bits)
-                                                              'LzContext* RedWorker::lz' offset changed from 15507328 to 14864064 (in bits) (by -643264 bits)
-                                                              type of 'JpegData RedWorker::jpeg_data' changed:
+                                                              'LzContext* lz' offset changed from 15507328 to 14864064 (in bits) (by -643264 bits)
+                                                              type of 'JpegData jpeg_data' changed:
                                                                 underlying type 'struct {JpegEncoderUsrContext usr; EncoderData data;}' at red_worker.c:592:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15507392 to 14864128 (in bits) (by -643264 bits)
-                                                              'JpegEncoderContext* RedWorker::jpeg' offset changed from 15513600 to 14870336 (in bits) (by -643264 bits)
-                                                              type of 'ZlibData RedWorker::zlib_data' changed:
+                                                              'JpegEncoderContext* jpeg' offset changed from 15513600 to 14870336 (in bits) (by -643264 bits)
+                                                              type of 'ZlibData zlib_data' changed:
                                                                 underlying type 'struct {ZlibEncoderUsrContext usr; EncoderData data;}' at red_worker.c:597:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15513664 to 14870400 (in bits) (by -643264 bits)
-                                                              'ZlibEncoder* RedWorker::zlib' offset changed from 15519872 to 14876608 (in bits) (by -643264 bits)
-                                                              'uint32_t RedWorker::process_commands_generation' offset changed from 15519936 to 14876672 (in bits) (by -643264 bits)
-                                                              'StatNodeRef RedWorker::stat' offset changed from 15519968 to 14876704 (in bits) (by -643264 bits)
-                                                              'uint64_t* RedWorker::wakeup_counter' offset changed from 15520000 to 14876736 (in bits) (by -643264 bits)
-                                                              'uint64_t* RedWorker::command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
-                                                              'int RedWorker::driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
-                                                              'int RedWorker::set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
-                                            type of 'void (SpiceWatch*, int)* SpiceCoreInterface::watch_update_mask' changed:
+                                                              'ZlibEncoder* zlib' offset changed from 15519872 to 14876608 (in bits) (by -643264 bits)
+                                                              'uint32_t process_commands_generation' offset changed from 15519936 to 14876672 (in bits) (by -643264 bits)
+                                                              'StatNodeRef stat' offset changed from 15519968 to 14876704 (in bits) (by -643264 bits)
+                                                              'uint64_t* wakeup_counter' offset changed from 15520000 to 14876736 (in bits) (by -643264 bits)
+                                                              'uint64_t* command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
+                                                              'int driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
+                                                              'int set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
+                                            type of 'void (SpiceWatch*, int)* watch_update_mask' changed:
                                               in pointed to type 'function type void (SpiceWatch*, int)':
                                                 parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                   pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                                            type of 'void (SpiceWatch*)* SpiceCoreInterface::watch_remove' changed:
+                                            type of 'void (SpiceWatch*)* watch_remove' changed:
                                               in pointed to type 'function type void (SpiceWatch*)':
                                                 parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                   pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                              'pthread_t RedDispatcher::worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-                              'uint32_t RedDispatcher::pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-                              'int RedDispatcher::primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
-                              'int RedDispatcher::x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
-                              'int RedDispatcher::y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
-                              'int RedDispatcher::use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                              type of 'RedDispatcher* RedDispatcher::next' changed:
+                              'pthread_t worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+                              'uint32_t pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+                              'int primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
+                              'int x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+                              'int y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
+                              'int use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                              type of 'RedDispatcher* next' changed:
                                 in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
                                   underlying type 'struct RedDispatcher' changed, as being reported
                               and offset changed from 2304 to 2368 (in bits) (by +64 bits)
-                              'Ring RedDispatcher::async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                              'pthread_mutex_t RedDispatcher::async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                              'QXLDevSurfaceCreate RedDispatcher::surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
-                              'unsigned int RedDispatcher::max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
+                              'Ring async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                              'pthread_mutex_t async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                              'QXLDevSurfaceCreate surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
+                              'unsigned int max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
 
     [C] 'function void spice_qxl_add_memslot_async(QXLInstance*, QXLDevMemSlot*, uint64_t)' at red_dispatcher.c:948:1 has some indirect sub-type changes:
       parameter 1 of type 'QXLInstance*' has sub-type changes:
@@ -622,81 +622,81 @@
           underlying type 'struct RedsState' at reds-private.h:127:1 changed:
             type size hasn't changed
             5 data member changes (1 filtered):
-              type of 'SpiceWatch* RedsState::listen_watch' changed:
+              type of 'SpiceWatch* listen_watch' changed:
                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-              type of 'SpiceWatch* RedsState::secure_listen_watch' changed:
+              type of 'SpiceWatch* secure_listen_watch' changed:
                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-              type of 'VDIPortState RedsState::agent_state' changed:
+              type of 'VDIPortState agent_state' changed:
                 underlying type 'struct VDIPortState' at reds-private.h:46:1 changed:
                   type size hasn't changed
                   2 data member changes (3 filtered):
-                    type of 'SpiceCharDeviceState* VDIPortState::base' changed:
+                    type of 'SpiceCharDeviceState* base' changed:
                       in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
                         underlying type 'struct SpiceCharDeviceState' at char_device.c:47:1 changed:
                           type size changed from 1536 to 1600 (in bits)
                           1 data member insertion:
-                            'uint64_t SpiceCharDeviceState::cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
+                            'uint64_t cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
                           12 data member changes:
-                            type of 'SpiceCharDeviceWriteBuffer* SpiceCharDeviceState::cur_write_buf' changed:
+                            type of 'SpiceCharDeviceWriteBuffer* cur_write_buf' changed:
                               in pointed to type 'typedef SpiceCharDeviceWriteBuffer' at char_device.h:94:1:
                                 underlying type 'struct SpiceCharDeviceWriteBuffer' at char_device.h:66:1 changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'RedClient* SpiceCharDeviceWriteBuffer::client' changed:
+                                    type of 'RedClient* client' changed:
                                       pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
                             and offset changed from 384 to 448 (in bits) (by +64 bits)
-                            'uint8_t* SpiceCharDeviceState::cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
-                            'SpiceTimer* SpiceCharDeviceState::write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
-                            'uint64_t SpiceCharDeviceState::num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
-                            'Ring SpiceCharDeviceState::clients' offset changed from 640 to 704 (in bits) (by +64 bits)
-                            'uint32_t SpiceCharDeviceState::num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
-                            'uint64_t SpiceCharDeviceState::client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
-                            type of 'SpiceCharDeviceInstance* SpiceCharDeviceState::sin' changed:
+                            'uint8_t* cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
+                            'SpiceTimer* write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
+                            'uint64_t num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
+                            'Ring clients' offset changed from 640 to 704 (in bits) (by +64 bits)
+                            'uint32_t num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
+                            'uint64_t client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceInstance* sin' changed:
                               in pointed to type 'typedef SpiceCharDeviceInstance' at spice-char.h:33:1:
                                 underlying type 'struct SpiceCharDeviceInstance' at spice.h:416:1 changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'SpiceCharDeviceState* SpiceCharDeviceInstance::st' changed:
+                                    type of 'SpiceCharDeviceState* st' changed:
                                       in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
                                         underlying type 'struct SpiceCharDeviceState' changed, as being reported
                             and offset changed from 896 to 960 (in bits) (by +64 bits)
-                            'int SpiceCharDeviceState::during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                            'int SpiceCharDeviceState::during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
-                            type of 'SpiceCharDeviceCallbacks SpiceCharDeviceState::cbs' changed:
+                            'int during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                            'int during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceCallbacks cbs' changed:
                               underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
                                 type size hasn't changed
                                 4 data member changes:
-                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* SpiceCharDeviceCallbacks::read_one_msg_from_device' changed:
+                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* read_one_msg_from_device' changed:
                                     in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
                                       parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
                                         pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
-                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* SpiceCharDeviceCallbacks::send_msg_to_client' changed:
+                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* send_msg_to_client' changed:
                                     in pointed to type 'function type void (SpiceCharDeviceMsgToClient*, RedClient*, void*)':
                                       parameter 2 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, typedef uint32_t, void*)* SpiceCharDeviceCallbacks::send_tokens_to_client' changed:
+                                  type of 'void (RedClient*, typedef uint32_t, void*)* send_tokens_to_client' changed:
                                     in pointed to type 'function type void (RedClient*, typedef uint32_t, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, void*)* SpiceCharDeviceCallbacks::remove_client' changed:
+                                  type of 'void (RedClient*, void*)* remove_client' changed:
                                     in pointed to type 'function type void (RedClient*, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
                             and offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                            'void* SpiceCharDeviceState::opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-                    type of 'SpiceCharDeviceWriteBuffer* VDIPortState::recv_from_client_buf' changed:
+                            'void* opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+                    type of 'SpiceCharDeviceWriteBuffer* recv_from_client_buf' changed:
                       pointed to type 'typedef SpiceCharDeviceWriteBuffer' changed at char_device.h:77:1, as reported earlier
-              type of 'MainChannel* RedsState::main_channel' changed:
+              type of 'MainChannel* main_channel' changed:
                 in pointed to type 'typedef MainChannel' at main_channel.h:48:1:
                   underlying type 'struct MainChannel' at main_channel.h:36:1 changed:
                     type size hasn't changed
                     1 data member change:
-                      type of 'RedChannel MainChannel::base' changed, as reported earlier
-              type of 'RedsClientMonitorsConfig RedsState::client_monitors_config' changed:
+                      type of 'RedChannel base' changed, as reported earlier
+              type of 'RedsClientMonitorsConfig client_monitors_config' changed:
                 underlying type 'struct RedsClientMonitorsConfig' at reds-private.h:120:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    type of 'MainChannelClient* RedsClientMonitorsConfig::mcc' changed:
+                    type of 'MainChannelClient* mcc' changed:
                       pointed to type 'typedef MainChannelClient' changed at red_channel.h:138:1, as reported earlier
 
     [C] 'function int spice_server_add_interface(SpiceServer*, SpiceBaseInstance*)' at reds.c:3159:1 has some indirect sub-type changes:
@@ -778,52 +778,52 @@
           underlying type 'struct SpicePlaybackInstance' at spice.h:350:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'SpicePlaybackState* SpicePlaybackInstance::st' changed:
+              type of 'SpicePlaybackState* st' changed:
                 in pointed to type 'typedef SpicePlaybackState' at spice-audio.h:34:1:
                   underlying type 'struct SpicePlaybackState' at snd_worker.c:165:1 changed:
                     type size changed from 512 to 576 (in bits)
                     1 data member insertion:
-                      'uint32_t SpicePlaybackState::frequency', at offset 512 (in bits) at snd_worker.c:159:1
+                      'uint32_t frequency', at offset 512 (in bits) at snd_worker.c:159:1
                     2 data member changes:
-                      type of 'SndWorker SpicePlaybackState::worker' changed:
+                      type of 'SndWorker worker' changed:
                         type size hasn't changed
                         3 data member changes:
-                          type of 'RedChannel* SndWorker::base_channel' changed:
+                          type of 'RedChannel* base_channel' changed:
                             pointed to type 'typedef RedChannel' changed at red_channel.h:135:1, as reported earlier
-                          type of 'SndChannel* SndWorker::connection' changed:
+                          type of 'SndChannel* connection' changed:
                             in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                               underlying type 'struct SndChannel' at snd_worker.c:89:1 changed:
                                 type size hasn't changed
                                 6 data member changes (1 filtered):
-                                  type of 'RedsStream* SndChannel::stream' changed:
+                                  type of 'RedsStream* stream' changed:
                                     pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
-                                  type of 'SndWorker* SndChannel::worker' changed:
+                                  type of 'SndWorker* worker' changed:
                                     in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
                                       underlying type 'struct SndWorker' changed, as being reported
-                                  type of 'RedChannelClient* SndChannel::channel_client' changed:
+                                  type of 'RedChannelClient* channel_client' changed:
                                     pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                  type of 'snd_channel_handle_message_proc SndChannel::handle_message' changed:
+                                  type of 'snd_channel_handle_message_proc handle_message' changed:
                                     underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
                                       in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                                  type of 'snd_channel_on_message_done_proc SndChannel::on_message_done' changed:
+                                  type of 'snd_channel_on_message_done_proc on_message_done' changed:
                                     underlying type 'void (SndChannel*)*' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                                  type of 'snd_channel_cleanup_channel_proc SndChannel::cleanup' changed:
+                                  type of 'snd_channel_cleanup_channel_proc cleanup' changed:
                                     underlying type 'void (SndChannel*)*' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                          type of 'SndWorker* SndWorker::next' changed:
+                          type of 'SndWorker* next' changed:
                             in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
                               underlying type 'struct SndWorker' changed, as being reported
-                      type of 'SpicePlaybackInstance* SpicePlaybackState::sin' changed:
+                      type of 'SpicePlaybackInstance* sin' changed:
                         in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
                           underlying type 'struct SpicePlaybackInstance' changed, as being reported
 
@@ -857,15 +857,15 @@
           underlying type 'struct SpiceRecordInstance' at spice.h:380:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'SpiceRecordState* SpiceRecordInstance::st' changed:
+              type of 'SpiceRecordState* st' changed:
                 in pointed to type 'typedef SpiceRecordState' at spice-audio.h:68:1:
                   underlying type 'struct SpiceRecordState' at snd_worker.c:171:1 changed:
                     type size changed from 512 to 576 (in bits)
                     1 data member insertion:
-                      'uint32_t SpiceRecordState::frequency', at offset 512 (in bits) at snd_worker.c:166:1
+                      'uint32_t frequency', at offset 512 (in bits) at snd_worker.c:166:1
                     2 data member changes:
-                      type of 'SndWorker SpiceRecordState::worker' changed, as reported earlier
-                      type of 'SpiceRecordInstance* SpiceRecordState::sin' changed:
+                      type of 'SndWorker worker' changed, as reported earlier
+                      type of 'SpiceRecordInstance* sin' changed:
                         in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
                           underlying type 'struct SpiceRecordInstance' changed, as being reported
 
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 d5bff94d..26c6b496 100644
--- a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
+++ b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
@@ -9,7 +9,7 @@
         in pointed to type 'struct S' at foo.c:3:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::m1', at offset 32 (in bits) at foo.c:6:1
+            'char m1', at offset 32 (in bits) at foo.c:6:1
 
 ================ end of changes of 'libfoo.so'===============
 
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 6b475942..2d53dc68 100644
--- a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits)
+            'char mem1', at offset 32 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 8d737581..40813eae 100644
--- a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S' at obj-v0.cc:4:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits) at obj-v0.cc:7:1
+            'char mem1', at offset 32 (in bits) at obj-v0.cc:7:1
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 3616cb34..c694ae94 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
@@ -36,11 +36,11 @@
             'method virtual tbb::filter::~filter(int)' at pipeline.cpp:688:1
           no member function changes (4 filtered);
           1 data member changes (4 filtered):
-            type of 'tbb::internal::input_buffer* tbb::filter::my_input_buffer' changed:
+            type of 'tbb::internal::input_buffer* my_input_buffer' changed:
               in pointed to type 'class tbb::internal::input_buffer' at pipeline.cpp:52:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'tbb::spin_mutex tbb::internal::input_buffer::array_mutex' changed:
+                  type of 'tbb::spin_mutex array_mutex' changed:
                     type size hasn't changed
                     1 base class insertion:
                       class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
@@ -52,27 +52,27 @@
             in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::task_group_context& tbb::internal::allocate_root_with_context_proxy::my_context' changed:
+                type of 'tbb::task_group_context& my_context' changed:
                   in referenced type 'class tbb::task_group_context' at task.h:302:1:
                     type size hasn't changed
                     1 data member insertion:
-                      'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
+                      'tbb::internal::cpu_ctl_env_space my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
                     2 data member changes (1 filtered):
-                      type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+                      type of 'char _leading_padding[80]' changed:
                         type name changed from 'char[80]' to 'char[72]'
                         array type size changed from 640 to 576
                         array type subrange 1 changed length from 80 to 72
-                      type of 'tbb::internal::generic_scheduler* tbb::task_group_context::my_owner' changed:
+                      type of 'tbb::internal::generic_scheduler* my_owner' changed:
                         in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
                           type size changed from 3136 to 3072 (in bits)
                           1 base class change:
                             'struct tbb::internal::scheduler_state' at scheduler.h:73:1 changed:
                               type size changed from 576 to 704 (in bits)
                               2 data member insertions:
-                                'volatile intptr_t* tbb::internal::scheduler_state::my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
-                                'volatile uintptr_t* tbb::internal::scheduler_state::my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
+                                'volatile intptr_t* my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
+                                'volatile uintptr_t* my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
                               2 data member changes (1 filtered):
-                                type of 'tbb::internal::arena* tbb::internal::scheduler_state::my_arena' changed:
+                                type of 'tbb::internal::arena* my_arena' changed:
                                   in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
                                     type size hasn't changed
                                     1 base class deletion:
@@ -80,7 +80,7 @@
                                     1 base class insertion:
                                       struct tbb::internal::padded<tbb::internal::arena_base, 128ul> at tbb_stddef.h:251:1
                                     1 data member change:
-                                      type of 'tbb::internal::arena_slot tbb::internal::arena::my_slots[1]' changed:
+                                      type of 'tbb::internal::arena_slot my_slots[1]' changed:
                                         array element type 'struct tbb::internal::arena_slot' changed:
                                           type size hasn't changed
                                           2 base class deletions:
@@ -90,10 +90,10 @@
                                             struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
                                             struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
                                         type size hasn't changed
-                                type of 'tbb::internal::mail_inbox tbb::internal::scheduler_state::my_inbox' changed:
+                                type of 'tbb::internal::mail_inbox my_inbox' changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'tbb::internal::mail_outbox* tbb::internal::mail_inbox::my_putter' changed:
+                                    type of 'tbb::internal::mail_outbox* my_putter' changed:
                                       in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
                                         type size hasn't changed
                                         1 base class deletion:
@@ -101,26 +101,26 @@
                                         1 base class insertion:
                                           struct tbb::internal::padded<tbb::internal::unpadded_mail_outbox, 128ul> at tbb_stddef.h:251:1
                                         1 data member deletion:
-                                          'char tbb::internal::mail_outbox::pad[104]', at offset 136 (in bits) at mailbox.h:114:1
+                                          'char pad[104]', at offset 136 (in bits) at mailbox.h:114:1
                           1 member function deletion:
                             'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&, bool)' at scheduler.h:391:1, virtual at voffset 7/7
                           1 member function insertion:
                             'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&)' at scheduler.h:362:1, virtual at voffset 7/7
                           no member function changes (4 filtered);
                           3 data member deletions:
-                            'unsigned int tbb::internal::generic_scheduler::hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
-                            'volatile intptr_t* tbb::internal::generic_scheduler::my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
-                            'volatile uintptr_t* tbb::internal::generic_scheduler::my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
+                            'unsigned int hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
+                            'volatile intptr_t* my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
+                            'volatile uintptr_t* my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
                           18 data member changes:
-                            'uintptr_t tbb::internal::generic_scheduler::my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
-                            type of 'tbb::internal::market* tbb::internal::generic_scheduler::my_market' changed:
+                            'uintptr_t my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
+                            type of 'tbb::internal::market* my_market' changed:
                               in pointed to type 'class tbb::internal::market' at market.h:49:1:
                                 type size changed from 1664 to 1728 (in bits)
                                 no member function changes (8 filtered);
                                 1 data member insertion:
-                                  'bool tbb::internal::market::join_workers', at offset 384 (in bits) at market.h:88:1
+                                  'bool join_workers', at offset 384 (in bits) at market.h:88:1
                                 7 data member changes:
-                                  type of 'tbb::internal::market::arenas_list_mutex_type tbb::internal::market::my_arenas_list_mutex' changed:
+                                  type of 'tbb::internal::market::arenas_list_mutex_type my_arenas_list_mutex' changed:
                                     underlying type 'typedef tbb::internal::scheduler_mutex_type' at scheduler_common.h:123:1 changed:
                                       typedef name changed from tbb::internal::scheduler_mutex_type to tbb::spin_rw_mutex at spin_rw_mutex.h:38:1
                                       underlying type 'class tbb::spin_mutex' at spin_mutex.h:47:1 changed:
@@ -129,7 +129,7 @@
                                         1 base class insertion:
                                           class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
                                         1 data member change:
-                                          type of '__TBB_atomic_flag tbb::spin_mutex::flag' changed:
+                                          type of '__TBB_atomic_flag flag' changed:
                                             typedef name changed from __TBB_atomic_flag to tbb::spin_rw_mutex_v3::state_t at spin_rw_mutex.h:214:1
                                             underlying type 'typedef __TBB_Flag' at tbb_machine.h:875:1 changed:
                                               typedef name changed from __TBB_Flag to intptr_t at stdint.h:119:1
@@ -137,37 +137,37 @@
                                                 type name changed from 'unsigned char' to 'long int'
                                                 type size changed from 8 to 64 (in bits)
                                           and name of 'tbb::spin_mutex::flag' changed to 'tbb::spin_rw_mutex_v3::state' at spin_rw_mutex.h:224:1
-                                  'intptr_t tbb::internal::market::my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
-                                  'intptr_t tbb::internal::market::my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
-                                  'uintptr_t tbb::internal::market::my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
-                                  type of 'tbb::internal::market::priority_level_info tbb::internal::market::my_priority_levels[3]' changed:
+                                  'intptr_t my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
+                                  'intptr_t my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
+                                  'uintptr_t my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
+                                  type of 'tbb::internal::market::priority_level_info my_priority_levels[3]' changed:
                                     array element type 'struct tbb::internal::market::priority_level_info' changed:
                                       type size hasn't changed
                                       1 data member change:
-                                        type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed:
+                                        type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator next_arena' changed:
                                           entity changed from 'class tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator' to 'tbb::internal::arena*'
                                           type size hasn't changed
                                     type size hasn't changed
                                   and offset changed from 576 to 640 (in bits) (by +64 bits)
-                                  'uintptr_t tbb::internal::market::my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-                                  'tbb::internal::generic_scheduler* tbb::internal::market::my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+                                  'uintptr_t my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+                                  'tbb::internal::generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
                             and offset changed from 768 to 896 (in bits) (by +128 bits)
-                            'tbb::internal::FastRandom tbb::internal::generic_scheduler::my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                            'long int tbb::internal::generic_scheduler::my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
-                            'bool tbb::internal::generic_scheduler::my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
-                            'intptr_t tbb::internal::generic_scheduler::my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
-                            'char tbb::internal::generic_scheduler::_padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
-                            'tbb::internal::context_list_node_t tbb::internal::generic_scheduler::my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                            'tbb::spin_mutex tbb::internal::generic_scheduler::my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                            'uintptr_t tbb::internal::generic_scheduler::my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
-                            'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                            'uintptr_t tbb::internal::generic_scheduler::my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
-                            'volatile bool tbb::internal::generic_scheduler::my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
-                            'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
-                            '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
+                            'tbb::internal::FastRandom my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
+                            'tbb::task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                            'tbb::task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                            'long int my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
+                            'bool my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
+                            'intptr_t my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
+                            'tbb::task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
+                            'char _padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
+                            'tbb::internal::context_list_node_t my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                            'tbb::spin_mutex my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                            'uintptr_t my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
+                            'tbb::atomic<long unsigned int> my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                            'uintptr_t my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
+                            'volatile bool my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
+                            'tbb::atomic<long unsigned int> my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
+                            '__cilk_tbb_unwatch_thunk my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
 
     [C] 'method void tbb::internal::concurrent_queue_base::internal_pop(void*)' at concurrent_queue_v2.cpp:240:1 has some indirect sub-type changes:
       implicit parameter 0 of type 'tbb::internal::concurrent_queue_base* const' has sub-type changes:
@@ -180,14 +180,14 @@
               'method virtual tbb::internal::concurrent_queue_base::~concurrent_queue_base(int)' at concurrent_queue_v2.cpp:217:1
             no member function changes (4 filtered);
             1 data member change:
-              type of 'tbb::internal::concurrent_queue_rep* tbb::internal::concurrent_queue_base::my_rep' changed:
+              type of 'tbb::internal::concurrent_queue_rep* my_rep' changed:
                 in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue_v2.cpp:102:1:
                   type size hasn't changed
                   1 data member changes (2 filtered):
-                    type of 'tbb::internal::concurrent_monitor tbb::internal::concurrent_queue_rep::items_avail' changed:
+                    type of 'tbb::internal::concurrent_monitor items_avail' changed:
                       type size hasn't changed
                       1 data member change:
-                        'tbb::spin_mutex tbb::internal::concurrent_monitor::mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
+                        'tbb::spin_mutex mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
 
     [C] 'method tbb::internal::concurrent_queue_iterator_base_v3::concurrent_queue_iterator_base_v3(const tbb::internal::concurrent_queue_base_v3&)' at concurrent_queue.cpp:622:1 has some indirect sub-type changes:
       parameter 1 of type 'const tbb::internal::concurrent_queue_base_v3&' has sub-type changes:
@@ -201,7 +201,7 @@
             in unqualified underlying type 'struct tbb::internal::hash_map_segment_base' at concurrent_hash_map.cpp:27:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::internal::hash_map_segment_base::segment_mutex_t tbb::internal::hash_map_segment_base::my_mutex' changed:
+                type of 'tbb::internal::hash_map_segment_base::segment_mutex_t my_mutex' changed:
                   underlying type 'typedef tbb::spin_rw_mutex' at spin_rw_mutex.h:39:1 changed:
                     underlying type 'class tbb::spin_rw_mutex_v3' at spin_rw_mutex.h:43:1 changed:
                       type size hasn't changed
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 dcd30874..18193d8c 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
@@ -33,13 +33,13 @@
             in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::task_group_context& tbb::internal::allocate_root_with_context_proxy::my_context' changed:
+                type of 'tbb::task_group_context& my_context' changed:
                   in referenced type 'class tbb::task_group_context' at task.h:302:1:
                     type size hasn't changed
                     1 data member insertion:
-                      'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
+                      'tbb::internal::cpu_ctl_env_space my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
                     1 data member changes (2 filtered):
-                      type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+                      type of 'char _leading_padding[80]' changed:
                         type name changed from 'char[80]' to 'char[72]'
                         array type size changed from 640 to 576
                         array type subrange 1 changed length from 80 to 72
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 431c891a..a0c45d8c 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
@@ -11,5 +11,5 @@ SONAME changed from 'test48-soname-abixml-v0' to 'test48-soname-abixml-v1'
       in pointed to type 'struct S' at test48-soname-abixml-v1.c:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test48-soname-abixml-v1.c:4:1
+          'char m1', at offset 32 (in bits) at test48-soname-abixml-v1.c:4:1
 
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 b5b4afe7..35b2c40a 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe7..35b2c40a 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe7..35b2c40a 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe7..35b2c40a 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 e5c0b813..010ebfbc 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char b_type::m_char', at offset 0 (in bits)
+          'char m_char', at offset 0 (in bits)
         1 data member change:
-          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 1 of type 'a_type*' has sub-type changes:
@@ -18,7 +18,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct a_type' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char a_type::m_char', at offset 0 (in bits)
+            'char m_char', at offset 0 (in bits)
           1 data member change:
-            'int a_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 e4021ae2..f325cc7e 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char b_type::m_char', at offset 0 (in bits)
+          'char m_char', at offset 0 (in bits)
         1 data member change:
-          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 4a6ff721..8e5cd6a4 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 8 to 64 (in bits)
         2 data member insertions:
-          'char S::m1', at offset 8 (in bits)
-          'int S::m2', at offset 32 (in bits)
+          'char m1', at offset 8 (in bits)
+          'int m2', at offset 32 (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 cd301b58..d7456d7e 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
         2 data member insertions:
-          'char S::m_inserted1', at offset 8 (in bits)
-          'char S::m_inserted2', at offset 64 (in bits)
+          'char m_inserted1', at offset 8 (in bits)
+          'char m_inserted2', at offset 64 (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 cd301b58..d7456d7e 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
         2 data member insertions:
-          'char S::m_inserted1', at offset 8 (in bits)
-          'char S::m_inserted2', at offset 64 (in bits)
+          'char m_inserted1', at offset 8 (in bits)
+          'char m_inserted2', at offset 64 (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 baf711f4..f408f2dd 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
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 270ec1fc..ae1b41d5 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m1', at offset 32 (in bits)
+        'char m1', at offset 32 (in bits)
 
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 ddea8503..f5dff29b 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 86d49d12..c844866f 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 4eaba5b7..3f9c6fc7 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 83dfe326..de11f9c1 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 4eaba5b7..3f9c6fc7 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 b28fbd16..59592e3d 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (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 1a826c1b..5cc0afa8 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (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 b28fbd16..59592e3d 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (in 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 6965a151..b4a8507f 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
       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)
+          'char m1', at offset 32 (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 deabb7b3..b814eb5c 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) variab
       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)
+          'char m1', at offset 32 (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 6965a151..b4a8507f 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
       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)
+          'char m1', at offset 32 (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 3edf2bd1..894d78d5 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
@@ -12,5 +12,5 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
       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)
+          'char m1', at offset 32 (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 2e375388..feba3aac 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed (1 filtered out), 1 Changed, 0 Added variab
       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)
+          'char m1', at offset 32 (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 3edf2bd1..894d78d5 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
@@ -12,5 +12,5 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
       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)
+          'char m1', at offset 32 (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 cb8a2198..49d95757 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 0788d489..754de657 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
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct S' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::inserted_member', at offset 0 (in bits)
+            'char inserted_member', at offset 0 (in bits)
           1 data member change:
-            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 0788d489..754de657 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
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct S' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::inserted_member', at offset 0 (in bits)
+            'char inserted_member', at offset 0 (in bits)
           1 data member change:
-            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-1.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-1.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-10.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-10.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-12.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-12.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-14.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-14.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-16.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-16.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed4..998b412a 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-4.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-4.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 e93b16ca..ad78fc7b 100644
--- a/tests/data/test-diff-suppr/test25-typedef-report-0.txt
+++ b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
@@ -9,7 +9,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct PrivateType0' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char PrivateType0::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (in bits)
 
   [C] 'function void baz(TypePtr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef TypePtr' has sub-type changes:
@@ -17,5 +17,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct PrivateType1':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char PrivateType1::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (in bits)
 
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 6a7f2fad..2556ae3d 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::added_member', at offset 32 (in bits)
+          'char added_member', at offset 32 (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 6a7f2fad..2556ae3d 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::added_member', at offset 32 (in bits)
+          'char added_member', at offset 32 (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 162ed9a6..17590436 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-3.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-3.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 162ed9a6..17590436 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-6.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-6.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 162ed9a6..17590436 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-8.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-8.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 d06b2c00..d8ca364a 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
@@ -8,14 +8,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
     parameter 2 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 70d4a5c8..b2bcb44d 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 96c07865..e5b45eab 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index 79b6cd7f..7c853087 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -22,9 +22,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'S::priv_type* S::priv' changed:
+          type of 'S::priv_type* priv' changed:
             in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
               type size changed from 64 to 128 (in bits)
               1 data member insertion:
-                'int S::priv_type::member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
+                'int member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
 
diff --git a/tests/data/test-diff-suppr/test31-report-1.txt b/tests/data/test-diff-suppr/test31-report-1.txt
index 95e78c65..404cef7c 100644
--- a/tests/data/test-diff-suppr/test31-report-1.txt
+++ b/tests/data/test-diff-suppr/test31-report-1.txt
@@ -9,5 +9,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct hidden::S0':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char hidden::S0::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (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 07f68123..0019f9a8 100644
--- a/tests/data/test-diff-suppr/test33-report-0.txt
+++ b/tests/data/test-diff-suppr/test33-report-0.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class to_keep':
         type size changed from 8 to 32 (in bits)
         1 data member insertion:
-          'int to_keep::member1', at offset 0 (in bits)
+          'int member1', at offset 0 (in bits)
 
diff --git a/tests/data/test-diff-suppr/test35-leaf-report-0.txt b/tests/data/test-diff-suppr/test35-leaf-report-0.txt
index 244455ae..f9498333 100644
--- a/tests/data/test-diff-suppr/test35-leaf-report-0.txt
+++ b/tests/data/test-diff-suppr/test35-leaf-report-0.txt
@@ -6,6 +6,6 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf at test35-leaf-v0.cc:5:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf::m1', at offset 32 (in bits) at test35-leaf-v1.cc:8:1
+    'char m1', at offset 32 (in bits) at test35-leaf-v1.cc:8:1
   one impacted interface:
     function void fn(C&)
diff --git a/tests/data/test-diff-suppr/test36-leaf-report-0.txt b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
index fcbb9232..f5bb5994 100644
--- a/tests/data/test-diff-suppr/test36-leaf-report-0.txt
+++ b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
@@ -6,7 +6,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf1 at test36-leaf-v0.cc:4:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf1::m1', at offset 32 (in bits) at test36-leaf-v1.cc:7:1
+    'char m1', at offset 32 (in bits) at test36-leaf-v1.cc:7:1
   3 impacted interfaces:
     function void interface1(struct_type*)
     function void interface2(struct_type&)
@@ -16,7 +16,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
   type size changed from 64 to 96 (in bits)
   there are data member changes:
     type 'struct leaf1' of 'leaf2::member0' changed, as reported earlier
-    'char leaf2::member1' offset changed from 32 to 64 (in bits) (by +32 bits)
+    'char member1' offset changed from 32 to 64 (in bits) (by +32 bits)
   3 impacted interfaces:
     function void interface1(struct_type*)
     function void interface2(struct_type&)
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 795ae553..c2924247 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
@@ -8,17 +8,17 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'unsigned int public_type::oops', at offset 0 (in bits)
+          'unsigned int oops', at offset 0 (in bits)
         1 data member change:
-          type of 'private_data* public_type::priv_' changed:
+          type of 'private_data* priv_' changed:
             in pointed to type 'struct private_data':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char private_data::private_data1', at offset 32 (in bits)
+                'char private_data1', at offset 32 (in bits)
           and offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char a_not_private_type::j', at offset 32 (in bits)
+          'char j', at offset 32 (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 b8c10090..5c535e2f 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
@@ -8,12 +8,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'unsigned int public_type::oops', at offset 0 (in bits)
+          'unsigned int oops', at offset 0 (in bits)
         1 data member change:
-          'private_data* public_type::priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'private_data* priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char a_not_private_type::j', at offset 32 (in bits)
+          'char j', at offset 32 (in bits)
 
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 5a0aec33..4597f3cb 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     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:
-        'char type_to_keep::m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
+        'char m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
 
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 5a0aec33..4597f3cb 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     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:
-        'char type_to_keep::m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
+        'char m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
 
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
index acff860c..bf643fd1 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
@@ -13,4 +13,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
       entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
       type size changed from 64 to 192 (in bits)
-    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    'perf_domain* pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
index 79827103..d708a343 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
@@ -9,4 +9,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
       entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
       type size changed from 64 to 192 (in bits)
-    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    'perf_domain* pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
index 8f651743..61323766 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
@@ -11,7 +11,7 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
index 33e9ba01..047cbd5c 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
@@ -7,7 +7,7 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
index f2dc1ab1..e53121ce 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
@@ -11,5 +11,5 @@ Unreachable types summary: 1 removed, 1 changed, 0 added (1 filtered out) types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
index a2d41a32..3ffab280 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
@@ -13,7 +13,7 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
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 4cdf875d..0776abfe 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
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 bb8ff0b7..9c00fe70 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 bb8ff0b7..9c00fe70 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 bb8ff0b7..9c00fe70 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 723c025f..ac99550a 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 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 bb8ff0b7..9c00fe70 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 03f89b72..8bcb277c 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,5 +29,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base at test6-fn-suppr-v1.cc:4:1
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 3e54f609..c0d52def 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,5 +29,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd2..43de5ac1 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd2..43de5ac1 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd2..43de5ac1 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 094b4903..caa7c52c 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,5 +19,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3cce1b35..acbaf39f 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
@@ -8,16 +8,16 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3d8ac40f..2823d1b4 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e604..18f5297b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3d8ac40f..2823d1b4 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e604..18f5297b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e604..18f5297b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3cce1b35..acbaf39f 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
@@ -8,16 +8,16 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 ddea8503..f5dff29b 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 9b7599d0..21dec527 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
-- 
2.30.0.280.ga3ce27912f-goog


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] abidiff: do not qualify member names in diff report
  2021-01-27 12:08 ` [PATCH 1/1] abidiff: do not qualify member " Giuliano Procida
@ 2021-02-08 16:26   ` Dodji Seketeli
  0 siblings, 0 replies; 3+ messages in thread
From: Dodji Seketeli @ 2021-02-08 16:26 UTC (permalink / raw)
  To: Giuliano Procida; +Cc: libabigail, kernel-team, maennich

Giuliano Procida <gprocida@google.com> a écrit:

> Bug 26012 - abidiff: do not emit qualified name for data members
>
> The enclosing struct (or union or class) is given by the surrounding
> diff context. This change eliminates a lot of repetition in the diff
> report.

[...]

>
> Signed-off-by: Giuliano Procida <gprocida@google.com>

Applied to master, thanks for working on this.

I just diid some little tweaks to resolve some minor conflicts in some
test output files and refresh some test outputs that needed it.

I did some cosmetic change that we tend to do for function calls with
boolean flags, basically, just adding a comment to know the name of the
parameter the flag is an argument of: e.g:

[...]

> --- a/src/abg-reporter-priv.cc
> +++ b/src/abg-reporter-priv.cc
> @@ -239,7 +239,7 @@ represent_data_member(var_decl_sptr d,
>        || (!get_member_is_static(d) && !get_data_member_is_laid_out(d)))
>      return;
>  
> -  out << indent << "'" << d->get_pretty_representation() << "'";
> +  out << indent << "'" << d->get_pretty_representation(false, false) << "'";
>    if (!get_member_is_static(d))
>      {
>        // Do not emit offset information for data member of a union
> @@ -405,7 +405,8 @@ represent(const var_diff_sptr	&diff,
>    const uint64_t n_size = get_var_size_in_bits(n);
>    const uint64_t o_offset = get_data_member_offset(o);
>    const uint64_t n_offset = get_data_member_offset(n);
> -  const string o_pretty_representation = o->get_pretty_representation();
> +  const string o_pretty_representation =
> +    o->get_pretty_representation(false, false);
>    // no n_pretty_representation here as it's only needed in a couple of places
>    const bool show_size_offset_changes = ctxt->get_allowed_category()
>  					& SIZE_OR_OFFSET_CHANGE_CATEGORY;
> @@ -432,7 +433,8 @@ represent(const var_diff_sptr	&diff,
>  
>    if (is_strict_anonymous_data_member_change)
>      {
> -      const string n_pretty_representation = n->get_pretty_representation();
> +      const string n_pretty_representation =
> +	n->get_pretty_representation(false, false);
>        const type_base_sptr o_type = o->get_type(), n_type = n->get_type();
>        if (o_pretty_representation != n_pretty_representation)
>  	{
> @@ -472,7 +474,8 @@ represent(const var_diff_sptr	&diff,
>        ABG_ASSERT(o_anon != n_anon);
>        // So we are looking at a non-anonymous data member change from
>        // or to an anonymous data member.
> -      const string n_pretty_representation = n->get_pretty_representation();
> +      const string n_pretty_representation =
> +	n->get_pretty_representation(false, false);
>        out << indent << (o_anon ? "anonymous " : "")
>  	  << "data member " << o_pretty_representation;
>        show_offset_or_size(" at offset", o_offset, *ctxt, out);


The hunks above have been changed by this one below:

diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 1a7f09d..396f95c 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -239,7 +239,11 @@ represent_data_member(var_decl_sptr d,
       || (!get_member_is_static(d) && !get_data_member_is_laid_out(d)))
     return;
 
-  out << indent << "'" << d->get_pretty_representation() << "'";
+  out << indent
+      << "'"
+      << d->get_pretty_representation(/*internal=*/false,
+				      /*qualified_name=*/false)
+      << "'";
   if (!get_member_is_static(d))
     {
       // Do not emit offset information for data member of a union
@@ -405,7 +409,8 @@ represent(const var_diff_sptr	&diff,
   const uint64_t n_size = get_var_size_in_bits(n);
   const uint64_t o_offset = get_data_member_offset(o);
   const uint64_t n_offset = get_data_member_offset(n);
-  const string o_pretty_representation = o->get_pretty_representation();
+  const string o_pretty_representation =
+    o->get_pretty_representation(/*internal=*/false, /*qualified_name=*/false);
   // no n_pretty_representation here as it's only needed in a couple of places
   const bool show_size_offset_changes = ctxt->get_allowed_category()
 					& SIZE_OR_OFFSET_CHANGE_CATEGORY;
@@ -432,7 +437,9 @@ represent(const var_diff_sptr	&diff,
 
   if (is_strict_anonymous_data_member_change)
     {
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(/*internal=*/false,
+				     /*qualified_name=*/false);
       const type_base_sptr o_type = o->get_type(), n_type = n->get_type();
       if (o_pretty_representation != n_pretty_representation)
 	{
@@ -472,7 +479,9 @@ represent(const var_diff_sptr	&diff,
       ABG_ASSERT(o_anon != n_anon);
       // So we are looking at a non-anonymous data member change from
       // or to an anonymous data member.
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(/*internal=*/false,
+				     /*qualified_name=*/false);
       out << indent << (o_anon ? "anonymous " : "")
 	  << "data member " << o_pretty_representation;
       show_offset_or_size(" at offset", o_offset, *ctxt, out);

[...]


I am this attaching below the applied patch.

From 89de572d7bc489ebd8619069d36c81d162457487 Mon Sep 17 00:00:00 2001
From: Giuliano Procida <gprocida@google.com>
Date: Wed, 27 Jan 2021 12:08:43 +0000
Subject: [PATCH] abidiff: do not qualify member names in diff report

Bug 26012 - abidiff: do not emit qualified name for data members

The enclosing struct (or union or class) is given by the surrounding
diff context. This change eliminates a lot of repetition in the diff
report.

	* src/abg-reporter-priv.cc (represent_data_member): Do not
	qualify member names. (represent): Do not qualify member names.
	* tests/data/test-abicompat/test0-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test0-fn-changed-report-2.txt: Refresh.
	* tests/data/test-abicompat/test5-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test5-fn-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test6-var-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test6-var-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-1.txt: Refresh.
	* tests/data/test-abicompat/test7-fn-changed-report-2.txt: Refresh.
	* tests/data/test-abicompat/test8-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abicompat/test9-fn-changed-report-0.txt: Refresh.
	* tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-fun-param-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt:
	Refresh.
	* tests/data/test-abidiff-exit/test-leaf-peeling-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-leaf-redundant-report.txt: Refresh.
	* tests/data/test-abidiff-exit/test-member-size-report0.txt: Refresh.
	* tests/data/test-abidiff-exit/test-member-size-report1.txt: Refresh.
	* tests/data/test-abidiff-exit/test-net-change-report0.txt: Refresh.
	* tests/data/test-abidiff/test-PR18791-report0.txt: Refresh.
	* tests/data/test-abidiff/test-qual-type0-report.txt: Refresh.
	* tests/data/test-abidiff/test-struct0-report.txt: Refresh.
	* tests/data/test-abidiff/test-struct1-report.txt: Refresh.
	* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test0-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test1-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test10-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test11-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test13-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test21-redundant-fn-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test27-local-base-diff-report.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test3-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test36-ppc64-aliases-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test37-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test38-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test39-union-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test4-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test40-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test44-anon-struct-union-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test45-anon-dm-change-report-0.txt:
	Refresh.
	* tests/data/test-diff-dwarf/test46-rust-report-0.txt: Refresh.
	* tests/data/test-diff-dwarf/test5-report.txt: Refresh.
	* tests/data/test-diff-dwarf/test8-report.txt: Refresh.
	* tests/data/test-diff-filter/libtest45-basic-type-change-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test-PR26739-2-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test0-report.txt: Refresh.
	* tests/data/test-diff-filter/test01-report.txt: Refresh.
	* tests/data/test-diff-filter/test1-report.txt: Refresh.
	* tests/data/test-diff-filter/test10-report.txt: Refresh.
	* tests/data/test-diff-filter/test11-report.txt: Refresh.
	* tests/data/test-diff-filter/test13-report.txt: Refresh.
	* tests/data/test-diff-filter/test14-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test14-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test15-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test15-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test16-report-2.txt: Refresh.
	* tests/data/test-diff-filter/test16-report.txt: Refresh.
	* tests/data/test-diff-filter/test17-0-report.txt: Refresh.
	* tests/data/test-diff-filter/test17-1-report.txt: Refresh.
	* tests/data/test-diff-filter/test18-report.txt: Refresh.
	* tests/data/test-diff-filter/test2-report.txt: Refresh.
	* tests/data/test-diff-filter/test25-cyclic-type-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test25-cyclic-type-report-1.txt: Refresh.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test27-redundant-and-filtered-children-nodes-report-2.txt:
	Refresh.
	* tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test28-redundant-and-filtered-children-nodes-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test29-finer-redundancy-marking-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test3-report.txt: Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt:
	Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt:
	Refresh.
	* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt:
	Refresh.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test32-ppc64le-struct-change-report0.txt:
	Refresh.
	* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test36-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test37-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test39/test39-report-0.txt: Refresh.
	* tests/data/test-diff-filter/test42-leaf-report-output-0.txt: Refresh.
	* tests/data/test-diff-filter/test44-anonymous-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt:
	Refresh.
	* tests/data/test-diff-filter/test9-report.txt: Refresh.
	* tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-1-report-1.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-3-report-1.txt: Refresh.
	* tests/data/test-diff-pkg/dirpkg-3-report-2.txt: Refresh.
	* 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:
	Refresh.
	* tests/data/test-diff-pkg/libcdio-0.94-1.fc26.x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt:
	Refresh.
	* 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:
	Refresh.
	* tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
	Refresh.
	* tests/data/test-diff-pkg/symlink-dir-test1-report0.txt: Refresh.
	* tests/data/test-diff-pkg/tarpkg-0-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/tarpkg-1-report-0.txt: Refresh.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt:
	Refresh.
	* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/libtest48-soname-abixml-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-5.txt: Refresh.
	* tests/data/test-diff-suppr/test0-type-suppr-report-7.txt: Refresh.
	* tests/data/test-diff-suppr/test1-typedef-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test1-typedef-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test11-add-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test12-add-data-member-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test12-add-data-member-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test13-suppr-through-pointer-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test13-suppr-through-pointer-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test14-suppr-non-redundant-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test14-suppr-non-redundant-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test17-suppr-added-var-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test18-suppr-removed-var-report-5.txt:
	Refresh.
	* tests/data/test-diff-suppr/test2-struct-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test23-alias-filter-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test23-alias-filter-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-10.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-12.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-14.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-16.txt: Refresh.
	* tests/data/test-diff-suppr/test24-soname-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test25-typedef-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test26-loc-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test26-loc-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-6.txt: Refresh.
	* tests/data/test-diff-suppr/test29-soname-report-8.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test3-struct-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test30-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test31-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test33-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test35-leaf-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test36-leaf-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test4-local-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test4-local-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test42-negative-suppr-type-report-0.txt:
	Refresh.
	* tests/data/test-diff-suppr/test42-negative-suppr-type-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test46-PR25128-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test46-PR25128-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt:
	Refresh.
	* tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt:
	Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test5-fn-suppr-report-5.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-0-1.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test6-fn-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-1.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-2.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-3.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-4.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-7.txt: Refresh.
	* tests/data/test-diff-suppr/test7-var-suppr-report-8.txt: Refresh.
	* tests/data/test-diff-suppr/test8-redundant-fn-report-0.txt: Refresh.
	* tests/data/test-diff-suppr/test8-redundant-fn-report-1.txt: Refresh.

Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 src/abg-reporter-priv.cc                           |  17 +-
 .../test-abicompat/test0-fn-changed-report-0.txt   |   6 +-
 .../test-abicompat/test0-fn-changed-report-2.txt   |   6 +-
 .../test-abicompat/test5-fn-changed-report-0.txt   |   4 +-
 .../test-abicompat/test5-fn-changed-report-1.txt   |   4 +-
 .../test-abicompat/test6-var-changed-report-0.txt  |   4 +-
 .../test-abicompat/test6-var-changed-report-1.txt  |   4 +-
 .../test-abicompat/test7-fn-changed-report-0.txt   |   2 +-
 .../test-abicompat/test7-fn-changed-report-1.txt   |   2 +-
 .../test-abicompat/test7-fn-changed-report-2.txt   |   2 +-
 .../test-abicompat/test8-fn-changed-report-0.txt   |   2 +-
 .../test-abicompat/test9-fn-changed-report-0.txt   |   2 +-
 .../qualifier-typedef-array-report-1.txt           |  24 +-
 .../test-abidiff-exit/test-fun-param-report.txt    |   2 +-
 .../test-headers-dir-report-2.txt                  |   2 +-
 .../test-leaf-cxx-members-report.txt               |   4 +-
 .../test-abidiff-exit/test-leaf-peeling-report.txt |   2 +-
 .../test-leaf-redundant-report.txt                 |   2 +-
 .../test-abidiff-exit/test-member-size-report0.txt |   8 +-
 .../test-abidiff-exit/test-member-size-report1.txt |   6 +-
 .../test-abidiff-exit/test-net-change-report0.txt  |   2 +-
 tests/data/test-abidiff/test-PR18791-report0.txt   |  28 +-
 tests/data/test-abidiff/test-qual-type0-report.txt |   2 +-
 tests/data/test-abidiff/test-struct0-report.txt    |   4 +-
 tests/data/test-abidiff/test-struct1-report.txt    |   8 +-
 .../PR25058-liblttng-ctl-report-1.txt              |  52 +--
 tests/data/test-diff-dwarf/test0-report.txt        |   4 +-
 tests/data/test-diff-dwarf/test1-report.txt        |   4 +-
 tests/data/test-diff-dwarf/test10-report.txt       |   4 +-
 tests/data/test-diff-dwarf/test11-report.txt       |   4 +-
 tests/data/test-diff-dwarf/test13-report.txt       |   6 +-
 .../test21-redundant-fn-report-0.txt               |   2 +-
 .../test27-local-base-diff-report.txt              |   4 +-
 tests/data/test-diff-dwarf/test3-report.txt        |   2 +-
 .../test32-fnptr-changes-report-0.txt              |   6 +-
 .../test33-fnref-changes-report-0.txt              |   6 +-
 .../test36-ppc64-aliases-report-0.txt              |   2 +-
 .../data/test-diff-dwarf/test37-union-report-0.txt |   2 +-
 .../data/test-diff-dwarf/test38-union-report-0.txt |   2 +-
 .../data/test-diff-dwarf/test39-union-report-0.txt |   4 +-
 tests/data/test-diff-dwarf/test4-report.txt        |   2 +-
 tests/data/test-diff-dwarf/test40-report-0.txt     |  14 +-
 .../test44-anon-struct-union-report-0.txt          |   2 +-
 .../test45-anon-dm-change-report-0.txt             |   6 +-
 .../data/test-diff-dwarf/test46-rust-report-0.txt  |   2 +-
 tests/data/test-diff-dwarf/test5-report.txt        |   2 +-
 tests/data/test-diff-dwarf/test8-report.txt        |   4 +-
 .../libtest45-basic-type-change-report-0.txt       |   6 +-
 .../test-diff-filter/test-PR26739-2-report-0.txt   |   2 +-
 .../test-diff-filter/test-PR27331-report-0.txt     |   2 +-
 tests/data/test-diff-filter/test0-report.txt       |   6 +-
 tests/data/test-diff-filter/test01-report.txt      |   6 +-
 tests/data/test-diff-filter/test1-report.txt       |   4 +-
 tests/data/test-diff-filter/test10-report.txt      |   2 +-
 tests/data/test-diff-filter/test11-report.txt      |   2 +-
 tests/data/test-diff-filter/test13-report.txt      |   2 +-
 tests/data/test-diff-filter/test14-0-report.txt    |   2 +-
 tests/data/test-diff-filter/test14-1-report.txt    |   2 +-
 tests/data/test-diff-filter/test15-0-report.txt    |   2 +-
 tests/data/test-diff-filter/test15-1-report.txt    |   2 +-
 tests/data/test-diff-filter/test16-report-2.txt    |   4 +-
 tests/data/test-diff-filter/test16-report.txt      |   4 +-
 tests/data/test-diff-filter/test17-0-report.txt    |   4 +-
 tests/data/test-diff-filter/test17-1-report.txt    |   4 +-
 tests/data/test-diff-filter/test18-report.txt      |   2 +-
 tests/data/test-diff-filter/test2-report.txt       |   8 +-
 .../test25-cyclic-type-report-0.txt                |   2 +-
 .../test25-cyclic-type-report-1.txt                |   4 +-
 .../test26-qualified-redundant-node-report-0.txt   |   4 +-
 .../test26-qualified-redundant-node-report-1.txt   |   6 +-
 ...undant-and-filtered-children-nodes-report-0.txt |   2 +-
 ...undant-and-filtered-children-nodes-report-1.txt |   4 +-
 ...undant-and-filtered-children-nodes-report-2.txt |   8 +-
 ...undant-and-filtered-children-nodes-report-0.txt |   2 +-
 ...undant-and-filtered-children-nodes-report-1.txt |   2 +-
 .../test29-finer-redundancy-marking-report-0.txt   |   4 +-
 tests/data/test-diff-filter/test3-report.txt       |   4 +-
 .../test30-pr18904-rvalueref-report0.txt           | 108 ++---
 .../test30-pr18904-rvalueref-report1.txt           | 108 ++---
 .../test30-pr18904-rvalueref-report2.txt           | 108 ++---
 .../test31-pr18535-libstdc++-report-0.txt          |  20 +-
 .../test31-pr18535-libstdc++-report-1.txt          |  20 +-
 .../test32-ppc64le-struct-change-report0.txt       |   2 +-
 .../test35-pr18754-no-added-syms-report-0.txt      | 108 ++---
 tests/data/test-diff-filter/test36-report-0.txt    |   6 +-
 tests/data/test-diff-filter/test37-report-0.txt    |   6 +-
 .../test-diff-filter/test39/test39-report-0.txt    |   8 +-
 .../test42-leaf-report-output-0.txt                |   2 +-
 .../test44-anonymous-data-member-report-0.txt      |   2 +-
 .../test44-anonymous-data-member-report-1.txt      |   2 +-
 tests/data/test-diff-filter/test9-report.txt       |   2 +-
 ...fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt |  12 +-
 .../test-diff-pkg/PR24690/PR24690-report-0.txt     |  10 +-
 tests/data/test-diff-pkg/dirpkg-1-report-1.txt     |   2 +-
 tests/data/test-diff-pkg/dirpkg-3-report-1.txt     |   2 +-
 tests/data/test-diff-pkg/dirpkg-3-report-2.txt     |   2 +-
 ...rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt |  12 +-
 ...x86_64--libcdio-0.94-2.fc26.x86_64-report.1.txt |  20 +-
 ...igc++-2.0-0v5_2.4.1-1ubuntu2_amd64-report-0.txt |  24 +-
 .../nss-3.23.0-1.0.fc23.x86_64-report-0.txt        |  14 +-
 ...-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt | 494 ++++++++++-----------
 .../test-diff-pkg/symlink-dir-test1-report0.txt    |   2 +-
 tests/data/test-diff-pkg/tarpkg-0-report-0.txt     |   2 +-
 tests/data/test-diff-pkg/tarpkg-1-report-0.txt     |   2 +-
 ...64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt |  96 ++--
 ...64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt |   6 +-
 .../libtest48-soname-abixml-report-1.txt           |   2 +-
 .../test-diff-suppr/test0-type-suppr-report-0.txt  |   4 +-
 .../test-diff-suppr/test0-type-suppr-report-3.txt  |   4 +-
 .../test-diff-suppr/test0-type-suppr-report-5.txt  |   4 +-
 .../test-diff-suppr/test0-type-suppr-report-7.txt  |   4 +-
 .../test1-typedef-suppr-report-0.txt               |   8 +-
 .../test1-typedef-suppr-report-2.txt               |   4 +-
 .../test11-add-data-member-report-0.txt            |   4 +-
 .../test12-add-data-member-report-0.txt            |   4 +-
 .../test12-add-data-member-report-2.txt            |   4 +-
 .../test13-suppr-through-pointer-report-0.txt      |   2 +-
 .../test13-suppr-through-pointer-report-1.txt      |   2 +-
 .../test14-suppr-non-redundant-report-0.txt        |   2 +-
 .../test14-suppr-non-redundant-report-1.txt        |   2 +-
 .../test15-suppr-added-fn-report-0.txt             |   2 +-
 .../test15-suppr-added-fn-report-1.txt             |   2 +-
 .../test15-suppr-added-fn-report-5.txt             |   2 +-
 .../test16-suppr-removed-fn-report-0.txt           |   2 +-
 .../test16-suppr-removed-fn-report-2.txt           |   2 +-
 .../test16-suppr-removed-fn-report-5.txt           |   2 +-
 .../test17-suppr-added-var-report-0.txt            |   2 +-
 .../test17-suppr-added-var-report-2.txt            |   2 +-
 .../test17-suppr-added-var-report-5.txt            |   2 +-
 .../test18-suppr-removed-var-report-0.txt          |   2 +-
 .../test18-suppr-removed-var-report-2.txt          |   2 +-
 .../test18-suppr-removed-var-report-5.txt          |   2 +-
 .../test2-struct-suppr-report-0.txt                |   4 +-
 .../test23-alias-filter-report-0.txt               |   4 +-
 .../test23-alias-filter-report-2.txt               |   4 +-
 .../test-diff-suppr/test24-soname-report-1.txt     |   2 +-
 .../test-diff-suppr/test24-soname-report-10.txt    |   2 +-
 .../test-diff-suppr/test24-soname-report-12.txt    |   2 +-
 .../test-diff-suppr/test24-soname-report-14.txt    |   2 +-
 .../test-diff-suppr/test24-soname-report-16.txt    |   2 +-
 .../test-diff-suppr/test24-soname-report-4.txt     |   2 +-
 .../test-diff-suppr/test25-typedef-report-0.txt    |   4 +-
 .../test-diff-suppr/test26-loc-suppr-report-0.txt  |   2 +-
 .../test-diff-suppr/test26-loc-suppr-report-3.txt  |   2 +-
 .../test-diff-suppr/test29-soname-report-3.txt     |   2 +-
 .../test-diff-suppr/test29-soname-report-6.txt     |   2 +-
 .../test-diff-suppr/test29-soname-report-8.txt     |   2 +-
 .../test3-struct-suppr-report-0.txt                |   8 +-
 .../test3-struct-suppr-report-1.txt                |   4 +-
 .../test3-struct-suppr-report-2.txt                |   4 +-
 tests/data/test-diff-suppr/test30-report-0.txt     |   4 +-
 tests/data/test-diff-suppr/test31-report-1.txt     |   2 +-
 tests/data/test-diff-suppr/test33-report-0.txt     |   2 +-
 .../data/test-diff-suppr/test35-leaf-report-0.txt  |   2 +-
 .../data/test-diff-suppr/test36-leaf-report-0.txt  |   4 +-
 .../test-diff-suppr/test4-local-suppr-report-0.txt |   8 +-
 .../test-diff-suppr/test4-local-suppr-report-1.txt |   6 +-
 .../test42-negative-suppr-type-report-0.txt        |   2 +-
 .../test42-negative-suppr-type-report-1.txt        |   2 +-
 .../test-diff-suppr/test46-PR25128-report-1.txt    |   2 +-
 .../test-diff-suppr/test46-PR25128-report-2.txt    |   2 +-
 .../test47-non-reachable-types-report-1.txt        |   2 +-
 .../test47-non-reachable-types-report-2.txt        |   2 +-
 .../test47-non-reachable-types-report-4.txt        |   2 +-
 .../test47-non-reachable-types-report-7.txt        |   2 +-
 .../test-diff-suppr/test5-fn-suppr-report-0.txt    |   4 +-
 .../test-diff-suppr/test5-fn-suppr-report-1.txt    |   4 +-
 .../test-diff-suppr/test5-fn-suppr-report-2.txt    |   4 +-
 .../test-diff-suppr/test5-fn-suppr-report-3.txt    |   4 +-
 .../test-diff-suppr/test5-fn-suppr-report-4.txt    |   4 +-
 .../test-diff-suppr/test5-fn-suppr-report-5.txt    |   4 +-
 .../test-diff-suppr/test6-fn-suppr-report-0-1.txt  |   6 +-
 .../test-diff-suppr/test6-fn-suppr-report-0.txt    |   6 +-
 .../test-diff-suppr/test6-fn-suppr-report-1.txt    |   4 +-
 .../test-diff-suppr/test6-fn-suppr-report-2.txt    |   4 +-
 .../test-diff-suppr/test6-fn-suppr-report-3.txt    |   4 +-
 .../test-diff-suppr/test6-fn-suppr-report-4.txt    |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-0.txt   |   8 +-
 .../test-diff-suppr/test7-var-suppr-report-1.txt   |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-2.txt   |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-3.txt   |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-4.txt   |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-7.txt   |   4 +-
 .../test-diff-suppr/test7-var-suppr-report-8.txt   |   8 +-
 .../test8-redundant-fn-report-0.txt                |   2 +-
 .../test8-redundant-fn-report-1.txt                |   2 +-
 186 files changed, 934 insertions(+), 925 deletions(-)

diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 1a7f09d..396f95c 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -239,7 +239,11 @@ represent_data_member(var_decl_sptr d,
       || (!get_member_is_static(d) && !get_data_member_is_laid_out(d)))
     return;
 
-  out << indent << "'" << d->get_pretty_representation() << "'";
+  out << indent
+      << "'"
+      << d->get_pretty_representation(/*internal=*/false,
+				      /*qualified_name=*/false)
+      << "'";
   if (!get_member_is_static(d))
     {
       // Do not emit offset information for data member of a union
@@ -405,7 +409,8 @@ represent(const var_diff_sptr	&diff,
   const uint64_t n_size = get_var_size_in_bits(n);
   const uint64_t o_offset = get_data_member_offset(o);
   const uint64_t n_offset = get_data_member_offset(n);
-  const string o_pretty_representation = o->get_pretty_representation();
+  const string o_pretty_representation =
+    o->get_pretty_representation(/*internal=*/false, /*qualified_name=*/false);
   // no n_pretty_representation here as it's only needed in a couple of places
   const bool show_size_offset_changes = ctxt->get_allowed_category()
 					& SIZE_OR_OFFSET_CHANGE_CATEGORY;
@@ -432,7 +437,9 @@ represent(const var_diff_sptr	&diff,
 
   if (is_strict_anonymous_data_member_change)
     {
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(/*internal=*/false,
+				     /*qualified_name=*/false);
       const type_base_sptr o_type = o->get_type(), n_type = n->get_type();
       if (o_pretty_representation != n_pretty_representation)
 	{
@@ -472,7 +479,9 @@ represent(const var_diff_sptr	&diff,
       ABG_ASSERT(o_anon != n_anon);
       // So we are looking at a non-anonymous data member change from
       // or to an anonymous data member.
-      const string n_pretty_representation = n->get_pretty_representation();
+      const string n_pretty_representation =
+	n->get_pretty_representation(/*internal=*/false,
+				     /*qualified_name=*/false);
       out << indent << (o_anon ? "anonymous " : "")
 	  << "data member " << o_pretty_representation;
       show_offset_or_size(" at offset", o_offset, *ctxt, out);
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 e81a8fd..7e6286d 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-0.txt
@@ -9,13 +9,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [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)
         2 data member insertions:
-          'char libapp::S1::m1', at offset 32 (in bits)
-          'unsigned int libapp::S1::m2', at offset 64 (in bits)
+          'char m1', at offset 32 (in bits)
+          'unsigned int m2', at offset 64 (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 a9d2efd..80b07e7 100644
--- a/tests/data/test-abicompat/test0-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test0-fn-changed-report-2.txt
@@ -9,13 +9,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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
+          'char 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:
     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)
         2 data member insertions:
-          'char libapp::S1::m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:24:1
-          'unsigned int libapp::S1::m2', at offset 64 (in bits) at test0-fn-changed-libapp-v1.cc:25:1
+          'char m1', at offset 32 (in bits) at test0-fn-changed-libapp-v1.cc:24:1
+          'unsigned int m2', at offset 64 (in bits) at test0-fn-changed-libapp-v1.cc:25:1
 
diff --git a/tests/data/test-abicompat/test5-fn-changed-report-0.txt b/tests/data/test-abicompat/test5-fn-changed-report-0.txt
index ccde357..3974259 100644
--- a/tests/data/test-abicompat/test5-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test5-fn-changed-report-0.txt
@@ -6,14 +6,14 @@ have sub-types that are different from what application 'test5-fn-changed-app' e
       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)
+          'char m1', at offset 32 (in bits)
 
   function int foo(S1*):
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1':
         type size changed from 64 to 32 (in bits)
         1 data member deletion:
-          'unsigned char S1::m1', at offset 32 (in bits)
+          'unsigned char m1', at offset 32 (in bits)
 
   method S0::S0():
     implicit parameter 0 of type 'S0*' has sub-type changes:
diff --git a/tests/data/test-abicompat/test5-fn-changed-report-1.txt b/tests/data/test-abicompat/test5-fn-changed-report-1.txt
index dbdcbe5..635118e 100644
--- a/tests/data/test-abicompat/test5-fn-changed-report-1.txt
+++ b/tests/data/test-abicompat/test5-fn-changed-report-1.txt
@@ -6,14 +6,14 @@ have sub-types that are different from what application 'test5-fn-changed-app' e
       in pointed to type 'struct S0' at test5-fn-changed-libapp-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::m1', at offset 32 (in bits) at test5-fn-changed-libapp-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test5-fn-changed-libapp-v1.h:4:1
 
   function int foo(S1*):
     parameter 1 of type 'S1*' has sub-type changes:
       in pointed to type 'struct S1' at test5-fn-changed-libapp-v1.h:9:1:
         type size changed from 64 to 32 (in bits)
         1 data member deletion:
-          'unsigned char S1::m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
+          'unsigned char m1', at offset 32 (in bits) at test5-fn-changed-libapp-v0.h:11:1
 
   method S0::S0():
     implicit parameter 0 of type 'S0*' has sub-type changes:
diff --git a/tests/data/test-abicompat/test6-var-changed-report-0.txt b/tests/data/test-abicompat/test6-var-changed-report-0.txt
index f507787..f40d2d1 100644
--- a/tests/data/test-abicompat/test6-var-changed-report-0.txt
+++ b/tests/data/test-abicompat/test6-var-changed-report-0.txt
@@ -5,11 +5,11 @@ have sub-types that are different from what application 'test6-var-changed-app'
     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)
+        'char m1', at offset 32 (in bits)
 
   S1* foo:
     in pointed to type 'struct S1':
       type size changed from 64 to 32 (in bits)
       1 data member deletion:
-        'unsigned char S1::m1', at offset 32 (in bits)
+        'unsigned char m1', at offset 32 (in bits)
 
diff --git a/tests/data/test-abicompat/test6-var-changed-report-1.txt b/tests/data/test-abicompat/test6-var-changed-report-1.txt
index 5b78c83..08b1c7e 100644
--- a/tests/data/test-abicompat/test6-var-changed-report-1.txt
+++ b/tests/data/test-abicompat/test6-var-changed-report-1.txt
@@ -5,11 +5,11 @@ have sub-types that are different from what application 'test6-var-changed-app'
     in pointed to type 'struct S0' at test6-var-changed-libapp-v1.h:1:1:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S0::m1', at offset 32 (in bits) at test6-var-changed-libapp-v1.h:4:1
+        'char m1', at offset 32 (in bits) at test6-var-changed-libapp-v1.h:4:1
 
   S1* foo:
     in pointed to type 'struct S1' at test6-var-changed-libapp-v1.h:9:1:
       type size changed from 64 to 32 (in bits)
       1 data member deletion:
-        'unsigned char S1::m1', at offset 32 (in bits) at test6-var-changed-libapp-v0.h:11:1
+        'unsigned char m1', at offset 32 (in bits) at test6-var-changed-libapp-v0.h:11:1
 
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 a1c822a..3695270 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-0.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits)
+          'float percentage', at offset 128 (in bits)
 
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-1.txt b/tests/data/test-abicompat/test7-fn-changed-report-1.txt
index 8fae210..ffdffc9 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-1.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-1.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test7-fn-changed-app' e
       in unqualified underlying type 'struct Student':
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits)
+          'float percentage', at offset 128 (in bits)
 
diff --git a/tests/data/test-abicompat/test7-fn-changed-report-2.txt b/tests/data/test-abicompat/test7-fn-changed-report-2.txt
index d5767e2..0b1c696 100644
--- a/tests/data/test-abicompat/test7-fn-changed-report-2.txt
+++ b/tests/data/test-abicompat/test7-fn-changed-report-2.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test7-fn-changed-app' e
       in unqualified underlying type 'struct Student' at test7-fn-changed-libapp-v1.h:3:1:
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'float Student::percentage', at offset 128 (in bits) at test7-fn-changed-libapp-v1.h:7:1
+          'float percentage', at offset 128 (in bits) at test7-fn-changed-libapp-v1.h:7:1
 
diff --git a/tests/data/test-abicompat/test8-fn-changed-report-0.txt b/tests/data/test-abicompat/test8-fn-changed-report-0.txt
index f6e9464..b4bef3e 100644
--- a/tests/data/test-abicompat/test8-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test8-fn-changed-report-0.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test8-fn-changed-app' e
       in pointed to type 'struct S' at test8-fn-changed-libapp-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test8-fn-changed-libapp-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test8-fn-changed-libapp-v1.h:4:1
 
diff --git a/tests/data/test-abicompat/test9-fn-changed-report-0.txt b/tests/data/test-abicompat/test9-fn-changed-report-0.txt
index 4b5a9f1..3a11ffc 100644
--- a/tests/data/test-abicompat/test9-fn-changed-report-0.txt
+++ b/tests/data/test-abicompat/test9-fn-changed-report-0.txt
@@ -6,5 +6,5 @@ have sub-types that are different from what application 'test9-fn-changed-app' e
       in referenced type 'struct S' at test9-fn-changed-v1.h:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test9-fn-changed-v1.h:4:1
+          'char m1', at offset 32 (in bits) at test9-fn-changed-v1.h:4:1
 
diff --git a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
index 0d73ae0..8105aa7 100644
--- a/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
+++ b/tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt
@@ -8,21 +8,21 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at qualifier-typedef-array-v1.c:10:1:
         type size hasn't changed
         12 data member changes:
-          type of 'A S::c_a' changed:
+          type of 'A c_a' changed:
             entity changed from 'typedef A' to compatible type 'void* const[7]'
               array element type 'void*' changed:
                 entity changed from 'void*' to 'void* const'
                 type size hasn't changed
               type size hasn't changed
-          type of 'A S::v_a' changed:
+          type of 'A v_a' changed:
             entity changed from 'typedef A' to compatible type 'void* volatile[7]'
               array element type 'void*' changed:
                 entity changed from 'void*' to 'void* volatile'
                 type size hasn't changed
               type size hasn't changed
-          type of 'A S::r_a' changed:
+          type of 'A r_a' changed:
             entity changed from 'typedef A' to compatible type 'void*[7]'
-          type of 'B S::c_b' changed:
+          type of 'B c_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void* const[7]'
@@ -30,7 +30,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                   entity changed from 'void*' to 'void* const'
                   type size hasn't changed
                 type size hasn't changed
-          type of 'B S::v_b' changed:
+          type of 'B v_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void* volatile[7]'
@@ -38,41 +38,41 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                   entity changed from 'void*' to 'void* volatile'
                   type size hasn't changed
                 type size hasn't changed
-          type of 'B S::r_b' changed:
+          type of 'B r_b' changed:
             typedef name changed from B to A at qualifier-typedef-array-v1.c:1:1
             underlying type 'typedef A' at qualifier-typedef-array-v0.c:1:1 changed:
               entity changed from 'typedef A' to compatible type 'void*[7]'
-          type of 'C S::v_c' changed:
+          type of 'C v_c' changed:
             entity changed from 'typedef C' to compatible type 'const volatile void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'const volatile void* const'
               type name changed from 'void*[7]' to 'volatile void* const[7]'
               type size hasn't changed
-          type of 'C S::r_c' changed:
+          type of 'C r_c' changed:
             entity changed from 'typedef C' to compatible type 'restrict void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'restrict const void* const'
               type name changed from 'void*[7]' to 'restrict void* const[7]'
               type size hasn't changed
-          type of 'D S::v_d' changed:
+          type of 'D v_d' changed:
             entity changed from 'typedef D' to compatible type 'const volatile void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'const volatile void* const'
               type name changed from 'void*[7]' to 'volatile void* const[7]'
               type size hasn't changed
-          type of 'D S::r_d' changed:
+          type of 'D r_d' changed:
             entity changed from 'typedef D' to compatible type 'restrict void* const[7]'
               array element type 'void* const' changed:
                 'void* const' changed to 'restrict const void* const'
               type name changed from 'void*[7]' to 'restrict void* const[7]'
               type size hasn't changed
-          type of 'E S::r_e' changed:
+          type of 'E r_e' changed:
             entity changed from 'typedef E' to compatible type 'restrict const volatile void* const[7]'
               array element type 'const volatile void* const' changed:
                 'const volatile void* const' changed to 'restrict const volatile volatile void* const'
               type name changed from 'volatile void* const[7]' to 'restrict volatile void* const[7]'
               type size hasn't changed
-          type of 'F S::r_f' changed:
+          type of 'F r_f' changed:
             entity changed from 'typedef F' to compatible type 'restrict const volatile void* const[7]'
               array element type 'const volatile void* const' changed:
                 'const volatile void* const' changed to 'restrict const volatile volatile void* const'
diff --git a/tests/data/test-abidiff-exit/test-fun-param-report.txt b/tests/data/test-abidiff-exit/test-fun-param-report.txt
index 295cce8..71f41b0 100644
--- a/tests/data/test-abidiff-exit/test-fun-param-report.txt
+++ b/tests/data/test-abidiff-exit/test-fun-param-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct ops' at test-fun-param-v1.c:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'void (void*, unsigned int, unsigned long int)* ops::bind_class' changed:
+          type of 'void (void*, unsigned int, unsigned long int)* bind_class' changed:
             in pointed to type 'function type void (void*, unsigned int, unsigned long int)':
               parameter 4 of type 'void*' was added
               parameter 5 of type 'unsigned long int' was added
diff --git a/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt b/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
index 75d5a61..ee3bd02 100644
--- a/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
+++ b/tests/data/test-abidiff-exit/test-headers-dirs/test-headers-dir-report-2.txt
@@ -9,5 +9,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct second_public_struct' at header-b-v1.h:5:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char second_public_struct::m2', at offset 32 (in bits) at header-b-v1.h:8:1
+            'char m2', at offset 32 (in bits) at header-b-v1.h:8:1
 
diff --git a/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt b/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
index 27fdc45..b7a9022 100644
--- a/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-cxx-members-report.txt
@@ -32,9 +32,9 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
         type name changed from 'int' to 'long int'
         type size changed from 32 to 64 (in bits)
   1 data member deletion:
-    'int ops::deleted_var', at offset 96 (in bits) at test-leaf-cxx-members-v0.cc:5:1
+    'int deleted_var', at offset 96 (in bits) at test-leaf-cxx-members-v0.cc:5:1
   1 data member insertion:
-    'long int ops::added_var', at offset 128 (in bits) at test-leaf-cxx-members-v1.cc:10:1
+    'long int added_var', at offset 128 (in bits) at test-leaf-cxx-members-v1.cc:10:1
   there are data member changes:
     type 'int' of 'ops::changed_var' changed:
       type name changed from 'int' to 'long int'
diff --git a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
index 48f5df8..7c51164 100644
--- a/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-peeling-report.txt
@@ -19,7 +19,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct ops2 at test-leaf-peeling-v0.cc:10:1' changed:
   type size changed from 320 to 640 (in bits)
   there are data member changes:
-    'foo ops2::y[10]' size changed from 320 to 640 (in bits) (by +320 bits)
+    'foo y[10]' size changed from 320 to 640 (in bits) (by +320 bits)
 
 'struct ops3 at test-leaf-peeling-v0.cc:14:1' changed:
   type size hasn't changed
diff --git a/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt b/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
index 581fd28..7bf63a8 100644
--- a/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
+++ b/tests/data/test-abidiff-exit/test-leaf-redundant-report.txt
@@ -15,7 +15,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
       type name changed from 'sto2' to 'stn2'
       type size changed from 64 to 128 (in bits)
       1 data member insertion:
-        'double stn2::y', at offset 64 (in bits) at test-leaf-redundant-v1.c:9:1
+        'double y', at offset 64 (in bits) at test-leaf-redundant-v1.c:9:1
 
   [C] 'function void fn3(sto1*)' at test-leaf-redundant-v1.c:18:1 has some sub-type changes:
     parameter 1 of type 'sto1*' changed:
diff --git a/tests/data/test-abidiff-exit/test-member-size-report0.txt b/tests/data/test-abidiff-exit/test-member-size-report0.txt
index c82a5c3..1c60dbc 100644
--- a/tests/data/test-abidiff-exit/test-member-size-report0.txt
+++ b/tests/data/test-abidiff-exit/test-member-size-report0.txt
@@ -8,14 +8,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test-member-size-v1.cc:3:1:
         type size changed from 128 to 192 (in bits)
         1 data member insertion:
-          'int S::y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
+          'int y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
         no data member change (1 filtered);
     parameter 2 of type 'T*' has sub-type changes:
       in pointed to type 'struct T' at test-member-size-v1.cc:14:1:
         type size changed from 192 to 256 (in bits)
         2 data member changes:
-          'S T::s' size changed from 128 to 192 (in bits) (by +64 bits)
-          'int T::a' offset changed from 128 to 192 (in bits) (by +64 bits)
+          'S s' size changed from 128 to 192 (in bits) (by +64 bits)
+          'int a' offset changed from 128 to 192 (in bits) (by +64 bits)
 
   [C] 'function void reg2(U*)' at test-member-size-v1.cc:27:1 has some indirect sub-type changes:
     parameter 1 of type 'U*' has sub-type changes:
@@ -26,5 +26,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type size changed from 128 to 192 (in bits)
             1 data member change:
               'S s' size changed from 128 to 192 (in bits) (by +64 bits)
-          'int U::r' offset changed from 128 to 192 (in bits) (by +64 bits)
+          'int r' offset changed from 128 to 192 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-abidiff-exit/test-member-size-report1.txt b/tests/data/test-abidiff-exit/test-member-size-report1.txt
index 7650628..393733a 100644
--- a/tests/data/test-abidiff-exit/test-member-size-report1.txt
+++ b/tests/data/test-abidiff-exit/test-member-size-report1.txt
@@ -6,13 +6,13 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S at test-member-size-v0.cc:3:1' changed:
   type size changed from 128 to 192 (in bits)
   1 data member insertion:
-    'int S::y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
+    'int y', at offset 128 (in bits) at test-member-size-v1.cc:6:1
 
 'struct T at test-member-size-v0.cc:13:1' changed:
   type size changed from 192 to 256 (in bits)
   there are data member changes:
     type 'struct S' of 'T::s' changed, as reported earlier
-    'int T::a' offset changed from 128 to 192 (in bits) (by +64 bits)
+    'int a' offset changed from 128 to 192 (in bits) (by +64 bits)
 
 'struct U at test-member-size-v0.cc:18:1' changed:
   type size changed from 192 to 256 (in bits)
@@ -21,4 +21,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
       type size changed from 128 to 192 (in bits)
       there are data member changes:
         type 'struct S' of 'U::__anonymous_struct__::s' changed, as reported earlier
-    'int U::r' offset changed from 128 to 192 (in bits) (by +64 bits)
+    'int r' offset changed from 128 to 192 (in bits) (by +64 bits)
diff --git a/tests/data/test-abidiff-exit/test-net-change-report0.txt b/tests/data/test-abidiff-exit/test-net-change-report0.txt
index 66712b0..64ac3a8 100644
--- a/tests/data/test-abidiff-exit/test-net-change-report0.txt
+++ b/tests/data/test-abidiff-exit/test-net-change-report0.txt
@@ -21,7 +21,7 @@ Variables changes summary: 1 Removed, 1 Changed, 1 Added variables
       in pointed to type 'struct type_changed':
         type size changed from 32 to 64 (in bits)
         1 data member change:
-          type of 'int type_changed::x' changed:
+          type of 'int x' changed:
             type name changed from 'int' to 'long int'
             type size changed from 32 to 64 (in bits)
 
diff --git a/tests/data/test-abidiff/test-PR18791-report0.txt b/tests/data/test-abidiff/test-PR18791-report0.txt
index 44d986e..6c236f9 100644
--- a/tests/data/test-abidiff/test-PR18791-report0.txt
+++ b/tests/data/test-abidiff/test-PR18791-report0.txt
@@ -16,11 +16,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::connection':
         type size hasn't changed
         1 data member change:
-          type of 'sigc::slot_base* sigc::connection::slot_' changed:
+          type of 'sigc::slot_base* slot_' changed:
             in pointed to type 'class sigc::slot_base':
               type size hasn't changed
               1 data member change:
-                type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+                type of 'sigc::slot_base::rep_type* rep_' changed:
                   in pointed to type 'typedef sigc::slot_base::rep_type':
                     underlying type 'struct sigc::internal::slot_rep' changed:
                       type size hasn't changed
@@ -28,11 +28,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                         'struct sigc::trackable' changed:
                           type size hasn't changed
                           1 data member change:
-                            type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                            type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
                               in pointed to type 'struct sigc::internal::trackable_callback_list':
                                 type size changed from 192 to 256 (in bits)
                                 2 data member changes:
-                                  type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                                  type of 'sigc::internal::trackable_callback_list::callback_list callbacks_' changed:
                                     underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
                                       type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                       type size changed from 128 to 192 (in bits)
@@ -41,23 +41,23 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                                           type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                           type size changed from 128 to 192 (in bits)
                                           1 data member change:
-                                            type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                            type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl _M_impl' changed:
                                               type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
                                               type size changed from 128 to 192 (in bits)
                                               1 data member change:
-                                                type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                                type of 'std::__detail::_List_node_base _M_node' changed:
                                                   type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
                                                   type size changed from 128 to 192 (in bits)
                                                   1 base class insertion:
                                                     struct std::__detail::_List_node_base
                                                   2 data member deletions:
-                                                    'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                                    'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                                    'std::__detail::_List_node_base* _M_next', at offset 0 (in bits)
+                                                    'std::__detail::_List_node_base* _M_prev', at offset 64 (in bits)
                                                   1 data member insertion:
-                                                    'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                                    'unsigned long int _M_data', at offset 128 (in bits)
                                                 and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
                                             and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
-                                  'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                                  'bool clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
   [C] 'method bool sigc::connection::blocked()' has some indirect sub-type changes:
     implicit parameter 0 of type 'const sigc::connection*' has sub-type changes:
@@ -122,7 +122,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct sigc::internal::signal_impl':
         type size changed from 192 to 256 (in bits)
         1 data member change:
-          type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+          type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > slots_' changed:
             type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
             type size changed from 128 to 192 (in bits)
             1 base class change:
@@ -130,11 +130,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
                 type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
                 type size changed from 128 to 192 (in bits)
                 1 data member change:
-                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                  type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl _M_impl' changed:
                     type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
                     type size changed from 128 to 192 (in bits)
                     1 data member change:
-                      type of 'std::__detail::_List_node_base std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed, as reported earlier
+                      type of 'std::__detail::_List_node_base _M_node' changed, as reported earlier
                       and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl::_M_node'
                   and name of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl'
 
@@ -221,7 +221,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct sigc::trackable' changed:
             details were reported earlier
         1 data member change:
-          type of 'sigc::internal::signal_impl* sigc::signal_base::impl_' changed:
+          type of 'sigc::internal::signal_impl* impl_' changed:
             pointed to type 'struct sigc::internal::signal_impl' changed, as reported earlier
 
   [C] 'method bool sigc::signal_base::blocked()' has some indirect sub-type changes:
diff --git a/tests/data/test-abidiff/test-qual-type0-report.txt b/tests/data/test-abidiff/test-qual-type0-report.txt
index c91c06b..cfa35fc 100644
--- a/tests/data/test-abidiff/test-qual-type0-report.txt
+++ b/tests/data/test-abidiff/test-qual-type0-report.txt
@@ -2,7 +2,7 @@
   'class S0' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char S0::m1', at offset 32 (in bits)
+      'char m1', at offset 32 (in bits)
   'const S0' changed:
     unqualified underlying type 'class S0' changed, as reported earlier
   'const S0&' changed:
diff --git a/tests/data/test-abidiff/test-struct0-report.txt b/tests/data/test-abidiff/test-struct0-report.txt
index f34822c..8183127 100644
--- a/tests/data/test-abidiff/test-struct0-report.txt
+++ b/tests/data/test-abidiff/test-struct0-report.txt
@@ -2,9 +2,9 @@
   'class s0' changed:
     type size changed from 64 to 96 (in bits)
     1 data member insertion:
-      'char s0::m2', at offset 64 (in bits)
+      'char m2', at offset 64 (in bits)
     1 data member change:
-      type of 'char s0::m1' changed:
+      type of 'char m1' changed:
         type name changed from 'char' to 'unsigned int'
         type size changed from 8 to 32 (in bits)
         type alignment changed from 8 to 32
diff --git a/tests/data/test-abidiff/test-struct1-report.txt b/tests/data/test-abidiff/test-struct1-report.txt
index d74f520..ec7d552 100644
--- a/tests/data/test-abidiff/test-struct1-report.txt
+++ b/tests/data/test-abidiff/test-struct1-report.txt
@@ -8,15 +8,15 @@
         parameter 1 of type 's0*' has sub-type changes:
           pointed to type 'class s0' changed, as being reported
     1 data member deletion:
-      'char s0::m1', at offset 96 (in bits)
+      'char m1', at offset 96 (in bits)
     1 data member insertion:
-      'double s0::m01', at offset 128 (in bits)
+      'double m01', at offset 128 (in bits)
     2 data member changes:
-      type of 'int s0::m0' changed:
+      type of 'int m0' changed:
         type name changed from 'int' to 'char'
         type size changed from 32 to 8 (in bits)
         type alignment changed from 32 to 8
-      'unsigned int s0::m2' offset changed from 128 to 192 (in bits) (by +64 bits)
+      'unsigned int m2' offset changed from 128 to 192 (in bits) (by +64 bits)
   'const s0' changed:
     unqualified underlying type 'class s0' changed, as reported earlier
   'const s0*' changed:
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 3018522..8039f51 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
@@ -90,7 +90,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_action':
         type size hasn't changed
         2 data member changes:
-          type of 'action_serialize_cb lttng_action::serialize' changed:
+          type of 'action_serialize_cb serialize' changed:
             underlying type 'typedef ssize_t (lttng_action*, char*)*' changed:
               in pointed to type 'function type typedef ssize_t (lttng_action*, char*)':
                 return type changed:
@@ -103,7 +103,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                   in pointed to type 'char':
                     entity changed from 'char' to 'struct lttng_dynamic_buffer'
                     type size changed from 8 to 192 (in bits)
-          type of 'action_destroy_cb lttng_action::destroy' changed:
+          type of 'action_destroy_cb destroy' changed:
             underlying type 'void (lttng_action*)*' changed:
               in pointed to type 'function type void (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
@@ -122,7 +122,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event_context':
         type size hasn't changed
         1 data member change:
-          type of 'lttng_event_context_type lttng_event_context::ctx' changed:
+          type of 'lttng_event_context_type ctx' changed:
             type size hasn't changed
             2 enumerator insertions:
               'lttng_event_context_type::LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL' value '20'
@@ -134,19 +134,19 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in unqualified underlying type 'struct lttng_condition':
           type size hasn't changed
           5 data member changes:
-            type of 'lttng_condition_type lttng_condition::type' changed:
+            type of 'lttng_condition_type type' changed:
               type size hasn't changed
               3 enumerator insertions:
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE' value '100'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING' value '103'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
-            type of 'condition_validate_cb lttng_condition::validate' changed:
+            type of 'condition_validate_cb validate' changed:
               underlying type 'bool (const lttng_condition*)*' changed:
                 in pointed to type 'function type bool (const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
-            type of 'condition_serialize_cb lttng_condition::serialize' changed:
+            type of 'condition_serialize_cb serialize' changed:
               underlying type 'typedef ssize_t (const lttng_condition*, char*)*' changed:
                 in pointed to type 'function type typedef ssize_t (const lttng_condition*, char*)':
                   return type changed:
@@ -160,7 +160,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'char':
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
-            type of 'condition_equal_cb lttng_condition::equal' changed:
+            type of 'condition_equal_cb equal' changed:
               underlying type 'bool (const lttng_condition*, const lttng_condition*)*' changed:
                 in pointed to type 'function type bool (const lttng_condition*, const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
@@ -169,7 +169,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                   parameter 2 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
-            type of 'condition_destroy_cb lttng_condition::destroy' changed:
+            type of 'condition_destroy_cb destroy' changed:
               underlying type 'void (lttng_condition*)*' changed:
                 in pointed to type 'function type void (lttng_condition*)':
                   parameter 1 of type 'lttng_condition*' has sub-type changes:
@@ -239,7 +239,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_event':
         type size hasn't changed
         1 data member change:
-          type of 'lttng_event_type lttng_event::type' changed:
+          type of 'lttng_event_type type' changed:
             type size hasn't changed
             1 enumerator insertion:
               'lttng_event_type::LTTNG_EVENT_USERSPACE_PROBE' value '6'
@@ -262,8 +262,8 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in unqualified underlying type 'struct lttng_evaluation':
           type size hasn't changed
           3 data member changes:
-            type of 'lttng_condition_type lttng_evaluation::type' changed, as reported earlier
-            type of 'evaluation_serialize_cb lttng_evaluation::serialize' changed:
+            type of 'lttng_condition_type type' changed, as reported earlier
+            type of 'evaluation_serialize_cb serialize' changed:
               underlying type 'typedef ssize_t (lttng_evaluation*, char*)*' changed:
                 in pointed to type 'function type typedef ssize_t (lttng_evaluation*, char*)':
                   return type changed:
@@ -278,7 +278,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'char':
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
-            type of 'evaluation_destroy_cb lttng_evaluation::destroy' changed:
+            type of 'evaluation_destroy_cb destroy' changed:
               underlying type 'void (lttng_evaluation*)*' changed:
                 in pointed to type 'function type void (lttng_evaluation*)':
                   parameter 1 of type 'lttng_evaluation*' has sub-type changes:
@@ -323,9 +323,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_session':
           type size changed from 35008 to 35072 (in bits)
           1 data member deletion:
-            'char lttng_session::padding[12]', at offset 34912 (in bits)
+            'char padding[12]', at offset 34912 (in bits)
           1 data member insertion:
-            'union {char padding[12]; void* ptr;} lttng_session::extended', at offset 34944 (in bits)
+            'union {char padding[12]; void* ptr;} extended', at offset 34944 (in bits)
 
   [C] 'function int lttng_list_syscalls(lttng_event**)' has some indirect sub-type changes:
     parameter 1 of type 'lttng_event**' has sub-type changes:
@@ -338,7 +338,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_event_field':
           type size hasn't changed
           1 data member change:
-            type of 'lttng_event lttng_event_field::event' changed, as reported earlier
+            type of 'lttng_event event' changed, as reported earlier
 
   [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:
@@ -355,11 +355,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         in pointed to type 'struct lttng_notification':
           type size changed from 192 to 128 (in bits)
           1 data member deletion:
-            'bool lttng_notification::owns_elements', at offset 128 (in bits)
+            'bool owns_elements', at offset 128 (in bits)
           2 data member changes:
-            type of 'lttng_condition* lttng_notification::condition' changed:
+            type of 'lttng_condition* condition' changed:
               pointed to type 'struct lttng_condition' changed, as reported earlier
-            type of 'lttng_evaluation* lttng_notification::evaluation' changed:
+            type of 'lttng_evaluation* evaluation' changed:
               pointed to type 'struct lttng_evaluation' changed, as reported earlier
 
   [C] 'function lttng_notification_channel_status lttng_notification_channel_subscribe(lttng_notification_channel*, const lttng_condition*)' has some indirect sub-type changes:
@@ -399,9 +399,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct lttng_trigger':
         type size hasn't changed
         2 data member changes:
-          type of 'lttng_condition* lttng_trigger::condition' changed:
+          type of 'lttng_condition* condition' changed:
             pointed to type 'struct lttng_condition' changed, as reported earlier
-          type of 'lttng_action* lttng_trigger::action' changed:
+          type of 'lttng_action* action' changed:
             pointed to type 'struct lttng_action' changed, as reported earlier
 
   [C] 'function lttng_trigger* lttng_trigger_create(lttng_condition*, lttng_action*)' has some indirect sub-type changes:
@@ -437,16 +437,16 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'struct filter_parser_ctx':
         type size hasn't changed
         1 data member change:
-          type of 'filter_ast* filter_parser_ctx::ast' changed:
+          type of 'filter_ast* ast' changed:
             in pointed to type 'struct filter_ast':
               type size changed from 704 to 768 (in bits)
               2 data member changes:
-                type of 'filter_node filter_ast::root' changed:
+                type of 'filter_node root' changed:
                   type size changed from 576 to 640 (in bits)
                   2 data member changes:
-                    type of 'filter_node* filter_node::parent' changed:
+                    type of 'filter_node* parent' changed:
                       pointed to type 'struct filter_node' changed, as being reported
-                    type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} filter_node::u' changed:
+                    type of 'union {struct {} unknown; struct {filter_node* child;} root; struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression; struct {op_type type; filter_node* lchild; filter_node* rchild;} op; struct {unary_op_type type; filter_node* child;} unary_op;} u' changed:
                       type size changed from 320 to 384 (in bits)
                       4 data member changes:
                         type of 'struct {__anonymous_enum__ type; ast_link_type post_op; ast_link_type pre_op; union {char* string; uint64_t constant; double float_constant; char* identifier; filter_node* child;} u; filter_node* prev; filter_node* next;} expression' changed:
@@ -509,7 +509,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                                 'unary_op_type::AST_UNARY_BIT_NOT' value '4'
                             type of 'filter_node* child' changed:
                               pointed to type 'struct filter_node' changed, as being reported
-                'cds_list_head filter_ast::allocated_nodes' offset changed from 576 to 640 (in bits) (by +64 bits)
+                'cds_list_head 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:
     return type changed:
@@ -517,7 +517,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         underlying type 'union YYSTYPE' changed:
           type size hasn't changed
           1 data member change:
-            type of 'filter_node* YYSTYPE::n' changed:
+            type of 'filter_node* n' changed:
               pointed to type 'struct filter_node' changed, as reported earlier
           type changed from:
             union YYSTYPE{long long int ll; char c; gc_string* gs; filter_node* n;}
diff --git a/tests/data/test-diff-dwarf/test0-report.txt b/tests/data/test-diff-dwarf/test0-report.txt
index 508f216..33cbaf5 100644
--- a/tests/data/test-diff-dwarf/test0-report.txt
+++ b/tests/data/test-diff-dwarf/test0-report.txt
@@ -14,7 +14,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 64 (in bits)
+              'unsigned int m2', at offset 64 (in bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     'method void S0::member0() const' access changed from 'private' to 'public'
@@ -27,7 +27,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
   [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
diff --git a/tests/data/test-diff-dwarf/test1-report.txt b/tests/data/test-diff-dwarf/test1-report.txt
index 39f6072..2397d86 100644
--- a/tests/data/test-diff-dwarf/test1-report.txt
+++ b/tests/data/test-diff-dwarf/test1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
-          'unsigned int S::m01', at offset 32 (in bits)
+          'unsigned int m01', at offset 32 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-dwarf/test10-report.txt b/tests/data/test-diff-dwarf/test10-report.txt
index 52786b5..a88febd 100644
--- a/tests/data/test-diff-dwarf/test10-report.txt
+++ b/tests/data/test-diff-dwarf/test10-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1152 to 1280 (in bits)
         2 data member changes:
-          type of 'int S::m0[5][3]' changed:
+          type of 'int m0[5][3]' changed:
             type name changed from 'int[5][3]' to 'int[5][4]'
             array type size changed from 480 to 640
             array type subrange 2 changed length from 3 to 4
-          type of 'int* S::m1[10]' changed:
+          type of 'int* m1[10]' changed:
             array element type 'int*' changed:
               in pointed to type 'int':
                 type name changed from 'int' to 'char'
diff --git a/tests/data/test-diff-dwarf/test11-report.txt b/tests/data/test-diff-dwarf/test11-report.txt
index 2f9f25a..59bec93 100644
--- a/tests/data/test-diff-dwarf/test11-report.txt
+++ b/tests/data/test-diff-dwarf/test11-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 1248 to 1536 (in bits)
         2 data member changes:
-          type of 'int S::m0[5][3]' changed:
+          type of 'int m0[5][3]' changed:
             type name changed from 'int[5][3]' to 'int[6][3]'
             array type size changed from 480 to 576
             array type subrange 1 changed length from 5 to 6
-          type of 'int S::m1[6][4]' changed:
+          type of 'int m1[6][4]' changed:
             type name changed from 'int[6][4]' to 'int[6][5]'
             array type size changed from 768 to 960
             array type subrange 2 changed length from 4 to 5
diff --git a/tests/data/test-diff-dwarf/test13-report.txt b/tests/data/test-diff-dwarf/test13-report.txt
index d2148fe..fd2a6e6 100644
--- a/tests/data/test-diff-dwarf/test13-report.txt
+++ b/tests/data/test-diff-dwarf/test13-report.txt
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 128 to 192 (in bits)
         3 data member changes:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
-          type of 'unsigned int S::m2' changed:
+          type of 'unsigned int m2' changed:
             type name changed from 'unsigned int' to 'long long int'
             type size changed from 32 to 64 (in bits)
-          'unsigned char S::m3' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'unsigned char m3' offset changed from 96 to 128 (in bits) (by +32 bits)
 
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 9b7599d..21dec52 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
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 a2db4e9..fd25ef4 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
@@ -18,5 +18,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct base' changed:
             details were reported earlier
         1 data member change:
-          'int S::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-dwarf/test3-report.txt b/tests/data/test-diff-dwarf/test3-report.txt
index b8166a7..a968786 100644
--- a/tests/data/test-diff-dwarf/test3-report.txt
+++ b/tests/data/test-diff-dwarf/test3-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct C0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C0::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
 
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 8c6c6f7..3238e4c 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
@@ -30,14 +30,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
-        type of 'int ()* S::fnptr0' changed:
+        type of 'int ()* fnptr0' changed:
           in pointed to type 'function type int ()':
             parameter 1 of type 'double' was added
-        type of 'int ()* S::fnptr1' changed:
+        type of 'int ()* fnptr1' changed:
           in pointed to type 'function type int ()':
             entity changed from 'function type int ()' to 'void'
             type size changed from 64 to 0 (in bits)
-        type of 'int ()* S::fnptr2' changed:
+        type of 'int ()* fnptr2' changed:
           entity changed from 'int ()*' to 'int'
           type size changed from 64 to 32 (in bits)
 
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 2e886cf..d16753c 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
@@ -31,14 +31,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class S':
         type size hasn't changed
         3 data member changes:
-          type of 'int ()& S::fnref0' changed:
+          type of 'int ()& fnref0' changed:
             in referenced type 'function type int ()':
               parameter 1 of type 'double' was added
-          type of 'int ()& S::fnref1' changed:
+          type of 'int ()& fnref1' changed:
             in referenced type 'function type int ()':
               entity changed from 'function type int ()' to 'int*'
               type size hasn't changed
-          type of 'int ()& S::fnref2' changed:
+          type of 'int ()& fnref2' changed:
             in referenced type 'function type int ()':
               entity changed from 'function type int ()' to 'int'
               type size changed from 64 to 32 (in bits)
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 4f4a765..84a8f1b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'int S::m1', at offset 32 (in bits)
+          'int m1', at offset 32 (in bits)
 
   [C] 'method S::S(int)' has some indirect sub-type changes:
     implicit parameter 0 of type 'S*' has sub-type changes:
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 33b0ac1..e27b449 100644
--- a/tests/data/test-diff-dwarf/test37-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test37-union-report-0.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'S some_union_type::m2'
+          'S m2'
 
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 fd9708e..d812a31 100644
--- a/tests/data/test-diff-dwarf/test38-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test38-union-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size hasn't changed
         1 data member deletion:
-          'int some_union_type::m0'
+          'int m0'
         type changed from:
           union some_union_type{int m0; char m1; S m2;}
         to:
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 560de2a..c8d3c2c 100644
--- a/tests/data/test-diff-dwarf/test39-union-report-0.txt
+++ b/tests/data/test-diff-dwarf/test39-union-report-0.txt
@@ -8,8 +8,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'union some_union_type':
         type size changed from 64 to 96 (in bits)
         1 data member change:
-          type of 'S some_union_type::m2' changed:
+          type of 'S m2' changed:
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'char S::S_member2', at offset 64 (in bits)
+              'char S_member2', at offset 64 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test4-report.txt b/tests/data/test-diff-dwarf/test4-report.txt
index 7897222..6e71aeb 100644
--- a/tests/data/test-diff-dwarf/test4-report.txt
+++ b/tests/data/test-diff-dwarf/test4-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         type size hasn't changed
         1 data member change:
-          'int C0::m0' access changed from 'private' to 'public'
+          'int m0' access changed from 'private' to 'public'
 
diff --git a/tests/data/test-diff-dwarf/test40-report-0.txt b/tests/data/test-diff-dwarf/test40-report-0.txt
index 3f956d7..f6105b4 100644
--- a/tests/data/test-diff-dwarf/test40-report-0.txt
+++ b/tests/data/test-diff-dwarf/test40-report-0.txt
@@ -8,17 +8,17 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S2':
         type size changed from 96 to 64 (in bits)
         1 data member deletion:
-          'int S2::to_remove', at offset 0 (in bits)
+          'int to_remove', at offset 0 (in bits)
         2 data member changes:
-          '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)
+          'int m0' offset changed from 32 to 0 (in bits) (by -32 bits)
+          'char m1' offset changed from 64 to 32 (in bits) (by -32 bits)
 
   [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
         1 data member change:
-          type of 'int S3::to_change' changed:
+          type of 'int to_change' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
 
@@ -27,8 +27,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S1':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'long long int S1::inserted_member', at offset 0 (in bits)
+          'long long int inserted_member', at offset 0 (in bits)
         2 data member changes:
-          'int S1::m0' offset changed from 0 to 64 (in bits) (by +64 bits)
-          'char S1::m1' offset changed from 32 to 96 (in bits) (by +64 bits)
+          'int m0' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'char m1' offset changed from 32 to 96 (in bits) (by +64 bits)
 
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 5a8b4f1..df9fc29 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S0':
         type size hasn't changed
         1 data member change:
-          type of 'union {int d; char c;} S0::m0' changed:
+          type of 'union {int d; char c;} m0' changed:
             entity changed from 'union {int d; char c;}' to 'int'
             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 ada9d3a..f551acf 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
@@ -8,11 +8,11 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S1':
         type size changed from 96 to 64 (in bits)
         1 data member insertion:
-          'char S1::m01', at offset 32 (in bits)
+          'char m01', at offset 32 (in bits)
         2 data member changes:
-          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int S1::m0'
+          anonymous data member struct {int m0; char m01;} at offset 0 (in bits) became data member 'int m0'
           and size changed from 64 to 32 (in bits) (by -32 bits)
-          'char S1::m1' offset changed from 64 to 40 (in bits) (by -24 bits)
+          'char m1' offset changed from 64 to 40 (in bits) (by -24 bits)
 
   [C] 'function void foo(S0&)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
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 0562456..44aa21b 100644
--- a/tests/data/test-diff-dwarf/test46-rust-report-0.txt
+++ b/tests/data/test-diff-dwarf/test46-rust-report-0.txt
@@ -9,7 +9,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       type name changed from 'one::Foo' to 'two::Foo'
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'u32 two::Foo::b', at offset 32 (in bits)
+        'u32 b', at offset 32 (in bits)
       1 data member change:
         name of 'one::Foo::a' changed to 'two::Foo::a'
     parameter 2 of type 'u32' was added
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index 6cf7522..ba72100 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C0':
         type size hasn't changed
         1 data member change:
-          'int C0::m0' access changed from 'private' to 'public'
+          'int m0' access changed from 'private' to 'public'
 
   [C] 'function C0 foo()' has some indirect sub-type changes:
     return type changed:
diff --git a/tests/data/test-diff-dwarf/test8-report.txt b/tests/data/test-diff-dwarf/test8-report.txt
index 26e0c10..0c54d2b 100644
--- a/tests/data/test-diff-dwarf/test8-report.txt
+++ b/tests/data/test-diff-dwarf/test8-report.txt
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct B0':
         type size hasn't changed
         1 data member change:
-          'char B0::m0' access changed from 'public' to 'private'
+          'char m0' access changed from 'public' to 'private'
 
   [C] 'method S::S()' has some indirect sub-type changes:
     implicit parameter 0 of type 'S*' has sub-type changes:
@@ -24,7 +24,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           class B1
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
           and offset changed from 32 to 64 (in bits) (by +32 bits), access changed from 'public' to 'private'
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 1b3c7d9..947a51b 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
@@ -12,7 +12,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0' at test45-basic-type-change-v1.cc:8:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S0::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               type name changed from 'int' to 'char'
               type size changed from 32 to 8 (in bits)
@@ -26,7 +26,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S1' at test45-basic-type-change-v1.cc:13:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S1::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               type name changed from 'int' to 'char'
               type size changed from 32 to 8 (in bits)
@@ -38,7 +38,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S2' at test45-basic-type-change-v1.cc:18:1:
         type size hasn't changed
         1 data member change:
-          type of 'int* S2::m0' changed:
+          type of 'int* m0' changed:
             in pointed to type 'int':
               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-PR26739-2-report-0.txt b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
index 88f2930..a98473b 100644
--- a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
+++ b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct A' at test-PR26739-2-v1.c:6:1:
         type size hasn't changed
         1 data member change:
-          type of 'const volatile const int A::m[5]' changed:
+          type of 'const volatile const int m[5]' changed:
             entity changed from 'const volatile const int[5]' to compatible type 'typedef array_type1' at test-PR26739-2-v1.c:3:1
               array element type 'const volatile const int' changed:
                 'const volatile const int' changed to 'const int'
diff --git a/tests/data/test-diff-filter/test-PR27331-report-0.txt b/tests/data/test-diff-filter/test-PR27331-report-0.txt
index 8e02a0a..6008043 100644
--- a/tests/data/test-diff-filter/test-PR27331-report-0.txt
+++ b/tests/data/test-diff-filter/test-PR27331-report-0.txt
@@ -6,4 +6,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct S at test-PR27331-v0.c:1:1' changed:
   type size hasn't changed
   there are data member changes:
-    'int S::var' offset changed from 0 to 1 (in bits) (by +1 bits)
+    'int var' offset changed from 0 to 1 (in bits) (by +1 bits)
diff --git a/tests/data/test-diff-filter/test0-report.txt b/tests/data/test-diff-filter/test0-report.txt
index 76b1dd0..269c6b7 100644
--- a/tests/data/test-diff-filter/test0-report.txt
+++ b/tests/data/test-diff-filter/test0-report.txt
@@ -14,9 +14,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 32 (in bits)
+              'unsigned int m2', at offset 32 (in bits)
             1 data member change:
-              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     implicit parameter 0 of type 'const S0* const' has sub-type changes:
@@ -28,5 +28,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits)
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test01-report.txt b/tests/data/test-diff-filter/test01-report.txt
index b0e2dcd..3c59f89 100644
--- a/tests/data/test-diff-filter/test01-report.txt
+++ b/tests/data/test-diff-filter/test01-report.txt
@@ -14,9 +14,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'class B0S0':
             type size changed from 64 to 96 (in bits)
             1 data member insertion:
-              'unsigned int B0S0::m2', at offset 32 (in bits)
+              'unsigned int m2', at offset 32 (in bits)
             1 data member change:
-              'char B0S0::m1' offset changed from 32 to 64 (in bits) (by +32 bits)
+              'char m1' offset changed from 32 to 64 (in bits) (by +32 bits)
 
   [C] 'method void S0::member0() const' has some indirect sub-type changes:
     'method void S0::member0() const' access changed from 'private' to 'public'
@@ -29,7 +29,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
               'class B0S0' changed:
                 details were reported earlier
             1 data member change:
-              'int S0::m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
+              'int m0' offset changed from 64 to 96 (in bits) (by +32 bits), access changed from 'private' to 'protected'
 
   [C] 'function void foo(S0&, S1*)' has some indirect sub-type changes:
     parameter 1 of type 'S0&' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test1-report.txt b/tests/data/test-diff-filter/test1-report.txt
index 6fc96cb..596417e 100644
--- a/tests/data/test-diff-filter/test1-report.txt
+++ b/tests/data/test-diff-filter/test1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C1::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int C1::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test10-report.txt b/tests/data/test-diff-filter/test10-report.txt
index 3f4821f..56bc999 100644
--- a/tests/data/test-diff-filter/test10-report.txt
+++ b/tests/data/test-diff-filter/test10-report.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct S':
           type size changed from 32 to 8 (in bits)
           1 data member deletion:
-            'unsigned int S::m', at offset 0 (in bits)
+            'unsigned int m', at offset 0 (in bits)
 
diff --git a/tests/data/test-diff-filter/test11-report.txt b/tests/data/test-diff-filter/test11-report.txt
index 5c5875b..a664272 100644
--- a/tests/data/test-diff-filter/test11-report.txt
+++ b/tests/data/test-diff-filter/test11-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S0':
         type size changed from 64 to 96 (in bits)
         1 data member insertion:
-          'unsigned int S0::m2', at offset 64 (in bits)
+          'unsigned int m2', at offset 64 (in bits)
 
diff --git a/tests/data/test-diff-filter/test13-report.txt b/tests/data/test-diff-filter/test13-report.txt
index edec807..c31c7b4 100644
--- a/tests/data/test-diff-filter/test13-report.txt
+++ b/tests/data/test-diff-filter/test13-report.txt
@@ -15,7 +15,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           class B1
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
           and offset changed from 32 to 64 (in bits) (by +32 bits)
diff --git a/tests/data/test-diff-filter/test14-0-report.txt b/tests/data/test-diff-filter/test14-0-report.txt
index bbc05f0..458c7bb 100644
--- a/tests/data/test-diff-filter/test14-0-report.txt
+++ b/tests/data/test-diff-filter/test14-0-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'unsigned int m2', at offset 64 (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 101722b..1b4bfbd 100644
--- a/tests/data/test-diff-filter/test14-1-report.txt
+++ b/tests/data/test-diff-filter/test14-1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'unsigned int m2', at offset 64 (in bits)
 
   [C] 'function void foo(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
diff --git a/tests/data/test-diff-filter/test15-0-report.txt b/tests/data/test-diff-filter/test15-0-report.txt
index 3c644e5..ae7488e 100644
--- a/tests/data/test-diff-filter/test15-0-report.txt
+++ b/tests/data/test-diff-filter/test15-0-report.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       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)
+          'unsigned int m2', at offset 64 (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 25d2ac4..5279f05 100644
--- a/tests/data/test-diff-filter/test15-1-report.txt
+++ b/tests/data/test-diff-filter/test15-1-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       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)
+          'unsigned int m2', at offset 64 (in bits)
 
   [C] 'S* var2' was changed:
     type of variable changed:
diff --git a/tests/data/test-diff-filter/test16-report-2.txt b/tests/data/test-diff-filter/test16-report-2.txt
index f69eabd..9cee736 100644
--- a/tests/data/test-diff-filter/test16-report-2.txt
+++ b/tests/data/test-diff-filter/test16-report-2.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
           and offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test16-report.txt b/tests/data/test-diff-filter/test16-report.txt
index e195097..861e396 100644
--- a/tests/data/test-diff-filter/test16-report.txt
+++ b/tests/data/test-diff-filter/test16-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test17-0-report.txt b/tests/data/test-diff-filter/test17-0-report.txt
index 2003682..e1ecd47 100644
--- a/tests/data/test-diff-filter/test17-0-report.txt
+++ b/tests/data/test-diff-filter/test17-0-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'S* S::m2' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'S* m2' offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test17-1-report.txt b/tests/data/test-diff-filter/test17-1-report.txt
index 0b39c5d..f43663c 100644
--- a/tests/data/test-diff-filter/test17-1-report.txt
+++ b/tests/data/test-diff-filter/test17-1-report.txt
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
           and offset changed from 0 to 64 (in bits) (by +64 bits)
 
diff --git a/tests/data/test-diff-filter/test18-report.txt b/tests/data/test-diff-filter/test18-report.txt
index a2a1096..0f315b4 100644
--- a/tests/data/test-diff-filter/test18-report.txt
+++ b/tests/data/test-diff-filter/test18-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             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 1755df6..afca6b6 100644
--- a/tests/data/test-diff-filter/test2-report.txt
+++ b/tests/data/test-diff-filter/test2-report.txt
@@ -12,15 +12,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class C1':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
-          'int C1::m1', at offset 32 (in bits)
+          'int m1', at offset 32 (in bits)
 
   [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)
         1 data member insertion:
-          'char C0::m2', at offset 0 (in bits)
+          'char m2', at offset 0 (in bits)
         2 data member changes:
-          'E0 C0::m0' offset changed from 0 to 8 (in bits) (by +8 bits)
-          'E1 C0::m1' offset changed from 8 to 16 (in bits) (by +8 bits)
+          'E0 m0' offset changed from 0 to 8 (in bits) (by +8 bits)
+          'E1 m1' offset changed from 8 to 16 (in bits) (by +8 bits)
 
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 4c9d260..165a1f9 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
         no data member change (1 filtered);
 
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 0215d89..7d1a637 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
@@ -8,8 +8,8 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits)
+          'char m1', at offset 32 (in bits)
         1 data member change:
-          type of 'S* S::m2' changed:
+          type of 'S* m2' changed:
             pointed to type 'struct S' changed, as being reported
 
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 77725e8..2c64c39 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
@@ -11,9 +11,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               1 data member changes (1 filtered):
-                type of 'FooStruct::Embedded* S::m1' changed:
+                type of 'FooStruct::Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
-                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
+                      'char m1', at offset 32 (in bits)
 
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 23083ad..9af85bd 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
@@ -11,12 +11,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               2 data member changes:
-                type of 'FooStruct::Embedded* S::m1' changed:
+                type of 'FooStruct::Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
-                      'char FooStruct::Embedded::m1', at offset 32 (in bits)
-                type of 'FooStruct::Embedded** S::m2' changed:
+                      'char m1', at offset 32 (in bits)
+                type of 'FooStruct::Embedded** m2' changed:
                   in pointed to type 'FooStruct::Embedded*':
                     pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
 
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 4554873..e40324b 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 14f0813..a9a9187 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
@@ -8,13 +8,13 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [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
         1 data member changes (2 filtered):
-          type of 'S0* S::m0' changed:
+          type of 'S0* m0' changed:
             pointed to type 'struct S0' changed, as reported earlier
 
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 7703ecf..bef3d75 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
     parameter 1 of type 'S1*' changed:
       in pointed to type 'struct S1':
         entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
@@ -21,12 +21,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size hasn't changed
         3 data member changes:
-          type of 'S0* S::m0' changed:
+          type of 'S0* m0' changed:
             pointed to type 'struct S0' changed, as reported earlier
-          type of 'S1* S::m1' changed:
+          type of 'S1* m1' changed:
             in pointed to type 'struct S1':
               entity changed from 'struct S1' to compatible type 'typedef S1Renamed'
-          type of 'S2* S::m2' changed:
+          type of 'S2* m2' changed:
             in pointed to type 'struct S2':
               entity changed from 'struct S2' to compatible type 'typedef S2Renamed'
 
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 cd0c04b..cd5a7fc 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 e7de99b..f0127c6 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(s&)' has some indirect sub-type changes:
     parameter 1 of type 's&' has sub-type changes:
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 dd8b6b0..ba8629e 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void baz(base)' has some indirect sub-type changes:
     parameter 1 of type 'struct base' has sub-type changes:
@@ -22,5 +22,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           'struct base' changed:
             details were reported earlier
         1 data member change:
-          'int inherited::m0' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'int m0' offset changed from 32 to 64 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test3-report.txt b/tests/data/test-diff-filter/test3-report.txt
index e7ce5bb..963688f 100644
--- a/tests/data/test-diff-filter/test3-report.txt
+++ b/tests/data/test-diff-filter/test3-report.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 8 to 64 (in bits)
         1 data member insertion:
-          'int S::m0', at offset 0 (in bits)
+          'int m0', at offset 0 (in bits)
         1 data member change:
-          'char S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'char m1' offset changed from 0 to 32 (in bits) (by +32 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 2b66ef2..8a8eb51 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine':
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+            'mutex_t m_ptr_lock', at offset 1344 (in bits)
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-            'int Engine::m_num_cores', at offset 3776 (in bits)
-            'int Engine::m_num_threads', at offset 3808 (in bits)
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits)
+            'StreamMap m_stream_map', at offset 3072 (in bits)
+            'mutex_t m_stream_lock', at offset 3456 (in bits)
+            'int m_num_cores', at offset 3776 (in bits)
+            'int m_num_threads', at offset 3808 (in bits)
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits)
+            'DynLibList m_dyn_libs', at offset 4864 (in bits)
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                  'mutex_t m_ptr_lock', at offset 384 (in bits)
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> >
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> >
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits)
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor':
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits)
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits)
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits)
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits)
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits)
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits)
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits)
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
+            'bool m_wait_all_devices', at offset 320 (in bits)
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits)
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits)
+            '_Offload_stream m_stream', at offset 1984 (in bits)
+            'bool m_initial_need_runfunction', at offset 2248 (in bits)
+            'bool m_out_with_preallocated', at offset 2256 (in bits)
+            'bool m_preallocated_alloc', at offset 2264 (in bits)
+            'bool m_traceback_called', at offset 2272 (in bits)
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc':
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra':
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                  'void* alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits)
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges':
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                        'Arr_Desc* arr_desc', at offset 0 (in bits)
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
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 67345ab..08cffba 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine' at offload_engine.h:395:1:
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
+            'mutex_t m_ptr_lock', at offset 1344 (in bits) at offload_engine.h:474:1
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
-            'int Engine::m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
-            'int Engine::m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits) at offload_engine.h:630:1
+            'StreamMap m_stream_map', at offset 3072 (in bits) at offload_engine.h:637:1
+            'mutex_t m_stream_lock', at offset 3456 (in bits) at offload_engine.h:638:1
+            'int m_num_cores', at offset 3776 (in bits) at offload_engine.h:639:1
+            'int m_num_threads', at offset 3808 (in bits) at offload_engine.h:640:1
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits) at offload_engine.h:641:1
+            'DynLibList m_dyn_libs', at offset 4864 (in bits) at offload_engine.h:644:1
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
+                  'mutex_t m_ptr_lock', at offset 384 (in bits) at offload_engine.h:204:1
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits) at stl_tree.h:593:1
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits) at stl_tree.h:592:1
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits) at stl_tree.h:593:1
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits) at stl_tree.h:594:1
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits) at offload_host.h:288:1
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits) at offload_host.h:326:1
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits) at offload_host.h:329:1
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits) at offload_host.h:332:1
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits) at offload_host.h:347:1
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits) at offload_host.h:352:1
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits) at offload_host.h:357:1
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits) at offload_host.h:360:1
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits) at offload_host.h:362:1
+            'bool m_wait_all_devices', at offset 320 (in bits) at offload_host.h:288:1
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits) at offload_host.h:326:1
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits) at offload_host.h:329:1
+            '_Offload_stream m_stream', at offset 1984 (in bits) at offload_host.h:332:1
+            'bool m_initial_need_runfunction', at offset 2248 (in bits) at offload_host.h:347:1
+            'bool m_out_with_preallocated', at offset 2256 (in bits) at offload_host.h:352:1
+            'bool m_preallocated_alloc', at offset 2264 (in bits) at offload_host.h:357:1
+            'bool m_traceback_called', at offset 2272 (in bits) at offload_host.h:360:1
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits) at offload_host.h:362:1
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc' at offload_common.h:254:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits) at offload_host.h:222:1
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
+                  'void* alloc', at offset 320 (in bits) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits) at offload_host.h:227:1
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits) at cean_util.h:59:1
+                        'Arr_Desc* arr_desc', at offset 0 (in bits) at cean_util.h:59:1
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.cpp:409:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
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 47bb77a..06aa357 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -1180,40 +1180,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine' at offload_engine.h:395:1:
           type size changed from 0x158 to 0x2b0 (in bytes)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
+            'mutex_t m_ptr_lock', at offset 0xa8 (in bytes) at offload_engine.h:474:1
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
-            'StreamMap Engine::m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
-            'mutex_t Engine::m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
-            'int Engine::m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
-            'int Engine::m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
-            'std::bitset<1024ul> Engine::m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
-            'DynLibList Engine::m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
+            'PtrDataTable m_targetptr_set', at offset 0xd0 (in bytes) at offload_engine.h:630:1
+            'StreamMap m_stream_map', at offset 0x180 (in bytes) at offload_engine.h:637:1
+            'mutex_t m_stream_lock', at offset 0x1b0 (in bytes) at offload_engine.h:638:1
+            'int m_num_cores', at offset 0x1d8 (in bytes) at offload_engine.h:639:1
+            'int m_num_threads', at offset 0x1dc (in bytes) at offload_engine.h:640:1
+            'std::bitset<1024ul> m_cpus', at offset 0x1e0 (in bytes) at offload_engine.h:641:1
+            'DynLibList m_dyn_libs', at offset 0x260 (in bytes) at offload_engine.h:644:1
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable' at offload_engine.h:163:1
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 0x30 to 0x58 (in bytes)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
+                  'mutex_t m_ptr_lock', at offset 0x30 (in bytes) at offload_engine.h:204:1
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet at offload_engine.h:165:1
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' at stl_tree.h:357:1 changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type' at stl_set.h:115:1
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                              'std::_Rb_tree_node_base _M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 0x1 to 0x30 (in bytes)
                                 1 base class deletion:
@@ -1221,15 +1221,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> > at allocator.h:95:1
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bytes) at stl_tree.h:592:1
+                                  'std::_Rb_tree_node_base _M_header', at offset 0x8 (in bytes) at stl_tree.h:593:1
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 0x28 (in bytes) at stl_tree.h:594:1
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' at stl_tree.h:633:1
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' at stl_set.h:116:1
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list' at offload_engine.h:203:1
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
-            'mutex_t Engine::m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 0xd0 to 0x128 (in bytes) (by +0x58 bytes)
+            'mutex_t m_signal_lock' offset changed from 0x100 to 0x158 (in bytes) (by +0x58 bytes)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 0x180 to 0x1c0
               array type subrange 1 changed length from 6 to 7
@@ -1241,23 +1241,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor' at offload_host.h:68:1:
           type size changed from 0x118 to 0x128 (in bytes)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 0x28 (in bytes) at offload_host.h:288:1
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 0xe4 (in bytes) at offload_host.h:326:1
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 0xf4 (in bytes) at offload_host.h:329:1
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 0xf8 (in bytes) at offload_host.h:332:1
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 0x119 (in bytes) at offload_host.h:347:1
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 0x11a (in bytes) at offload_host.h:352:1
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 0x11b (in bytes) at offload_host.h:357:1
-            'bool OffloadDescriptor::m_traceback_called', at offset 0x11c (in bytes) at offload_host.h:360:1
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 0x120 (in bytes) at offload_host.h:362:1
+            'bool m_wait_all_devices', at offset 0x28 (in bytes) at offload_host.h:288:1
+            'uint32_t m_in_deps_allocated', at offset 0xe4 (in bytes) at offload_host.h:326:1
+            'uint32_t m_out_deps_allocated', at offset 0xf4 (in bytes) at offload_host.h:329:1
+            '_Offload_stream m_stream', at offset 0xf8 (in bytes) at offload_host.h:332:1
+            'bool m_initial_need_runfunction', at offset 0x119 (in bytes) at offload_host.h:347:1
+            'bool m_out_with_preallocated', at offset 0x11a (in bytes) at offload_host.h:352:1
+            'bool m_preallocated_alloc', at offset 0x11b (in bytes) at offload_host.h:357:1
+            'bool m_traceback_called', at offset 0x11c (in bytes) at offload_host.h:360:1
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 0x120 (in bytes) at offload_host.h:362:1
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 0x28 to 0x29 (in bytes) (by +0x1 bytes)
+            'const bool m_is_openmp' offset changed from 0x29 to 0x2a (in bytes) (by +0x1 bytes)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc' at offload_common.h:254:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -1265,34 +1265,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
                 type size changed from 0x48 to 0x50 (in bytes)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
+                  'void* alloc', at offset 0x28 (in bytes) at offload_host.h:222:1
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 0x4c (in bytes) at offload_host.h:227:1
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges' at cean_util.h:58:1:
                       type size changed from 0x40 to 0x48 (in bytes)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
+                        'Arr_Desc* arr_desc', at offset 0 (in bytes) at cean_util.h:59:1
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
+                        'void* ptr' offset changed from 0 to 0x8 (in bytes) (by +0x8 bytes)
+                        'int64_t current_number' offset changed from 0x8 to 0x10 (in bytes) (by +0x8 bytes)
+                        'int64_t range_max_number' offset changed from 0x10 to 0x18 (in bytes) (by +0x8 bytes)
+                        'int64_t range_size' offset changed from 0x18 to 0x20 (in bytes) (by +0x8 bytes)
+                        'int last_noncont_ind' offset changed from 0x20 to 0x28 (in bytes) (by +0x8 bytes)
+                        'int64_t init_offset' offset changed from 0x28 to 0x30 (in bytes) (by +0x8 bytes)
+                        'CeanReadDim Dim[1]' offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
                   and offset changed from 0x30 to 0x38 (in bytes) (by +0x8 bytes)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 0x38 to 0x40 (in bytes) (by +0x8 bytes)
+                  'bool is_arr_ptr_el' offset changed from 0x40 to 0x48 (in bytes) (by +0x8 bytes)
+            'OffloadHostTimerData* m_timer_data' offset changed from 0xf8 to 0x100 (in bytes) (by +0x8 bytes)
+            'uint64_t m_in_datalen' offset changed from 0x100 to 0x108 (in bytes) (by +0x8 bytes)
+            'uint64_t m_out_datalen' offset changed from 0x108 to 0x110 (in bytes) (by +0x8 bytes)
+            'bool m_need_runfunction' offset changed from 0x110 to 0x118 (in bytes) (by +0x8 bytes)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' at offload_host.cpp:409:1 has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -1421,7 +1421,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func' at offload_table.h:295:1
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 10677fc..4338192 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
@@ -32,14 +32,14 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits)
+          'void (void*)* __padding', at offset 32 (in bits)
         6 data member changes:
-          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__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)
+          'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'method virtual std::__future_base::_Async_state_common::~_Async_state_common(int)' has some indirect sub-type changes:
     implicit parameter 0 of type 'std::__future_base::_Async_state_common*' has sub-type changes:
@@ -54,13 +54,13 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
                   entity changed from 'std::__future_base::_State_base*' to 'void'
                   type size changed from 32 to 0 (in bits)
             1 data member changes (1 filtered):
-              type of 'std::__future_base::_State_base::_Ptr_type std::__future_base::_State_base::_M_result' changed:
+              type of 'std::__future_base::_State_base::_Ptr_type _M_result' changed:
                 underlying type 'typedef std::__future_base::_Ptr' changed:
                   underlying type 'class std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' changed:
                     type name changed from 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' to 'std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>'
                     type size hasn't changed
                     1 data member change:
-                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::_M_t' changed:
+                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type _M_t' changed:
                         typedef name changed from std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type to std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>::__tuple_type
                         underlying type 'class std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' changed:
                           type name changed from 'std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' to 'std::tuple<std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter>'
@@ -85,7 +85,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
           type size hasn't changed
           no member function changes (14 filtered);
           1 data member change:
-            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_M_codecvt' changed:
+            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* _M_codecvt' changed:
               in pointed to type 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                 in unqualified underlying type 'typedef std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                   underlying type 'class std::codecvt<wchar_t, char, __mbstate_t>' changed:
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 84667be..15945ca 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
@@ -32,14 +32,14 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __cxxabiv1::__cxa_dependent_exception::__padding', at offset 32 (in bits) at unwind-cxx.h:120:1
+          'void (void*)* __padding', at offset 32 (in bits) at unwind-cxx.h:120:1
         6 data member changes:
-          'std::unexpected_handler __cxxabiv1::__cxa_dependent_exception::unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
-          'std::terminate_handler __cxxabiv1::__cxa_dependent_exception::terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* __cxxabiv1::__cxa_dependent_exception::nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
-          'int __cxxabiv1::__cxa_dependent_exception::handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__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)
+          'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
+          'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
+          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'method virtual std::__future_base::_Async_state_common::~_Async_state_common(int)' at compatibility-thread-c++0x.cc:117:1 has some indirect sub-type changes:
     implicit parameter 0 of type 'std::__future_base::_Async_state_common*' has sub-type changes:
@@ -54,13 +54,13 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
                   entity changed from 'std::__future_base::_State_base*' to 'void'
                   type size changed from 32 to 0 (in bits)
             1 data member changes (1 filtered):
-              type of 'std::__future_base::_State_base::_Ptr_type std::__future_base::_State_base::_M_result' changed:
+              type of 'std::__future_base::_State_base::_Ptr_type _M_result' changed:
                 underlying type 'typedef std::__future_base::_Ptr' at future:253:1 changed:
                   underlying type 'class std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' at unique_ptr.h:109:1 changed:
                     type name changed from 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>' to 'std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>'
                     type size hasn't changed
                     1 data member change:
-                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::_M_t' changed:
+                      type of 'std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type _M_t' changed:
                         typedef name changed from std::unique_ptr<std::__future_base::_Result<void>, std::__future_base::_Result_base::_Deleter>::__tuple_type to std::unique_ptr<std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter>::__tuple_type at unique_ptr.h:146:1
                         underlying type 'class std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' at tuple:521:1 changed:
                           type name changed from 'std::tuple<std::__future_base::_Result<void>*, std::__future_base::_Result_base::_Deleter>' to 'std::tuple<std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter>'
@@ -85,7 +85,7 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
           type size hasn't changed
           no member function changes (14 filtered);
           1 data member change:
-            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::_M_codecvt' changed:
+            type of 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type* _M_codecvt' changed:
               in pointed to type 'const std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type':
                 in unqualified underlying type 'typedef std::basic_filebuf<wchar_t, std::char_traits<wchar_t> >::__codecvt_type' at fstream:86:1:
                   underlying type 'class std::codecvt<wchar_t, char, __mbstate_t>' at codecvt.h:398:1 changed:
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 6172ccc..3008539 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 fefee3a..6088380 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
@@ -96,40 +96,40 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct Engine':
           type size changed from 2752 to 5504 (in bits)
           1 data member deletion:
-            'mutex_t Engine::m_ptr_lock', at offset 1344 (in bits)
+            'mutex_t m_ptr_lock', at offset 1344 (in bits)
           7 data member insertions:
-            'PtrDataTable Engine::m_targetptr_set', at offset 1664 (in bits)
-            'StreamMap Engine::m_stream_map', at offset 3072 (in bits)
-            'mutex_t Engine::m_stream_lock', at offset 3456 (in bits)
-            'int Engine::m_num_cores', at offset 3776 (in bits)
-            'int Engine::m_num_threads', at offset 3808 (in bits)
-            'std::bitset<1024ul> Engine::m_cpus', at offset 3840 (in bits)
-            'DynLibList Engine::m_dyn_libs', at offset 4864 (in bits)
+            'PtrDataTable m_targetptr_set', at offset 1664 (in bits)
+            'StreamMap m_stream_map', at offset 3072 (in bits)
+            'mutex_t m_stream_lock', at offset 3456 (in bits)
+            'int m_num_cores', at offset 3776 (in bits)
+            'int m_num_threads', at offset 3808 (in bits)
+            'std::bitset<1024ul> m_cpus', at offset 3840 (in bits)
+            'DynLibList m_dyn_libs', at offset 4864 (in bits)
           4 data member changes:
-            type of 'Engine::PtrSet Engine::m_ptr_set' changed:
+            type of 'Engine::PtrSet m_ptr_set' changed:
               entity changed from 'typedef Engine::PtrSet' to compatible type 'class PtrDataTable'
                 type name changed from 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >' to 'PtrDataTable'
                 type size changed from 384 to 704 (in bits)
                 1 data member insertion:
-                  'mutex_t PtrDataTable::m_ptr_lock', at offset 384 (in bits)
+                  'mutex_t m_ptr_lock', at offset 384 (in bits)
                 1 data member change:
-                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed:
+                  type of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type _M_t' changed:
                     typedef name changed from std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type to PtrDataTable::PtrSet
                     underlying type 'class std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' changed:
                       type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >' to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >'
                       type size hasn't changed
                       1 data member change:
-                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed:
+                        type of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true> _M_impl' changed:
                           entity changed from 'struct std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to compatible type 'typedef std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_Rep_type'
                             type name changed from 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >'
                             type size hasn't changed
                             1 base class deletion:
                               class std::allocator<std::_Rb_tree_node<PtrData> >
                             2 data member deletions:
-                              'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                              'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                              'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                             1 data member change:
-                              type of 'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed:
+                              type of 'std::less<PtrData> _M_key_compare' changed:
                                 type name changed from 'std::less<PtrData>' to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>'
                                 type size changed from 8 to 384 (in bits)
                                 1 base class deletion:
@@ -137,15 +137,15 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                                 1 base class insertion:
                                   class std::allocator<std::_Rb_tree_node<PtrData> >
                                 3 data member insertions:
-                                  'std::less<PtrData> std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare', at offset 0 (in bits)
-                                  'std::_Rb_tree_node_base std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_header', at offset 64 (in bits)
-                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_node_count', at offset 320 (in bits)
+                                  'std::less<PtrData> _M_key_compare', at offset 0 (in bits)
+                                  'std::_Rb_tree_node_base _M_header', at offset 64 (in bits)
+                                  'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::size_type _M_node_count', at offset 320 (in bits)
                               and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_Rb_tree_impl<std::less<PtrData>, true>::_M_key_compare' changed to 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl'
                         and name of 'std::_Rb_tree<PtrData, PtrData, std::_Identity<PtrData>, std::less<PtrData>, std::allocator<PtrData> >::_M_impl' changed to 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t'
                   and name of 'std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::_M_t' changed to 'PtrDataTable::list'
-            'Engine::SignalMap Engine::m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
-            'mutex_t Engine::m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
-            type of 'coifunction* Engine::m_funcs[6]' changed:
+            'Engine::SignalMap m_signal_map' offset changed from 1664 to 2368 (in bits) (by +704 bits)
+            'mutex_t m_signal_lock' offset changed from 2048 to 2752 (in bits) (by +704 bits)
+            type of 'coifunction* m_funcs[6]' changed:
               type name changed from 'coifunction*[6]' to 'coifunction*[7]'
               array type size changed from 384 to 448
               array type subrange 1 changed length from 6 to 7
@@ -157,23 +157,23 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         in pointed to type 'struct OffloadDescriptor':
           type size changed from 2240 to 2368 (in bits)
           9 data member insertions:
-            'bool OffloadDescriptor::m_wait_all_devices', at offset 320 (in bits)
-            'uint32_t OffloadDescriptor::m_in_deps_allocated', at offset 1824 (in bits)
-            'uint32_t OffloadDescriptor::m_out_deps_allocated', at offset 1952 (in bits)
-            '_Offload_stream OffloadDescriptor::m_stream', at offset 1984 (in bits)
-            'bool OffloadDescriptor::m_initial_need_runfunction', at offset 2248 (in bits)
-            'bool OffloadDescriptor::m_out_with_preallocated', at offset 2256 (in bits)
-            'bool OffloadDescriptor::m_preallocated_alloc', at offset 2264 (in bits)
-            'bool OffloadDescriptor::m_traceback_called', at offset 2272 (in bits)
-            'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::m_omp_async_last_event_type', at offset 2304 (in bits)
+            'bool m_wait_all_devices', at offset 320 (in bits)
+            'uint32_t m_in_deps_allocated', at offset 1824 (in bits)
+            'uint32_t m_out_deps_allocated', at offset 1952 (in bits)
+            '_Offload_stream m_stream', at offset 1984 (in bits)
+            'bool m_initial_need_runfunction', at offset 2248 (in bits)
+            'bool m_out_with_preallocated', at offset 2256 (in bits)
+            'bool m_preallocated_alloc', at offset 2264 (in bits)
+            'bool m_traceback_called', at offset 2272 (in bits)
+            'OffloadDescriptor::OmpAsyncLastEventType m_omp_async_last_event_type', at offset 2304 (in bits)
           8 data member changes (2 filtered):
-            'bool OffloadDescriptor::m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
-            'const bool OffloadDescriptor::m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
-            type of 'VarDesc* OffloadDescriptor::m_vars' changed:
+            'bool m_is_mandatory' offset changed from 320 to 328 (in bits) (by +8 bits)
+            'const bool m_is_openmp' offset changed from 328 to 336 (in bits) (by +8 bits)
+            type of 'VarDesc* m_vars' changed:
               in pointed to type 'struct VarDesc':
                 type size hasn't changed
                 1 data member change:
-                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} VarDesc::flags' changed:
+                  type of 'union {struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}; uint32_t bits;} flags' changed:
                     type name changed from 'VarDesc::__anonymous_union__2' to 'varDescFlags'
                     type size hasn't changed
                     1 data member changes (1 filtered):
@@ -181,34 +181,34 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                       to:
                         struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-            type of 'OffloadDescriptor::VarExtra* OffloadDescriptor::m_vars_extra' changed:
+            type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
               in pointed to type 'struct OffloadDescriptor::VarExtra':
                 type size changed from 576 to 640 (in bits)
                 2 data member insertions:
-                  'void* OffloadDescriptor::VarExtra::alloc', at offset 320 (in bits)
-                  'OffloadDescriptor::OmpAsyncLastEventType OffloadDescriptor::VarExtra::omp_last_event_type', at offset 608 (in bits)
+                  'void* alloc', at offset 320 (in bits)
+                  'OffloadDescriptor::OmpAsyncLastEventType omp_last_event_type', at offset 608 (in bits)
                 4 data member changes (3 filtered):
-                  'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
-                  type of 'CeanReadRanges* OffloadDescriptor::VarExtra::read_rng_dst' changed:
+                  'CeanReadRanges* read_rng_src' offset changed from 320 to 384 (in bits) (by +64 bits)
+                  type of 'CeanReadRanges* read_rng_dst' changed:
                     in pointed to type 'struct CeanReadRanges':
                       type size changed from 512 to 576 (in bits)
                       1 data member insertion:
-                        'Arr_Desc* CeanReadRanges::arr_desc', at offset 0 (in bits)
+                        'Arr_Desc* arr_desc', at offset 0 (in bits)
                       7 data member changes:
-                        'void* CeanReadRanges::ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
-                        'int CeanReadRanges::last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
-                        'int64_t CeanReadRanges::init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
-                        'CeanReadDim CeanReadRanges::Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
+                        'void* ptr' offset changed from 0 to 64 (in bits) (by +64 bits)
+                        'int64_t current_number' offset changed from 64 to 128 (in bits) (by +64 bits)
+                        'int64_t range_max_number' offset changed from 128 to 192 (in bits) (by +64 bits)
+                        'int64_t range_size' offset changed from 192 to 256 (in bits) (by +64 bits)
+                        'int last_noncont_ind' offset changed from 256 to 320 (in bits) (by +64 bits)
+                        'int64_t init_offset' offset changed from 320 to 384 (in bits) (by +64 bits)
+                        'CeanReadDim Dim[1]' offset changed from 384 to 448 (in bits) (by +64 bits)
                   and offset changed from 384 to 448 (in bits) (by +64 bits)
-                  'int64_t OffloadDescriptor::VarExtra::ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
-                  'bool OffloadDescriptor::VarExtra::is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
-            'OffloadHostTimerData* OffloadDescriptor::m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
-            'uint64_t OffloadDescriptor::m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-            '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)
+                  'int64_t ptr_arr_offset' offset changed from 448 to 512 (in bits) (by +64 bits)
+                  'bool is_arr_ptr_el' offset changed from 512 to 576 (in bits) (by +64 bits)
+            'OffloadHostTimerData* m_timer_data' offset changed from 1984 to 2048 (in bits) (by +64 bits)
+            'uint64_t m_in_datalen' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+            'uint64_t m_out_datalen' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+            'bool m_need_runfunction' offset changed from 2176 to 2240 (in bits) (by +64 bits)
 
   [C] 'method void OffloadDescriptor::report_coi_error(error_types, COIRESULT)' has some indirect sub-type changes:
     parameter 1 of type 'typedef error_types' changed:
@@ -337,7 +337,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
           type name changed from 'InitTableEntry' to '__anonymous_struct__2'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* InitTableEntry::func' changed:
+            type of 'void ()* func' changed:
               in pointed to type 'function type void ()':
                 parameter 1 of type 'typedef MyoArena' was added
             and name of 'InitTableEntry::func' changed to '__anonymous_struct__2::func'
diff --git a/tests/data/test-diff-filter/test36-report-0.txt b/tests/data/test-diff-filter/test36-report-0.txt
index 12916d6..86a7f3e 100644
--- a/tests/data/test-diff-filter/test36-report-0.txt
+++ b/tests/data/test-diff-filter/test36-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-1-v1.c:6:1:
         type size hasn't changed
         1 data member change:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
 
@@ -17,10 +17,10 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S' at test36-2-v1.c:6:1:
         type size hasn't changed
         2 data member changes:
-          type of 'int S::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'unsigned int'
             type size hasn't changed
-          type of 'int S::m1' changed:
+          type of 'int m1' changed:
             type name changed from 'int' to 'unsigned int'
             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 582a7b3..dc4483f 100644
--- a/tests/data/test-diff-filter/test37-report-0.txt
+++ b/tests/data/test-diff-filter/test37-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct A' at test37-v1.cc:3:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int A::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
 
@@ -17,7 +17,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct B' at test37-v1.cc:8:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int B::m0' changed:
+          type of 'int m0' changed:
             type name changed from 'int' to 'char'
             type size changed from 32 to 8 (in bits)
 
@@ -26,7 +26,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct C' at test37-v1.cc:13:1:
         type size changed from 32 to 8 (in bits)
         1 data member change:
-          type of 'int C::m0' changed:
+          type of 'int m0' 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/test39/test39-report-0.txt b/tests/data/test-diff-filter/test39/test39-report-0.txt
index d7f3e24..dd030b3 100644
--- a/tests/data/test-diff-filter/test39/test39-report-0.txt
+++ b/tests/data/test-diff-filter/test39/test39-report-0.txt
@@ -8,20 +8,20 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct container_type' at test39.h:3:1:
         type size hasn't changed
         1 data member change:
-          type of 'opaque_type* container_type::s' changed:
+          type of 'opaque_type* s' changed:
             in pointed to type 'struct opaque_type' at test39-b-v1.c:3:1:
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char opaque_type::m1', at offset 32 (in bits) at test39-b-v1.c:6:1
+                'char 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:
     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
         1 data member change:
-          type of 'opaque_type* container_type::s' changed:
+          type of 'opaque_type* s' changed:
             in pointed to type 'struct opaque_type' at test39-c-v1.c:3:1:
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'unsigned char opaque_type::m1', at offset 32 (in bits) at test39-c-v1.c:6:1
+                'unsigned char m1', at offset 32 (in bits) at test39-c-v1.c:6:1
 
diff --git a/tests/data/test-diff-filter/test42-leaf-report-output-0.txt b/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
index d40a137..8cfc21d 100644
--- a/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
+++ b/tests/data/test-diff-filter/test42-leaf-report-output-0.txt
@@ -6,6 +6,6 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf at test42-leaf-report-v0.cc:4:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf::m1', at offset 32 (in bits) at test42-leaf-report-v1.cc:7:1
+    'char m1', at offset 32 (in bits) at test42-leaf-report-v1.cc:7:1
   one impacted interface:
     function void fn(C&)
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 ed68b55..11e1ef0 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
@@ -13,5 +13,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           to:
             struct {int b; float c; char e;}
           and size changed from 64 to 96 (in bits) (by +32 bits)
-          'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+          'int d' offset changed from 96 to 128 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
index 0979891..13280bc 100644
--- a/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
+++ b/tests/data/test-diff-filter/test44-anonymous-data-member-report-1.txt
@@ -11,4 +11,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     to:
       struct {int b; float c; char e;}
     and size changed from 64 to 96 (in bits) (by +32 bits)
-    'int S2::d' offset changed from 96 to 128 (in bits) (by +32 bits)
+    'int d' offset changed from 96 to 128 (in bits) (by +32 bits)
diff --git a/tests/data/test-diff-filter/test9-report.txt b/tests/data/test-diff-filter/test9-report.txt
index 12797e9..5f5745b 100644
--- a/tests/data/test-diff-filter/test9-report.txt
+++ b/tests/data/test-diff-filter/test9-report.txt
@@ -14,5 +14,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct S':
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S::m0', at offset 0 (in bits)
+            'int m0', at offset 0 (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 6358be7..fceae9d 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
@@ -11,14 +11,14 @@
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
           1 data member change:
-            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* gl_h__gluint_vec___XUP::P_BOUNDS' changed:
+            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
                 type size hasn't changed
                 2 data member changes:
-                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::LB0' changed:
+                  type of 'integer LB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
-                  type of 'integer gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB::UB0' changed:
+                  type of 'integer UB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
 
@@ -27,14 +27,14 @@
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
           1 data member change:
-            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* gtk__glarea__attributes_array___XUP::P_BOUNDS' changed:
+            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
                 type size hasn't changed
                 2 data member changes:
-                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::LB0' changed:
+                  type of 'integer LB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
-                  type of 'integer gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB::UB0' changed:
+                  type of 'integer UB0' changed:
                     entity changed from 'integer' to '<range natural___XDLU_0__2147483647>[2147483648]'
                     type size changed from 32 to 2147483647 (in bits)
 
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 4dd8f2e..4b5976b 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -33,12 +33,12 @@
     [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
-        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* _FlatpakTransactionClass::end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
+        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
       4 data member changes (3 filtered):
-        'typedef gboolean (FlatpakTransaction*)* _FlatpakTransactionClass::ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* _FlatpakTransactionClass::add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* _FlatpakTransactionClass::run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-        'gpointer _FlatpakTransactionClass::padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*)* ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+        'gpointer padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
 
   3 added types unreachable from any public interface:
 
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 6b47594..2d53dc6 100644
--- a/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-1-report-1.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits)
+            'char mem1', at offset 32 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 6a48bb5..e705a72 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-1.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S1':
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S1::mem2', at offset 0 (in bits)
+            'int mem2', at offset 0 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 cff94ef..8f40db2 100644
--- a/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
+++ b/tests/data/test-diff-pkg/dirpkg-3-report-2.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S1' at obj-v0.cc:15:1:
           type size changed from 8 to 32 (in bits)
           1 data member insertion:
-            'int S1::mem2', at offset 0 (in bits) at obj-v0.cc:17:1
+            'int mem2', at offset 0 (in bits) at obj-v0.cc:17:1
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 2172e1c..5ef6a7e 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
@@ -16,19 +16,19 @@
           in pointed to type 'struct _IceConn' at ICEconn.h:131:1:
             type size hasn't changed
             2 data member changes (2 filtered):
-              type of 'IceListenObj _IceConn::listen_obj' changed:
+              type of 'IceListenObj listen_obj' changed:
                 underlying type '_IceListenObj*' changed:
                   in pointed to type 'struct _IceListenObj' at ICElibint.h:120:1:
                     type size hasn't changed
                     1 data member change:
-                      type of '_XtransConnInfo* _IceListenObj::trans_conn' changed:
+                      type of '_XtransConnInfo* trans_conn' changed:
                         in pointed to type 'struct _XtransConnInfo' at Xtransint.h:136:1:
                           type size changed from 640 to 768 (in bits)
                           2 data member insertions:
-                            '_XtransConnFd* _XtransConnInfo::recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
-                            '_XtransConnFd* _XtransConnInfo::send_fds', at offset 704 (in bits) at Xtransint.h:149:1
+                            '_XtransConnFd* recv_fds', at offset 640 (in bits) at Xtransint.h:148:1
+                            '_XtransConnFd* send_fds', at offset 704 (in bits) at Xtransint.h:149:1
                           no data member change (1 filtered);
-              type of '_IcePingWait* _IceConn::ping_waits' changed:
+              type of '_IcePingWait* ping_waits' changed:
                 in pointed to type 'struct _IcePingWait' at ICEconn.h:48:1:
                   entity changed from 'struct _IcePingWait' to compatible type 'typedef _IcePingWait' at ICEconn.h:48:1
 
@@ -53,7 +53,7 @@
           entity changed from 'struct _IceWatchProc' to compatible type 'typedef _IceWatchProc' at ICElibint.h:322:1
             type size hasn't changed
             1 data member changes (2 filtered):
-              type of '_IceWatchedConnection* _IceWatchProc::watched_connections' changed:
+              type of '_IceWatchedConnection* watched_connections' changed:
                 in pointed to type 'struct _IceWatchedConnection' at ICElibint.h:315:1:
                   entity changed from 'struct _IceWatchedConnection' to compatible type 'typedef _IceWatchedConnection' at ICElibint.h:315: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 6dfed24..5eb2cda 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
@@ -14,24 +14,24 @@
                 underlying type 'struct cdio_dvd_disckey' at dvd.h:100:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    'unsigned int cdio_dvd_disckey::agid' offset changed from 0 to 8 (in bits) (by +8 bits)
+                    'unsigned int agid' offset changed from 0 to 8 (in bits) (by +8 bits)
               type of 'cdio_dvd_physical_t physical' changed:
                 underlying type 'struct cdio_dvd_physical' at dvd.h:86:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    type of 'cdio_dvd_layer_t cdio_dvd_physical::layer[4]' changed:
+                    type of 'cdio_dvd_layer_t layer[4]' changed:
                       array element type 'typedef cdio_dvd_layer_t' changed:
                         underlying type 'struct cdio_dvd_layer' at dvd.h:65:1 changed:
                           type size hasn't changed
                           8 data member changes:
-                            'unsigned int cdio_dvd_layer::layer_type' offset changed from 0 to 16 (in bits) (by +16 bits)
-                            'unsigned int cdio_dvd_layer::min_rate' offset changed from 0 to 8 (in bits) (by +8 bits)
-                            'unsigned int cdio_dvd_layer::linear_density' offset changed from 3 to 27 (in bits) (by +24 bits)
-                            'unsigned int cdio_dvd_layer::disc_size' offset changed from 4 to 12 (in bits) (by +8 bits)
-                            'unsigned int cdio_dvd_layer::track_path' offset changed from 4 to 20 (in bits) (by +16 bits)
-                            'unsigned int cdio_dvd_layer::nlayers' offset changed from 5 to 21 (in bits) (by +16 bits)
-                            'unsigned int cdio_dvd_layer::bca' offset changed from 7 to 31 (in bits) (by +24 bits)
-                            'unsigned int cdio_dvd_layer::track_density' offset changed from 7 to 23 (in bits) (by +16 bits)
+                            'unsigned int layer_type' offset changed from 0 to 16 (in bits) (by +16 bits)
+                            'unsigned int min_rate' offset changed from 0 to 8 (in bits) (by +8 bits)
+                            'unsigned int linear_density' offset changed from 3 to 27 (in bits) (by +24 bits)
+                            'unsigned int disc_size' offset changed from 4 to 12 (in bits) (by +8 bits)
+                            'unsigned int track_path' offset changed from 4 to 20 (in bits) (by +16 bits)
+                            'unsigned int nlayers' offset changed from 5 to 21 (in bits) (by +16 bits)
+                            'unsigned int bca' offset changed from 7 to 31 (in bits) (by +24 bits)
+                            'unsigned int track_density' offset changed from 7 to 23 (in bits) (by +16 bits)
                       type size hasn't changed
 
     [C] 'function discmode_t mmc_get_dvd_struct_physical_private(void*, mmc_run_cmd_fn_t, cdio_dvd_struct_t*)' at mmc.c:450:1 has some indirect sub-type changes:
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 8be4acf..c45d152 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
@@ -18,11 +18,11 @@
           in pointed to type 'struct sigc::connection':
             type size hasn't changed
             1 data member change:
-              type of 'sigc::slot_base* sigc::connection::slot_' changed:
+              type of 'sigc::slot_base* slot_' changed:
                 in pointed to type 'class sigc::slot_base':
                   type size hasn't changed
                   1 data member change:
-                    type of 'sigc::slot_base::rep_type* sigc::slot_base::rep_' changed:
+                    type of 'sigc::slot_base::rep_type* rep_' changed:
                       in pointed to type 'typedef sigc::slot_base::rep_type':
                         underlying type 'struct sigc::internal::slot_rep' changed:
                           type size hasn't changed
@@ -30,11 +30,11 @@
                             'struct sigc::trackable' changed:
                               type size hasn't changed
                               1 data member change:
-                                type of 'sigc::internal::trackable_callback_list* sigc::trackable::callback_list_' changed:
+                                type of 'sigc::internal::trackable_callback_list* callback_list_' changed:
                                   in pointed to type 'struct sigc::internal::trackable_callback_list':
                                     type size changed from 192 to 256 (in bits)
                                     2 data member changes:
-                                      type of 'sigc::internal::trackable_callback_list::callback_list sigc::internal::trackable_callback_list::callbacks_' changed:
+                                      type of 'sigc::internal::trackable_callback_list::callback_list callbacks_' changed:
                                         underlying type 'class std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' changed:
                                           type name changed from 'std::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::list<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                           type size changed from 128 to 192 (in bits)
@@ -43,23 +43,23 @@
                                               type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >'
                                               type size changed from 128 to 192 (in bits)
                                               1 data member change:
-                                                type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed:
+                                                type of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl _M_impl' changed:
                                                   type name changed from 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl' to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl'
                                                   type size changed from 128 to 192 (in bits)
                                                   1 data member change:
-                                                    type of 'std::__detail::_List_node_base std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed:
+                                                    type of 'std::__detail::_List_node_base _M_node' changed:
                                                       type name changed from 'std::__detail::_List_node_base' to 'std::_List_node<long unsigned int>'
                                                       type size changed from 128 to 192 (in bits)
                                                       1 base class insertion:
                                                         struct std::__detail::_List_node_base
                                                       2 data member deletions:
-                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_next', at offset 0 (in bits)
-                                                        'std::__detail::_List_node_base* std::__detail::_List_node_base::_M_prev', at offset 64 (in bits)
+                                                        'std::__detail::_List_node_base* _M_next', at offset 0 (in bits)
+                                                        'std::__detail::_List_node_base* _M_prev', at offset 64 (in bits)
                                                       1 data member insertion:
-                                                        'unsigned long int std::_List_node<long unsigned int>::_M_data', at offset 128 (in bits)
+                                                        'unsigned long int _M_data', at offset 128 (in bits)
                                                     and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_List_impl::_M_node'
                                                 and name of 'std::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl' changed to 'std::__cxx11::_List_base<sigc::internal::trackable_callback, std::allocator<sigc::internal::trackable_callback> >::_M_impl'
-                                      'bool sigc::internal::trackable_callback_list::clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
+                                      'bool clearing_' offset changed from 128 to 192 (in bits) (by +64 bits)
 
     [C] 'method void sigc::internal::signal_impl::block(bool)' has some indirect sub-type changes:
       implicit parameter 0 of type 'sigc::internal::signal_impl* const' has sub-type changes:
@@ -67,7 +67,7 @@
           in pointed to type 'struct sigc::internal::signal_impl':
             type size changed from 192 to 256 (in bits)
             1 data member change:
-              type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > sigc::internal::signal_impl::slots_' changed:
+              type of 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> > slots_' changed:
                 type name changed from 'std::list<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::list<sigc::slot_base, std::allocator<sigc::slot_base> >'
                 type size changed from 128 to 192 (in bits)
                 1 base class change:
@@ -75,7 +75,7 @@
                     type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >'
                     type size changed from 128 to 192 (in bits)
                     1 data member change:
-                      type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_M_impl' changed:
+                      type of 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl _M_impl' changed:
                         type name changed from 'std::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl' to 'std::__cxx11::_List_base<sigc::slot_base, std::allocator<sigc::slot_base> >::_List_impl'
                         type size changed from 128 to 192 (in bits)
                         1 data member change:
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 f484d0c..9afaed4 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
@@ -40,9 +40,9 @@
           underlying type 'struct SSLCipherSuiteInfoStr' at sslt.h:178:1 changed:
             type size hasn't changed
             1 data member insertion:
-              'SSLAuthType SSLCipherSuiteInfoStr::authType', at offset 736 (in bits) at sslt.h:250:1
+              'SSLAuthType authType', at offset 736 (in bits) at sslt.h:250:1
             1 data member changes (3 filtered):
-              type of 'SSLAuthType SSLCipherSuiteInfoStr::authAlgorithm' changed:
+              type of 'SSLAuthType authAlgorithm' changed:
                 underlying type 'enum __anonymous_enum__' at sslt.h:87:1 changed:
                   type size hasn't changed
                   1 enumerator deletion:
@@ -79,27 +79,27 @@
           underlying type 'struct NSSCMSContentInfoStr' at cmst.h:131:1 changed:
             type size hasn't changed
             1 data member changes (2 filtered):
-              type of 'NSSCMSContent NSSCMSContentInfoStr::content' changed:
+              type of 'NSSCMSContent content' changed:
                 underlying type 'union NSSCMSContentUnion' at cmst.h:118:1 changed:
                   type size hasn't changed
                   1 data member changes (3 filtered):
-                    type of 'NSSCMSEncryptedData* NSSCMSContentUnion::encryptedData' changed:
+                    type of 'NSSCMSEncryptedData* encryptedData' changed:
                       in pointed to type 'typedef NSSCMSEncryptedData' at cmst.h:65:1:
                         underlying type 'struct NSSCMSEncryptedDataStr' at cmst.h:468:1 changed:
                           type size hasn't changed
                           1 data member changes (1 filtered):
-                            type of 'NSSCMSAttribute** NSSCMSEncryptedDataStr::unprotectedAttr' changed:
+                            type of 'NSSCMSAttribute** unprotectedAttr' changed:
                               in pointed to type 'NSSCMSAttribute*':
                                 in pointed to type 'typedef NSSCMSAttribute' at cmst.h:69:1:
                                   underlying type 'struct NSSCMSAttributeStr' at cmst.h:487:1 changed:
                                     type size hasn't changed
                                     1 data member change:
-                                      type of 'SECOidData* NSSCMSAttributeStr::typeTag' changed:
+                                      type of 'SECOidData* typeTag' changed:
                                         in pointed to type 'typedef SECOidData' at secoidt.h:16:1:
                                           underlying type 'struct SECOidDataStr' at secoidt.h:500:1 changed:
                                             type size hasn't changed
                                             1 data member change:
-                                              type of 'SECOidTag SECOidDataStr::offset' changed:
+                                              type of 'SECOidTag offset' changed:
                                                 underlying type 'enum __anonymous_enum__1' at secoidt.h:34:1 changed:
                                                   type size hasn't changed
                                                   1 enumerator insertion:
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 5463d5e..7f9a4ed 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
@@ -25,63 +25,63 @@
           underlying type 'struct QXLInstance' at spice.h:259:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'QXLState* QXLInstance::st' changed:
+              type of 'QXLState* st' changed:
                 in pointed to type 'typedef QXLState' at spice-qxl.h:35:1:
                   underlying type 'struct QXLState' at reds.h:93:1 changed:
                     type size hasn't changed
                     1 data member change:
-                      type of 'RedDispatcher* QXLState::dispatcher' changed:
+                      type of 'RedDispatcher* dispatcher' changed:
                         in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
                           underlying type 'struct RedDispatcher' at red_dispatcher.c:53:1 changed:
                             type size changed from 3264 to 3328 (in bits)
                             13 data member changes:
-                              type of 'QXLInstance* RedDispatcher::qxl' changed:
+                              type of 'QXLInstance* qxl' changed:
                                 in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                   underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'Dispatcher RedDispatcher::dispatcher' changed:
+                              type of 'Dispatcher dispatcher' changed:
                                 underlying type 'struct Dispatcher' at dispatcher.h:22:1 changed:
                                   type size changed from 960 to 1024 (in bits)
                                   1 data member insertion:
-                                    'dispatcher_handle_any_message Dispatcher::any_handler', at offset 960 (in bits) at dispatcher.h:56:1
+                                    'dispatcher_handle_any_message any_handler', at offset 960 (in bits) at dispatcher.h:56:1
                                   1 data member change:
-                                    type of 'SpiceCoreInterface* Dispatcher::recv_core' changed:
+                                    type of 'SpiceCoreInterface* recv_core' changed:
                                       in pointed to type 'typedef SpiceCoreInterface' at spice-core.h:56:1:
                                         underlying type 'struct SpiceCoreInterface' at spice.h:82:1 changed:
                                           type size hasn't changed
                                           3 data member changes:
-                                            type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* SpiceCoreInterface::watch_add' changed:
+                                            type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* watch_add' changed:
                                               in pointed to type 'function type SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)':
                                                 return type changed:
                                                   in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                     underlying type 'struct SpiceWatch' at red_worker.c:268:1 changed:
                                                       type size hasn't changed
                                                       1 data member change:
-                                                        type of 'RedWorker* SpiceWatch::worker' changed:
+                                                        type of 'RedWorker* worker' changed:
                                                           in pointed to type 'struct RedWorker' at red_worker.c:932:1:
                                                             type size changed from 15520192 to 14876992 (in bits)
                                                             1 data member deletion:
-                                                              'uint32_t RedWorker::preload_group_id', at offset 15379968 (in bits) at red_worker.c:992:1
+                                                              'uint32_t preload_group_id', at offset 15379968 (in bits) at red_worker.c:992:1
                                                             1 data member insertion:
-                                                              'FILE* RedWorker::record_fd', at offset 14876928 (in bits) at red_worker.c:1037:1
+                                                              'FILE* record_fd', at offset 14876928 (in bits) at red_worker.c:1037:1
                                                             37 data member changes (2 filtered):
-                                                              type of 'DisplayChannel* RedWorker::display_channel' changed:
+                                                              type of 'DisplayChannel* display_channel' changed:
                                                                 in pointed to type 'typedef DisplayChannel' at red_worker.c:434:1:
                                                                   underlying type 'struct DisplayChannel' at red_worker.c:715:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'CommonChannel DisplayChannel::common' changed:
+                                                                      type of 'CommonChannel common' changed:
                                                                         underlying type 'struct CommonChannel' at red_worker.c:650:1 changed:
                                                                           type size hasn't changed
                                                                           2 data member changes:
-                                                                            type of 'RedChannel CommonChannel::base' changed:
+                                                                            type of 'RedChannel base' changed:
                                                                               underlying type 'struct RedChannel' at red_channel.h:303:1 changed:
                                                                                 type size hasn't changed
                                                                                 3 data member changes:
-                                                                                  type of 'SpiceCoreInterface* RedChannel::core' changed:
+                                                                                  type of 'SpiceCoreInterface* core' changed:
                                                                                     in pointed to type 'typedef SpiceCoreInterface':
                                                                                       entity changed from 'typedef SpiceCoreInterface' to 'const SpiceCoreInterface'
                                                                                       type size hasn't changed
-                                                                                  type of 'ChannelCbs RedChannel::channel_cbs' changed:
+                                                                                  type of 'ChannelCbs channel_cbs' changed:
                                                                                     underlying type 'struct {channel_configure_socket_proc config_socket; channel_disconnect_proc on_disconnect; channel_send_pipe_item_proc send_item; channel_hold_pipe_item_proc hold_item; channel_release_pipe_item_proc release_item; channel_alloc_msg_recv_buf_proc alloc_recv_buf; channel_release_msg_recv_buf_proc release_recv_buf; channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark; channel_handle_migrate_data_proc handle_migrate_data; channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial;}' at red_channel.h:195:1 changed:
                                                                                       type size hasn't changed
                                                                                       10 data member changes:
@@ -93,135 +93,135 @@
                                                                                                   underlying type 'struct RedChannelClient' at red_channel.h:247:1 changed:
                                                                                                     type size hasn't changed
                                                                                                     3 data member changes:
-                                                                                                      type of 'RedChannel* RedChannelClient::channel' changed:
+                                                                                                      type of 'RedChannel* channel' changed:
                                                                                                         in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
                                                                                                           underlying type 'struct RedChannel' changed, as being reported
-                                                                                                      type of 'RedClient* RedChannelClient::client' changed:
+                                                                                                      type of 'RedClient* client' changed:
                                                                                                         in pointed to type 'typedef RedClient' at red_channel.h:132:1:
                                                                                                           underlying type 'struct RedClient' at red_channel.h:561:1 changed:
                                                                                                             type size hasn't changed
                                                                                                             1 data member change:
-                                                                                                              type of 'MainChannelClient* RedClient::mcc' changed:
+                                                                                                              type of 'MainChannelClient* mcc' changed:
                                                                                                                 in pointed to type 'typedef MainChannelClient' at red_channel.h:133:1:
                                                                                                                   underlying type 'struct MainChannelClient' at main_channel.c:145:1 changed:
                                                                                                                     type size hasn't changed
                                                                                                                     1 data member change:
-                                                                                                                      type of 'RedChannelClient MainChannelClient::base' changed:
+                                                                                                                      type of 'RedChannelClient base' changed:
                                                                                                                         underlying type 'struct RedChannelClient' changed, as being reported
-                                                                                                      type of 'RedsStream* RedChannelClient::stream' changed:
+                                                                                                      type of 'RedsStream* stream' changed:
                                                                                                         in pointed to type 'typedef RedsStream' at reds_stream.h:31:1:
                                                                                                           underlying type 'struct RedsStream' at reds.h:68:1 changed:
                                                                                                             type size changed from 1280 to 256 (in bits)
                                                                                                             5 data member deletions:
-                                                                                                              'RedsSASL RedsStream::sasl', at offset 256 (in bits) at reds.h:78:1
-                                                                                                              'SpiceChannelEventInfo* RedsStream::info', at offset 1024 (in bits) at reds.h:85:1
-                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::read', at offset 1088 (in bits) at reds.h:88:1
-                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* RedsStream::write', at offset 1152 (in bits) at reds.h:89:1
-                                                                                                              'typedef ssize_t (RedsStream*, const iovec*, int)* RedsStream::writev', at offset 1216 (in bits) at reds.h:90:1
+                                                                                                              'RedsSASL sasl', at offset 256 (in bits) at reds.h:78:1
+                                                                                                              'SpiceChannelEventInfo* info', at offset 1024 (in bits) at reds.h:85:1
+                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* read', at offset 1088 (in bits) at reds.h:88:1
+                                                                                                              'typedef ssize_t (RedsStream*, void*, typedef size_t)* write', at offset 1152 (in bits) at reds.h:89:1
+                                                                                                              'typedef ssize_t (RedsStream*, const iovec*, int)* writev', at offset 1216 (in bits) at reds.h:90:1
                                                                                                             2 data member changes:
-                                                                                                              type of 'SSL* RedsStream::ssl' changed:
+                                                                                                              type of 'SSL* ssl' changed:
                                                                                                                 in pointed to type 'typedef SSL' at reds_stream.h:32:1:
                                                                                                                   typedef name changed from SSL to RedsStreamPrivate at reds_stream.h:32:1
                                                                                                                   underlying type 'struct ssl_st' at ssl.h:1065:1 changed:
                                                                                                                     type name changed from 'ssl_st' to 'RedsStreamPrivate'
                                                                                                                     type size changed from 5504 to 0 (in bits)
                                                                                                                     94 data member deletions:
-                                                                                                                      'int ssl_st::version', at offset 0 (in bits) at ssl.h:1070:1
-                                                                                                                      'int ssl_st::type', at offset 32 (in bits) at ssl.h:1071:1
-                                                                                                                      'const SSL_METHOD* ssl_st::method', at offset 64 (in bits) at ssl.h:1073:1
-                                                                                                                      'BIO* ssl_st::rbio', at offset 128 (in bits) at ssl.h:1080:1
-                                                                                                                      'BIO* ssl_st::wbio', at offset 192 (in bits) at ssl.h:1081:1
-                                                                                                                      'BIO* ssl_st::bbio', at offset 256 (in bits) at ssl.h:1082:1
-                                                                                                                      'int ssl_st::rwstate', at offset 320 (in bits) at ssl.h:1093:1
-                                                                                                                      'int ssl_st::in_handshake', at offset 352 (in bits) at ssl.h:1096:1
-                                                                                                                      'int (SSL*)* ssl_st::handshake_func', at offset 384 (in bits) at ssl.h:1097:1
-                                                                                                                      'int ssl_st::server', at offset 448 (in bits) at ssl.h:1107:1
-                                                                                                                      'int ssl_st::new_session', at offset 480 (in bits) at ssl.h:1109:1
-                                                                                                                      'int ssl_st::quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
-                                                                                                                      'int ssl_st::shutdown', at offset 544 (in bits) at ssl.h:1114:1
-                                                                                                                      'int ssl_st::state', at offset 576 (in bits) at ssl.h:1116:1
-                                                                                                                      'int ssl_st::rstate', at offset 608 (in bits) at ssl.h:1117:1
-                                                                                                                      'BUF_MEM* ssl_st::init_buf', at offset 640 (in bits) at ssl.h:1119:1
-                                                                                                                      'void* ssl_st::init_msg', at offset 704 (in bits) at ssl.h:1120:1
-                                                                                                                      'int ssl_st::init_num', at offset 768 (in bits) at ssl.h:1121:1
-                                                                                                                      'int ssl_st::init_off', at offset 800 (in bits) at ssl.h:1122:1
-                                                                                                                      'unsigned char* ssl_st::packet', at offset 832 (in bits) at ssl.h:1125:1
-                                                                                                                      'unsigned int ssl_st::packet_length', at offset 896 (in bits) at ssl.h:1126:1
-                                                                                                                      'ssl2_state_st* ssl_st::s2', at offset 960 (in bits) at ssl.h:1128:1
-                                                                                                                      'ssl3_state_st* ssl_st::s3', at offset 1024 (in bits) at ssl.h:1129:1
-                                                                                                                      'dtls1_state_st* ssl_st::d1', at offset 1088 (in bits) at ssl.h:1130:1
-                                                                                                                      'int ssl_st::read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                                                                                      'void (int, int, int, void*, typedef size_t, SSL*, void*)* ssl_st::msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
-                                                                                                                      'void* ssl_st::msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
-                                                                                                                      'int ssl_st::hit', at offset 1344 (in bits) at ssl.h:1139:1
-                                                                                                                      'X509_VERIFY_PARAM* ssl_st::param', at offset 1408 (in bits) at ssl.h:1141:1
-                                                                                                                      'stack_st_SSL_CIPHER* ssl_st::cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
-                                                                                                                      'stack_st_SSL_CIPHER* ssl_st::cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
-                                                                                                                      'int ssl_st::mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
-                                                                                                                      'EVP_CIPHER_CTX* ssl_st::enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
-                                                                                                                      'EVP_MD_CTX* ssl_st::read_hash', at offset 1728 (in bits) at ssl.h:1156:1
-                                                                                                                      'COMP_CTX* ssl_st::expand', at offset 1792 (in bits) at ssl.h:1158:1
-                                                                                                                      'EVP_CIPHER_CTX* ssl_st::enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
-                                                                                                                      'EVP_MD_CTX* ssl_st::write_hash', at offset 1920 (in bits) at ssl.h:1164:1
-                                                                                                                      'COMP_CTX* ssl_st::compress', at offset 1984 (in bits) at ssl.h:1166:1
-                                                                                                                      'cert_st* ssl_st::cert', at offset 2048 (in bits) at ssl.h:1175:1
-                                                                                                                      'unsigned int ssl_st::sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
-                                                                                                                      'unsigned char ssl_st::sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
-                                                                                                                      'SSL_SESSION* ssl_st::session', at offset 2432 (in bits) at ssl.h:1183:1
-                                                                                                                      'GEN_SESSION_CB ssl_st::generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
-                                                                                                                      'int ssl_st::verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
-                                                                                                                      'int (int, X509_STORE_CTX*)* ssl_st::verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
-                                                                                                                      'void (const SSL*, int, int)* ssl_st::info_callback', at offset 2688 (in bits) at ssl.h:1193:1
-                                                                                                                      'int ssl_st::error', at offset 2752 (in bits) at ssl.h:1195:1
-                                                                                                                      'int ssl_st::error_code', at offset 2784 (in bits) at ssl.h:1196:1
-                                                                                                                      'KSSL_CTX* ssl_st::kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
-                                                                                                                      'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* ssl_st::psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
-                                                                                                                      'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* ssl_st::psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
-                                                                                                                      'SSL_CTX* ssl_st::ctx', at offset 3008 (in bits) at ssl.h:1210:1
-                                                                                                                      'int ssl_st::debug', at offset 3072 (in bits) at ssl.h:1213:1
-                                                                                                                      'long int ssl_st::verify_result', at offset 3136 (in bits) at ssl.h:1216:1
-                                                                                                                      'CRYPTO_EX_DATA ssl_st::ex_data', at offset 3200 (in bits) at ssl.h:1217:1
-                                                                                                                      'stack_st_X509_NAME* ssl_st::client_CA', at offset 3328 (in bits) at ssl.h:1220:1
-                                                                                                                      'int ssl_st::references', at offset 3392 (in bits) at ssl.h:1222:1
-                                                                                                                      'unsigned long int ssl_st::options', at offset 3456 (in bits) at ssl.h:1223:1
-                                                                                                                      'unsigned long int ssl_st::mode', at offset 3520 (in bits) at ssl.h:1224:1
-                                                                                                                      'long int ssl_st::max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
-                                                                                                                      'int ssl_st::first_packet', at offset 3648 (in bits) at ssl.h:1226:1
-                                                                                                                      'int ssl_st::client_version', at offset 3680 (in bits) at ssl.h:1227:1
-                                                                                                                      'unsigned int ssl_st::max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
-                                                                                                                      'void (SSL*, int, int, unsigned char*, int, void*)* ssl_st::tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
-                                                                                                                      'void* ssl_st::tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
-                                                                                                                      'char* ssl_st::tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
-                                                                                                                      'int ssl_st::servername_done', at offset 3968 (in bits) at ssl.h:1237:1
-                                                                                                                      'int ssl_st::tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
-                                                                                                                      'int ssl_st::tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
-                                                                                                                      'stack_st_OCSP_RESPID* ssl_st::tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
-                                                                                                                      'X509_EXTENSIONS* ssl_st::tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
-                                                                                                                      'int ssl_st::tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
-                                                                                                                      'int ssl_st::tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
-                                                                                                                      'size_t ssl_st::tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
-                                                                                                                      'size_t ssl_st::tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
-                                                                                                                      'unsigned char* ssl_st::tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
-                                                                                                                      'void* ssl_st::tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
-                                                                                                                      'size_t ssl_st::tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
-                                                                                                                      'TLS_SESSION_TICKET_EXT* ssl_st::tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
-                                                                                                                      'tls_session_ticket_ext_cb_fn ssl_st::tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
-                                                                                                                      'void* ssl_st::tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
-                                                                                                                      'tls_session_secret_cb_fn ssl_st::tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
-                                                                                                                      'void* ssl_st::tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
-                                                                                                                      'SSL_CTX* ssl_st::initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
-                                                                                                                      'unsigned char* ssl_st::next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
-                                                                                                                      'unsigned char ssl_st::next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
-                                                                                                                      'stack_st_SRTP_PROTECTION_PROFILE* ssl_st::srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
-                                                                                                                      'SRTP_PROTECTION_PROFILE* ssl_st::srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
-                                                                                                                      'unsigned int ssl_st::tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
-                                                                                                                      'unsigned int ssl_st::tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
-                                                                                                                      'unsigned int ssl_st::tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
-                                                                                                                      'int ssl_st::renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
+                                                                                                                      'int version', at offset 0 (in bits) at ssl.h:1070:1
+                                                                                                                      'int type', at offset 32 (in bits) at ssl.h:1071:1
+                                                                                                                      'const SSL_METHOD* method', at offset 64 (in bits) at ssl.h:1073:1
+                                                                                                                      'BIO* rbio', at offset 128 (in bits) at ssl.h:1080:1
+                                                                                                                      'BIO* wbio', at offset 192 (in bits) at ssl.h:1081:1
+                                                                                                                      'BIO* bbio', at offset 256 (in bits) at ssl.h:1082:1
+                                                                                                                      'int rwstate', at offset 320 (in bits) at ssl.h:1093:1
+                                                                                                                      'int in_handshake', at offset 352 (in bits) at ssl.h:1096:1
+                                                                                                                      'int (SSL*)* handshake_func', at offset 384 (in bits) at ssl.h:1097:1
+                                                                                                                      'int server', at offset 448 (in bits) at ssl.h:1107:1
+                                                                                                                      'int new_session', at offset 480 (in bits) at ssl.h:1109:1
+                                                                                                                      'int quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
+                                                                                                                      'int shutdown', at offset 544 (in bits) at ssl.h:1114:1
+                                                                                                                      'int state', at offset 576 (in bits) at ssl.h:1116:1
+                                                                                                                      'int rstate', at offset 608 (in bits) at ssl.h:1117:1
+                                                                                                                      'BUF_MEM* init_buf', at offset 640 (in bits) at ssl.h:1119:1
+                                                                                                                      'void* init_msg', at offset 704 (in bits) at ssl.h:1120:1
+                                                                                                                      'int init_num', at offset 768 (in bits) at ssl.h:1121:1
+                                                                                                                      'int init_off', at offset 800 (in bits) at ssl.h:1122:1
+                                                                                                                      'unsigned char* packet', at offset 832 (in bits) at ssl.h:1125:1
+                                                                                                                      'unsigned int packet_length', at offset 896 (in bits) at ssl.h:1126:1
+                                                                                                                      'ssl2_state_st* s2', at offset 960 (in bits) at ssl.h:1128:1
+                                                                                                                      'ssl3_state_st* s3', at offset 1024 (in bits) at ssl.h:1129:1
+                                                                                                                      'dtls1_state_st* d1', at offset 1088 (in bits) at ssl.h:1130:1
+                                                                                                                      'int read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
+                                                                                                                      'void (int, int, int, void*, typedef size_t, SSL*, void*)* msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
+                                                                                                                      'void* msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
+                                                                                                                      'int hit', at offset 1344 (in bits) at ssl.h:1139:1
+                                                                                                                      'X509_VERIFY_PARAM* param', at offset 1408 (in bits) at ssl.h:1141:1
+                                                                                                                      'stack_st_SSL_CIPHER* cipher_list', at offset 1472 (in bits) at ssl.h:1149:1
+                                                                                                                      'stack_st_SSL_CIPHER* cipher_list_by_id', at offset 1536 (in bits) at ssl.h:1150:1
+                                                                                                                      'int mac_flags', at offset 1600 (in bits) at ssl.h:1154:1
+                                                                                                                      'EVP_CIPHER_CTX* enc_read_ctx', at offset 1664 (in bits) at ssl.h:1155:1
+                                                                                                                      'EVP_MD_CTX* read_hash', at offset 1728 (in bits) at ssl.h:1156:1
+                                                                                                                      'COMP_CTX* expand', at offset 1792 (in bits) at ssl.h:1158:1
+                                                                                                                      'EVP_CIPHER_CTX* enc_write_ctx', at offset 1856 (in bits) at ssl.h:1163:1
+                                                                                                                      'EVP_MD_CTX* write_hash', at offset 1920 (in bits) at ssl.h:1164:1
+                                                                                                                      'COMP_CTX* compress', at offset 1984 (in bits) at ssl.h:1166:1
+                                                                                                                      'cert_st* cert', at offset 2048 (in bits) at ssl.h:1175:1
+                                                                                                                      'unsigned int sid_ctx_length', at offset 2112 (in bits) at ssl.h:1179:1
+                                                                                                                      'unsigned char sid_ctx[32]', at offset 2144 (in bits) at ssl.h:1180:1
+                                                                                                                      'SSL_SESSION* session', at offset 2432 (in bits) at ssl.h:1183:1
+                                                                                                                      'GEN_SESSION_CB generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
+                                                                                                                      'int verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
+                                                                                                                      'int (int, X509_STORE_CTX*)* verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
+                                                                                                                      'void (const SSL*, int, int)* info_callback', at offset 2688 (in bits) at ssl.h:1193:1
+                                                                                                                      'int error', at offset 2752 (in bits) at ssl.h:1195:1
+                                                                                                                      'int error_code', at offset 2784 (in bits) at ssl.h:1196:1
+                                                                                                                      'KSSL_CTX* kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
+                                                                                                                      'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
+                                                                                                                      'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
+                                                                                                                      'SSL_CTX* ctx', at offset 3008 (in bits) at ssl.h:1210:1
+                                                                                                                      'int debug', at offset 3072 (in bits) at ssl.h:1213:1
+                                                                                                                      'long int verify_result', at offset 3136 (in bits) at ssl.h:1216:1
+                                                                                                                      'CRYPTO_EX_DATA ex_data', at offset 3200 (in bits) at ssl.h:1217:1
+                                                                                                                      'stack_st_X509_NAME* client_CA', at offset 3328 (in bits) at ssl.h:1220:1
+                                                                                                                      'int references', at offset 3392 (in bits) at ssl.h:1222:1
+                                                                                                                      'unsigned long int options', at offset 3456 (in bits) at ssl.h:1223:1
+                                                                                                                      'unsigned long int mode', at offset 3520 (in bits) at ssl.h:1224:1
+                                                                                                                      'long int max_cert_list', at offset 3584 (in bits) at ssl.h:1225:1
+                                                                                                                      'int first_packet', at offset 3648 (in bits) at ssl.h:1226:1
+                                                                                                                      'int client_version', at offset 3680 (in bits) at ssl.h:1227:1
+                                                                                                                      'unsigned int max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
+                                                                                                                      'void (SSL*, int, int, unsigned char*, int, void*)* tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
+                                                                                                                      'void* tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
+                                                                                                                      'char* tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
+                                                                                                                      'int servername_done', at offset 3968 (in bits) at ssl.h:1237:1
+                                                                                                                      'int tlsext_status_type', at offset 4000 (in bits) at ssl.h:1244:1
+                                                                                                                      'int tlsext_status_expected', at offset 4032 (in bits) at ssl.h:1246:1
+                                                                                                                      'stack_st_OCSP_RESPID* tlsext_ocsp_ids', at offset 4096 (in bits) at ssl.h:1248:1
+                                                                                                                      'X509_EXTENSIONS* tlsext_ocsp_exts', at offset 4160 (in bits) at ssl.h:1249:1
+                                                                                                                      'unsigned char* tlsext_ocsp_resp', at offset 4224 (in bits) at ssl.h:1251:1
+                                                                                                                      'int tlsext_ocsp_resplen', at offset 4288 (in bits) at ssl.h:1252:1
+                                                                                                                      'int tlsext_ticket_expected', at offset 4320 (in bits) at ssl.h:1255:1
+                                                                                                                      'size_t tlsext_ecpointformatlist_length', at offset 4352 (in bits) at ssl.h:1257:1
+                                                                                                                      'unsigned char* tlsext_ecpointformatlist', at offset 4416 (in bits) at ssl.h:1258:1
+                                                                                                                      'size_t tlsext_ellipticcurvelist_length', at offset 4480 (in bits) at ssl.h:1259:1
+                                                                                                                      'unsigned char* tlsext_ellipticcurvelist', at offset 4544 (in bits) at ssl.h:1260:1
+                                                                                                                      'void* tlsext_opaque_prf_input', at offset 4608 (in bits) at ssl.h:1264:1
+                                                                                                                      'size_t tlsext_opaque_prf_input_len', at offset 4672 (in bits) at ssl.h:1265:1
+                                                                                                                      'TLS_SESSION_TICKET_EXT* tlsext_session_ticket', at offset 4736 (in bits) at ssl.h:1268:1
+                                                                                                                      'tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb', at offset 4800 (in bits) at ssl.h:1271:1
+                                                                                                                      'void* tls_session_ticket_ext_cb_arg', at offset 4864 (in bits) at ssl.h:1272:1
+                                                                                                                      'tls_session_secret_cb_fn tls_session_secret_cb', at offset 4928 (in bits) at ssl.h:1275:1
+                                                                                                                      'void* tls_session_secret_cb_arg', at offset 4992 (in bits) at ssl.h:1276:1
+                                                                                                                      'SSL_CTX* initial_ctx', at offset 5056 (in bits) at ssl.h:1278:1
+                                                                                                                      'unsigned char* next_proto_negotiated', at offset 5120 (in bits) at ssl.h:1288:1
+                                                                                                                      'unsigned char next_proto_negotiated_len', at offset 5184 (in bits) at ssl.h:1289:1
+                                                                                                                      'stack_st_SRTP_PROTECTION_PROFILE* srtp_profiles', at offset 5248 (in bits) at ssl.h:1294:1
+                                                                                                                      'SRTP_PROTECTION_PROFILE* srtp_profile', at offset 5312 (in bits) at ssl.h:1295:1
+                                                                                                                      'unsigned int tlsext_heartbeat', at offset 5376 (in bits) at ssl.h:1297:1
+                                                                                                                      'unsigned int tlsext_hb_pending', at offset 5408 (in bits) at ssl.h:1302:1
+                                                                                                                      'unsigned int tlsext_hb_seq', at offset 5440 (in bits) at ssl.h:1303:1
+                                                                                                                      'int renegotiate', at offset 5472 (in bits) at ssl.h:1308:1
                                                                                                               and name of 'RedsStream::ssl' changed to 'RedsStream::priv' at reds_stream.h:42:1
-                                                                                                              type of 'SpiceWatch* RedsStream::watch' changed:
+                                                                                                              type of 'SpiceWatch* watch' changed:
                                                                                                                 in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                                                                                   underlying type 'struct SpiceWatch' changed, as being reported
                                                                                         type of 'channel_disconnect_proc on_disconnect' changed:
@@ -269,7 +269,7 @@
                                                                                             in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
                                                                                               parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                                 pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                                                                  type of 'ClientCbs RedChannel::client_cbs' changed:
+                                                                                  type of 'ClientCbs client_cbs' changed:
                                                                                     underlying type 'struct {channel_client_connect_proc connect; channel_client_disconnect_proc disconnect; channel_client_migrate_proc migrate;}' at red_channel.h:213:1 changed:
                                                                                       type size hasn't changed
                                                                                       3 data member changes:
@@ -293,91 +293,91 @@
                                                                                             in pointed to type 'function type void (RedChannelClient*)':
                                                                                               parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                                 pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                                                            type of 'RedWorker* CommonChannel::worker' changed:
+                                                                            type of 'RedWorker* worker' changed:
                                                                               pointed to type 'struct RedWorker' changed, as being reported
-                                                              type of 'CursorChannel* RedWorker::cursor_channel' changed:
+                                                              type of 'CursorChannel* cursor_channel' changed:
                                                                 in pointed to type 'typedef CursorChannel' at red_worker.c:774:1:
                                                                   underlying type 'struct CursorChannel' at red_worker.c:750:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'CommonChannel CursorChannel::common' changed, as reported earlier
-                                                              type of 'QXLInstance* RedWorker::qxl' changed:
+                                                                      type of 'CommonChannel common' changed, as reported earlier
+                                                              type of 'QXLInstance* qxl' changed:
                                                                 in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                                                   underlying type 'struct QXLInstance' changed, as being reported
-                                                              type of 'RedDispatcher* RedWorker::red_dispatcher' changed:
+                                                              type of 'RedDispatcher* red_dispatcher' changed:
                                                                 in pointed to type 'typedef RedDispatcher':
                                                                   entity changed from 'typedef RedDispatcher' to compatible type 'struct RedDispatcher'
                                                                     details are being reported
-                                                              type of 'SpiceWatch RedWorker::watches[20]' changed:
+                                                              type of 'SpiceWatch watches[20]' changed:
                                                                 array element type 'struct SpiceWatch' changed:
                                                                   details are being reported
                                                                 type size hasn't changed
-                                                              type of 'MonitorsConfig* RedWorker::monitors_config' changed:
+                                                              type of 'MonitorsConfig* monitors_config' changed:
                                                                 in pointed to type 'typedef MonitorsConfig' at red_worker.c:361:1:
                                                                   underlying type 'struct MonitorsConfig' at red_worker.c:344:1 changed:
                                                                     type size hasn't changed
                                                                     1 data member change:
-                                                                      type of 'RedWorker* MonitorsConfig::worker' changed:
+                                                                      type of 'RedWorker* worker' changed:
                                                                         pointed to type 'struct RedWorker' changed, as being reported
-                                                              type of '_Drawable RedWorker::drawables[1000]' changed:
+                                                              type of '_Drawable drawables[1000]' changed:
                                                                 array element type 'typedef _Drawable' changed:
                                                                   underlying type 'struct _Drawable' at red_worker.c:874:1 changed:
                                                                     type size changed from 3200 to 2560 (in bits)
                                                                     1 data member change:
-                                                                      type of 'union {Drawable drawable; _Drawable* next;} _Drawable::u' changed:
+                                                                      type of 'union {Drawable drawable; _Drawable* next;} u' changed:
                                                                         type size changed from 3200 to 2560 (in bits)
                                                                         2 data member changes:
                                                                           type of 'Drawable drawable' changed:
                                                                             underlying type 'struct Drawable' at red_worker.c:838:1 changed:
                                                                               type size changed from 3200 to 2560 (in bits)
                                                                               2 data member deletions:
-                                                                                'uint8_t* Drawable::backed_surface_data', at offset 2368 (in bits) at red_worker.c:864:1
-                                                                                'DependItem Drawable::pipe_depend_items[3]', at offset 2432 (in bits) at red_worker.c:865:1
+                                                                                'uint8_t* backed_surface_data', at offset 2368 (in bits) at red_worker.c:864:1
+                                                                                'DependItem pipe_depend_items[3]', at offset 2432 (in bits) at red_worker.c:865:1
                                                                               6 data member changes (1 filtered):
-                                                                                type of 'Stream* Drawable::stream' changed:
+                                                                                type of 'Stream* stream' changed:
                                                                                   in pointed to type 'typedef Stream' at red_worker.c:443:1:
                                                                                     underlying type 'struct Stream' at red_worker.c:433:1 changed:
                                                                                       type size changed from 896 to 832 (in bits)
                                                                                       2 data member deletions:
-                                                                                        'SpiceTimer* Stream::input_fps_timer', at offset 640 (in bits) at red_worker.c:444:1
-                                                                                        'uint64_t Stream::input_fps_timer_start', at offset 768 (in bits) at red_worker.c:446:1
+                                                                                        'SpiceTimer* input_fps_timer', at offset 640 (in bits) at red_worker.c:444:1
+                                                                                        'uint64_t input_fps_timer_start', at offset 768 (in bits) at red_worker.c:446:1
                                                                                       1 data member insertion:
-                                                                                        'uint64_t Stream::input_fps_start_time', at offset 704 (in bits) at red_worker.c:456:1
+                                                                                        'uint64_t input_fps_start_time', at offset 704 (in bits) at red_worker.c:456:1
                                                                                       4 data member changes:
-                                                                                        type of 'Drawable* Stream::current' changed:
+                                                                                        type of 'Drawable* current' changed:
                                                                                           in pointed to type 'typedef Drawable' at red_worker.c:432:1:
                                                                                             underlying type 'struct Drawable' changed, as being reported
-                                                                                        type of 'Stream* Stream::next' changed:
+                                                                                        type of 'Stream* next' changed:
                                                                                           in pointed to type 'typedef Stream' at red_worker.c:443:1:
                                                                                             underlying type 'struct Stream' changed, as being reported
-                                                                                        'uint32_t Stream::num_input_frames' offset changed from 704 to 640 (in bits) (by -64 bits)
-                                                                                        'uint32_t Stream::input_fps' offset changed from 832 to 768 (in bits) (by -64 bits)
-                                                                                type of 'Stream* Drawable::sized_stream' changed:
+                                                                                        'uint32_t num_input_frames' offset changed from 704 to 640 (in bits) (by -64 bits)
+                                                                                        'uint32_t input_fps' offset changed from 832 to 768 (in bits) (by -64 bits)
+                                                                                type of 'Stream* sized_stream' changed:
                                                                                   pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
-                                                                                type of 'DependItem Drawable::depend_items[3]' changed:
+                                                                                type of 'DependItem depend_items[3]' changed:
                                                                                   array element type 'typedef DependItem' changed:
                                                                                     underlying type 'struct DependItem' at red_worker.c:825:1 changed:
                                                                                       type size hasn't changed
                                                                                       1 data member change:
-                                                                                        type of 'Drawable* DependItem::drawable' changed:
+                                                                                        type of 'Drawable* drawable' changed:
                                                                                           in pointed to type 'typedef Drawable' at red_worker.c:432:1:
                                                                                             underlying type 'struct Drawable' changed, as being reported
                                                                                   type size hasn't changed
-                                                                                'int Drawable::surface_id' offset changed from 3008 to 2368 (in bits) (by -640 bits)
-                                                                                'int Drawable::surfaces_dest[3]' offset changed from 3040 to 2400 (in bits) (by -640 bits)
-                                                                                'uint32_t Drawable::process_commands_generation' offset changed from 3136 to 2496 (in bits) (by -640 bits)
+                                                                                'int surface_id' offset changed from 3008 to 2368 (in bits) (by -640 bits)
+                                                                                'int surfaces_dest[3]' offset changed from 3040 to 2400 (in bits) (by -640 bits)
+                                                                                'uint32_t process_commands_generation' offset changed from 3136 to 2496 (in bits) (by -640 bits)
                                                                           type of '_Drawable* next' changed:
                                                                             in pointed to type 'typedef _Drawable' at red_worker.c:865:1:
                                                                               underlying type 'struct _Drawable' changed, as being reported
                                                                 array type size changed from 3200000 to 2560000
-                                                              type of '_Drawable* RedWorker::free_drawables' changed:
+                                                              type of '_Drawable* free_drawables' changed:
                                                                 pointed to type 'typedef _Drawable' changed at red_worker.c:873:1, as reported earlier
                                                               and offset changed from 15366720 to 14726720 (in bits) (by -640000 bits)
-                                                              '_CursorItem RedWorker::cursor_items[100]' offset changed from 15366784 to 14726784 (in bits) (by -640000 bits)
-                                                              '_CursorItem* RedWorker::free_cursor_items' offset changed from 15379584 to 14739584 (in bits) (by -640000 bits)
-                                                              'RedMemSlotInfo RedWorker::mem_slots' offset changed from 15379648 to 14739648 (in bits) (by -640000 bits)
-                                                              'ImageCache RedWorker::image_cache' offset changed from 15380032 to 14739968 (in bits) (by -640064 bits)
-                                                              type of 'spice_image_compression_t RedWorker::image_compression' changed:
+                                                              '_CursorItem cursor_items[100]' offset changed from 15366784 to 14726784 (in bits) (by -640000 bits)
+                                                              '_CursorItem* free_cursor_items' offset changed from 15379584 to 14739584 (in bits) (by -640000 bits)
+                                                              'RedMemSlotInfo mem_slots' offset changed from 15379648 to 14739648 (in bits) (by -640000 bits)
+                                                              'ImageCache image_cache' offset changed from 15380032 to 14739968 (in bits) (by -640064 bits)
+                                                              type of 'spice_image_compression_t image_compression' 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:
                                                                   type name changed from '__anonymous_enum__2' to 'SpiceImageCompression'
@@ -401,23 +401,23 @@
                                                                     'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_LZ4' value '7'
                                                                     'SpiceImageCompression::SPICE_IMAGE_COMPRESSION_ENUM_END' value '8'
                                                               and offset changed from 15445824 to 14805760 (in bits) (by -640064 bits)
-                                                              'spice_wan_compression_t RedWorker::jpeg_state' offset changed from 15445856 to 14805792 (in bits) (by -640064 bits)
-                                                              'spice_wan_compression_t RedWorker::zlib_glz_state' offset changed from 15445888 to 14805824 (in bits) (by -640064 bits)
-                                                              'uint32_t RedWorker::mouse_mode' offset changed from 15445920 to 14805856 (in bits) (by -640064 bits)
-                                                              'uint32_t RedWorker::streaming_video' offset changed from 15445952 to 14805888 (in bits) (by -640064 bits)
-                                                              type of 'Stream RedWorker::streams_buf[50]' changed:
+                                                              'spice_wan_compression_t jpeg_state' offset changed from 15445856 to 14805792 (in bits) (by -640064 bits)
+                                                              'spice_wan_compression_t zlib_glz_state' offset changed from 15445888 to 14805824 (in bits) (by -640064 bits)
+                                                              'uint32_t mouse_mode' offset changed from 15445920 to 14805856 (in bits) (by -640064 bits)
+                                                              'uint32_t streaming_video' offset changed from 15445952 to 14805888 (in bits) (by -640064 bits)
+                                                              type of 'Stream streams_buf[50]' changed:
                                                                 array element type 'typedef Stream' changed:
                                                                   underlying type 'struct Stream' changed at red_worker.c:433:1, as reported earlier
                                                                 array type size changed from 44800 to 41600
                                                               and offset changed from 15446016 to 14805952 (in bits) (by -640064 bits)
-                                                              type of 'Stream* RedWorker::free_streams' changed:
+                                                              type of 'Stream* free_streams' changed:
                                                                 pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
                                                               and offset changed from 15490816 to 14847552 (in bits) (by -643264 bits)
-                                                              'Ring RedWorker::streams' offset changed from 15490880 to 14847616 (in bits) (by -643264 bits)
-                                                              'ItemTrace RedWorker::items_trace[8]' offset changed from 15491008 to 14847744 (in bits) (by -643264 bits)
-                                                              'uint32_t RedWorker::next_item_trace' offset changed from 15494080 to 14850816 (in bits) (by -643264 bits)
-                                                              'uint64_t RedWorker::streams_size_total' offset changed from 15494144 to 14850880 (in bits) (by -643264 bits)
-                                                              type of 'QuicData RedWorker::quic_data' changed:
+                                                              'Ring streams' offset changed from 15490880 to 14847616 (in bits) (by -643264 bits)
+                                                              'ItemTrace items_trace[8]' offset changed from 15491008 to 14847744 (in bits) (by -643264 bits)
+                                                              'uint32_t next_item_trace' offset changed from 15494080 to 14850816 (in bits) (by -643264 bits)
+                                                              'uint64_t streams_size_total' offset changed from 15494144 to 14850880 (in bits) (by -643264 bits)
+                                                              type of 'QuicData quic_data' changed:
                                                                 underlying type 'struct {QuicUsrContext usr; EncoderData data;}' at red_worker.c:577:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
@@ -430,95 +430,95 @@
                                                                               underlying type 'struct DisplayChannelClient' at red_worker.c:672:1 changed:
                                                                                 type size hasn't changed
                                                                                 5 data member changes:
-                                                                                  type of 'CommonChannelClient DisplayChannelClient::common' changed:
+                                                                                  type of 'CommonChannelClient common' changed:
                                                                                     underlying type 'struct CommonChannelClient' at red_worker.c:662:1 changed:
                                                                                       type size hasn't changed
                                                                                       2 data member changes:
-                                                                                        type of 'RedChannelClient CommonChannelClient::base' changed, as reported earlier
-                                                                                        type of 'RedWorker* CommonChannelClient::worker' changed:
+                                                                                        type of 'RedChannelClient base' changed, as reported earlier
+                                                                                        type of 'RedWorker* worker' changed:
                                                                                           pointed to type 'struct RedWorker' changed, as being reported
-                                                                                  type of 'PixmapCache* DisplayChannelClient::pixmap_cache' changed:
+                                                                                  type of 'PixmapCache* pixmap_cache' changed:
                                                                                     in pointed to type 'typedef PixmapCache' at red_worker.c:527:1:
                                                                                       underlying type 'struct PixmapCache' at red_worker.c:518:1 changed:
                                                                                         type size hasn't changed
                                                                                         1 data member change:
-                                                                                          type of 'RedClient* PixmapCache::client' changed:
+                                                                                          type of 'RedClient* client' changed:
                                                                                             pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                                                                  type of 'GlzSharedDictionary* DisplayChannelClient::glz_dict' changed:
+                                                                                  type of 'GlzSharedDictionary* glz_dict' changed:
                                                                                     in pointed to type 'typedef GlzSharedDictionary' at red_worker.c:663:1:
                                                                                       underlying type 'struct GlzSharedDictionary' at red_worker.c:638:1 changed:
                                                                                         type size hasn't changed
                                                                                         1 data member change:
-                                                                                          type of 'RedClient* GlzSharedDictionary::client' changed:
+                                                                                          type of 'RedClient* client' changed:
                                                                                             pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                                                                  type of 'GlzData DisplayChannelClient::glz_data' changed:
+                                                                                  type of 'GlzData glz_data' changed:
                                                                                     underlying type 'struct {GlzEncoderUsrContext usr; EncoderData data;}' at red_worker.c:587:1 changed:
                                                                                       type size hasn't changed
                                                                                       1 data member change:
                                                                                         type of 'EncoderData data' changed:
                                                                                           underlying type 'struct {DisplayChannelClient* dcc; RedCompressBuf* bufs_head; RedCompressBuf* bufs_tail; jmp_buf jmp_env; union {struct {SpiceChunks* chunks; int next; int stride; int reverse;} lines_data; struct {RedCompressBuf* next; int size_left;} compressed_data;} u; char message_buf[512];}' changed, as being reported
-                                                                                  type of 'StreamAgent DisplayChannelClient::stream_agents[50]' changed:
+                                                                                  type of 'StreamAgent stream_agents[50]' changed:
                                                                                     array element type 'typedef StreamAgent' changed:
                                                                                       underlying type 'struct StreamAgent' at red_worker.c:464:1 changed:
                                                                                         type size hasn't changed
                                                                                         2 data member changes:
-                                                                                          type of 'Stream* StreamAgent::stream' changed:
+                                                                                          type of 'Stream* stream' changed:
                                                                                             pointed to type 'typedef Stream' changed at red_worker.c:432:1, as reported earlier
-                                                                                          type of 'DisplayChannelClient* StreamAgent::dcc' changed:
+                                                                                          type of 'DisplayChannelClient* dcc' changed:
                                                                                             in pointed to type 'typedef DisplayChannelClient' at red_worker.c:435:1:
                                                                                               underlying type 'struct DisplayChannelClient' changed, as being reported
                                                                                     type size hasn't changed
                                                               and offset changed from 15494208 to 14850944 (in bits) (by -643264 bits)
-                                                              'QuicContext* RedWorker::quic' offset changed from 15500736 to 14857472 (in bits) (by -643264 bits)
-                                                              type of 'LzData RedWorker::lz_data' changed:
+                                                              'QuicContext* quic' offset changed from 15500736 to 14857472 (in bits) (by -643264 bits)
+                                                              type of 'LzData lz_data' changed:
                                                                 underlying type 'struct {LzUsrContext usr; EncoderData data;}' at red_worker.c:582:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15500800 to 14857536 (in bits) (by -643264 bits)
-                                                              'LzContext* RedWorker::lz' offset changed from 15507328 to 14864064 (in bits) (by -643264 bits)
-                                                              type of 'JpegData RedWorker::jpeg_data' changed:
+                                                              'LzContext* lz' offset changed from 15507328 to 14864064 (in bits) (by -643264 bits)
+                                                              type of 'JpegData jpeg_data' changed:
                                                                 underlying type 'struct {JpegEncoderUsrContext usr; EncoderData data;}' at red_worker.c:592:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15507392 to 14864128 (in bits) (by -643264 bits)
-                                                              'JpegEncoderContext* RedWorker::jpeg' offset changed from 15513600 to 14870336 (in bits) (by -643264 bits)
-                                                              type of 'ZlibData RedWorker::zlib_data' changed:
+                                                              'JpegEncoderContext* jpeg' offset changed from 15513600 to 14870336 (in bits) (by -643264 bits)
+                                                              type of 'ZlibData zlib_data' changed:
                                                                 underlying type 'struct {ZlibEncoderUsrContext usr; EncoderData data;}' at red_worker.c:597:1 changed:
                                                                   type size hasn't changed
                                                                   1 data member change:
                                                                     type of 'EncoderData data' changed, as reported earlier
                                                               and offset changed from 15513664 to 14870400 (in bits) (by -643264 bits)
-                                                              'ZlibEncoder* RedWorker::zlib' offset changed from 15519872 to 14876608 (in bits) (by -643264 bits)
-                                                              'uint32_t RedWorker::process_commands_generation' offset changed from 15519936 to 14876672 (in bits) (by -643264 bits)
-                                                              'StatNodeRef RedWorker::stat' offset changed from 15519968 to 14876704 (in bits) (by -643264 bits)
-                                                              'uint64_t* RedWorker::wakeup_counter' offset changed from 15520000 to 14876736 (in bits) (by -643264 bits)
-                                                              'uint64_t* RedWorker::command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
-                                                              'int RedWorker::driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
-                                                              'int RedWorker::set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
-                                            type of 'void (SpiceWatch*, int)* SpiceCoreInterface::watch_update_mask' changed:
+                                                              'ZlibEncoder* zlib' offset changed from 15519872 to 14876608 (in bits) (by -643264 bits)
+                                                              'uint32_t process_commands_generation' offset changed from 15519936 to 14876672 (in bits) (by -643264 bits)
+                                                              'StatNodeRef stat' offset changed from 15519968 to 14876704 (in bits) (by -643264 bits)
+                                                              'uint64_t* wakeup_counter' offset changed from 15520000 to 14876736 (in bits) (by -643264 bits)
+                                                              'uint64_t* command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
+                                                              'int driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
+                                                              'int set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
+                                            type of 'void (SpiceWatch*, int)* watch_update_mask' changed:
                                               in pointed to type 'function type void (SpiceWatch*, int)':
                                                 parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                   pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                                            type of 'void (SpiceWatch*)* SpiceCoreInterface::watch_remove' changed:
+                                            type of 'void (SpiceWatch*)* watch_remove' changed:
                                               in pointed to type 'function type void (SpiceWatch*)':
                                                 parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                   pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                              'pthread_t RedDispatcher::worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
-                              'uint32_t RedDispatcher::pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
-                              'int RedDispatcher::primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
-                              'int RedDispatcher::x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
-                              'int RedDispatcher::y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
-                              'int RedDispatcher::use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                              type of 'RedDispatcher* RedDispatcher::next' changed:
+                              'pthread_t worker_thread' offset changed from 2048 to 2112 (in bits) (by +64 bits)
+                              'uint32_t pending' offset changed from 2112 to 2176 (in bits) (by +64 bits)
+                              'int primary_active' offset changed from 2144 to 2208 (in bits) (by +64 bits)
+                              'int x_res' offset changed from 2176 to 2240 (in bits) (by +64 bits)
+                              'int y_res' offset changed from 2208 to 2272 (in bits) (by +64 bits)
+                              'int use_hardware_cursor' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                              type of 'RedDispatcher* next' changed:
                                 in pointed to type 'typedef RedDispatcher' at red_worker.h:87:1:
                                   underlying type 'struct RedDispatcher' changed, as being reported
                               and offset changed from 2304 to 2368 (in bits) (by +64 bits)
-                              'Ring RedDispatcher::async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                              'pthread_mutex_t RedDispatcher::async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                              'QXLDevSurfaceCreate RedDispatcher::surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
-                              'unsigned int RedDispatcher::max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
+                              'Ring async_commands' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                              'pthread_mutex_t async_lock' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                              'QXLDevSurfaceCreate surface_create' offset changed from 2816 to 2880 (in bits) (by +64 bits)
+                              'unsigned int max_monitors' offset changed from 3200 to 3264 (in bits) (by +64 bits)
 
     [C] 'function void spice_qxl_add_memslot_async(QXLInstance*, QXLDevMemSlot*, uint64_t)' at red_dispatcher.c:948:1 has some indirect sub-type changes:
       parameter 1 of type 'QXLInstance*' has sub-type changes:
@@ -622,81 +622,81 @@
           underlying type 'struct RedsState' at reds-private.h:127:1 changed:
             type size hasn't changed
             5 data member changes (1 filtered):
-              type of 'SpiceWatch* RedsState::listen_watch' changed:
+              type of 'SpiceWatch* listen_watch' changed:
                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-              type of 'SpiceWatch* RedsState::secure_listen_watch' changed:
+              type of 'SpiceWatch* secure_listen_watch' changed:
                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-              type of 'VDIPortState RedsState::agent_state' changed:
+              type of 'VDIPortState agent_state' changed:
                 underlying type 'struct VDIPortState' at reds-private.h:46:1 changed:
                   type size hasn't changed
                   2 data member changes (3 filtered):
-                    type of 'SpiceCharDeviceState* VDIPortState::base' changed:
+                    type of 'SpiceCharDeviceState* base' changed:
                       in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
                         underlying type 'struct SpiceCharDeviceState' at char_device.c:47:1 changed:
                           type size changed from 1536 to 1600 (in bits)
                           1 data member insertion:
-                            'uint64_t SpiceCharDeviceState::cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
+                            'uint64_t cur_pool_size', at offset 384 (in bits) at char_device.c:57:1
                           12 data member changes:
-                            type of 'SpiceCharDeviceWriteBuffer* SpiceCharDeviceState::cur_write_buf' changed:
+                            type of 'SpiceCharDeviceWriteBuffer* cur_write_buf' changed:
                               in pointed to type 'typedef SpiceCharDeviceWriteBuffer' at char_device.h:94:1:
                                 underlying type 'struct SpiceCharDeviceWriteBuffer' at char_device.h:66:1 changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'RedClient* SpiceCharDeviceWriteBuffer::client' changed:
+                                    type of 'RedClient* client' changed:
                                       pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
                             and offset changed from 384 to 448 (in bits) (by +64 bits)
-                            'uint8_t* SpiceCharDeviceState::cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
-                            'SpiceTimer* SpiceCharDeviceState::write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
-                            'uint64_t SpiceCharDeviceState::num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
-                            'Ring SpiceCharDeviceState::clients' offset changed from 640 to 704 (in bits) (by +64 bits)
-                            'uint32_t SpiceCharDeviceState::num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
-                            'uint64_t SpiceCharDeviceState::client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
-                            type of 'SpiceCharDeviceInstance* SpiceCharDeviceState::sin' changed:
+                            'uint8_t* cur_write_buf_pos' offset changed from 448 to 512 (in bits) (by +64 bits)
+                            'SpiceTimer* write_to_dev_timer' offset changed from 512 to 576 (in bits) (by +64 bits)
+                            'uint64_t num_self_tokens' offset changed from 576 to 640 (in bits) (by +64 bits)
+                            'Ring clients' offset changed from 640 to 704 (in bits) (by +64 bits)
+                            'uint32_t num_clients' offset changed from 768 to 832 (in bits) (by +64 bits)
+                            'uint64_t client_tokens_interval' offset changed from 832 to 896 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceInstance* sin' changed:
                               in pointed to type 'typedef SpiceCharDeviceInstance' at spice-char.h:33:1:
                                 underlying type 'struct SpiceCharDeviceInstance' at spice.h:416:1 changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'SpiceCharDeviceState* SpiceCharDeviceInstance::st' changed:
+                                    type of 'SpiceCharDeviceState* st' changed:
                                       in pointed to type 'typedef SpiceCharDeviceState' at spice-char.h:34:1:
                                         underlying type 'struct SpiceCharDeviceState' changed, as being reported
                             and offset changed from 896 to 960 (in bits) (by +64 bits)
-                            'int SpiceCharDeviceState::during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                            'int SpiceCharDeviceState::during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
-                            type of 'SpiceCharDeviceCallbacks SpiceCharDeviceState::cbs' changed:
+                            'int during_read_from_device' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                            'int during_write_to_device' offset changed from 992 to 1056 (in bits) (by +64 bits)
+                            type of 'SpiceCharDeviceCallbacks cbs' changed:
                               underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
                                 type size hasn't changed
                                 4 data member changes:
-                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* SpiceCharDeviceCallbacks::read_one_msg_from_device' changed:
+                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* read_one_msg_from_device' changed:
                                     in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
                                       parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
                                         pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
-                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* SpiceCharDeviceCallbacks::send_msg_to_client' changed:
+                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* send_msg_to_client' changed:
                                     in pointed to type 'function type void (SpiceCharDeviceMsgToClient*, RedClient*, void*)':
                                       parameter 2 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, typedef uint32_t, void*)* SpiceCharDeviceCallbacks::send_tokens_to_client' changed:
+                                  type of 'void (RedClient*, typedef uint32_t, void*)* send_tokens_to_client' changed:
                                     in pointed to type 'function type void (RedClient*, typedef uint32_t, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, void*)* SpiceCharDeviceCallbacks::remove_client' changed:
+                                  type of 'void (RedClient*, void*)* remove_client' changed:
                                     in pointed to type 'function type void (RedClient*, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
                             and offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                            'void* SpiceCharDeviceState::opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-                    type of 'SpiceCharDeviceWriteBuffer* VDIPortState::recv_from_client_buf' changed:
+                            'void* opaque' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+                    type of 'SpiceCharDeviceWriteBuffer* recv_from_client_buf' changed:
                       pointed to type 'typedef SpiceCharDeviceWriteBuffer' changed at char_device.h:77:1, as reported earlier
-              type of 'MainChannel* RedsState::main_channel' changed:
+              type of 'MainChannel* main_channel' changed:
                 in pointed to type 'typedef MainChannel' at main_channel.h:48:1:
                   underlying type 'struct MainChannel' at main_channel.h:36:1 changed:
                     type size hasn't changed
                     1 data member change:
-                      type of 'RedChannel MainChannel::base' changed, as reported earlier
-              type of 'RedsClientMonitorsConfig RedsState::client_monitors_config' changed:
+                      type of 'RedChannel base' changed, as reported earlier
+              type of 'RedsClientMonitorsConfig client_monitors_config' changed:
                 underlying type 'struct RedsClientMonitorsConfig' at reds-private.h:120:1 changed:
                   type size hasn't changed
                   1 data member change:
-                    type of 'MainChannelClient* RedsClientMonitorsConfig::mcc' changed:
+                    type of 'MainChannelClient* mcc' changed:
                       pointed to type 'typedef MainChannelClient' changed at red_channel.h:138:1, as reported earlier
 
     [C] 'function int spice_server_add_interface(SpiceServer*, SpiceBaseInstance*)' at reds.c:3159:1 has some indirect sub-type changes:
@@ -778,52 +778,52 @@
           underlying type 'struct SpicePlaybackInstance' at spice.h:350:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'SpicePlaybackState* SpicePlaybackInstance::st' changed:
+              type of 'SpicePlaybackState* st' changed:
                 in pointed to type 'typedef SpicePlaybackState' at spice-audio.h:34:1:
                   underlying type 'struct SpicePlaybackState' at snd_worker.c:165:1 changed:
                     type size changed from 512 to 576 (in bits)
                     1 data member insertion:
-                      'uint32_t SpicePlaybackState::frequency', at offset 512 (in bits) at snd_worker.c:159:1
+                      'uint32_t frequency', at offset 512 (in bits) at snd_worker.c:159:1
                     2 data member changes:
-                      type of 'SndWorker SpicePlaybackState::worker' changed:
+                      type of 'SndWorker worker' changed:
                         type size hasn't changed
                         3 data member changes:
-                          type of 'RedChannel* SndWorker::base_channel' changed:
+                          type of 'RedChannel* base_channel' changed:
                             pointed to type 'typedef RedChannel' changed at red_channel.h:135:1, as reported earlier
-                          type of 'SndChannel* SndWorker::connection' changed:
+                          type of 'SndChannel* connection' changed:
                             in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                               underlying type 'struct SndChannel' at snd_worker.c:89:1 changed:
                                 type size hasn't changed
                                 6 data member changes (1 filtered):
-                                  type of 'RedsStream* SndChannel::stream' changed:
+                                  type of 'RedsStream* stream' changed:
                                     pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
-                                  type of 'SndWorker* SndChannel::worker' changed:
+                                  type of 'SndWorker* worker' changed:
                                     in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
                                       underlying type 'struct SndWorker' changed, as being reported
-                                  type of 'RedChannelClient* SndChannel::channel_client' changed:
+                                  type of 'RedChannelClient* channel_client' changed:
                                     pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
-                                  type of 'snd_channel_handle_message_proc SndChannel::handle_message' changed:
+                                  type of 'snd_channel_handle_message_proc handle_message' changed:
                                     underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
                                       in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                                  type of 'snd_channel_on_message_done_proc SndChannel::on_message_done' changed:
+                                  type of 'snd_channel_on_message_done_proc on_message_done' changed:
                                     underlying type 'void (SndChannel*)*' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                                  type of 'snd_channel_cleanup_channel_proc SndChannel::cleanup' changed:
+                                  type of 'snd_channel_cleanup_channel_proc cleanup' changed:
                                     underlying type 'void (SndChannel*)*' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
-                          type of 'SndWorker* SndWorker::next' changed:
+                          type of 'SndWorker* next' changed:
                             in pointed to type 'typedef SndWorker' at snd_worker.c:80:1:
                               underlying type 'struct SndWorker' changed, as being reported
-                      type of 'SpicePlaybackInstance* SpicePlaybackState::sin' changed:
+                      type of 'SpicePlaybackInstance* sin' changed:
                         in pointed to type 'typedef SpicePlaybackInstance' at spice-audio.h:33:1:
                           underlying type 'struct SpicePlaybackInstance' changed, as being reported
 
@@ -857,15 +857,15 @@
           underlying type 'struct SpiceRecordInstance' at spice.h:380:1 changed:
             type size hasn't changed
             1 data member change:
-              type of 'SpiceRecordState* SpiceRecordInstance::st' changed:
+              type of 'SpiceRecordState* st' changed:
                 in pointed to type 'typedef SpiceRecordState' at spice-audio.h:68:1:
                   underlying type 'struct SpiceRecordState' at snd_worker.c:171:1 changed:
                     type size changed from 512 to 576 (in bits)
                     1 data member insertion:
-                      'uint32_t SpiceRecordState::frequency', at offset 512 (in bits) at snd_worker.c:166:1
+                      'uint32_t frequency', at offset 512 (in bits) at snd_worker.c:166:1
                     2 data member changes:
-                      type of 'SndWorker SpiceRecordState::worker' changed, as reported earlier
-                      type of 'SpiceRecordInstance* SpiceRecordState::sin' changed:
+                      type of 'SndWorker worker' changed, as reported earlier
+                      type of 'SpiceRecordInstance* sin' changed:
                         in pointed to type 'typedef SpiceRecordInstance' at spice-audio.h:67:1:
                           underlying type 'struct SpiceRecordInstance' changed, as being reported
 
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 d5bff94..26c6b49 100644
--- a/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
+++ b/tests/data/test-diff-pkg/symlink-dir-test1-report0.txt
@@ -9,7 +9,7 @@
         in pointed to type 'struct S' at foo.c:3:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::m1', at offset 32 (in bits) at foo.c:6:1
+            'char m1', at offset 32 (in bits) at foo.c:6:1
 
 ================ end of changes of 'libfoo.so'===============
 
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 6b47594..2d53dc6 100644
--- a/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-0-report-0.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits)
+            'char mem1', at offset 32 (in bits)
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 8d73758..40813ea 100644
--- a/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
+++ b/tests/data/test-diff-pkg/tarpkg-1-report-0.txt
@@ -9,7 +9,7 @@
         in referenced type 'struct S' at obj-v0.cc:4:1:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::mem1', at offset 32 (in bits) at obj-v0.cc:7:1
+            'char mem1', at offset 32 (in bits) at obj-v0.cc:7:1
 
 ================ end of changes of 'libobj-v0.so'===============
 
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 3616cb3..c694ae9 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
@@ -36,11 +36,11 @@
             'method virtual tbb::filter::~filter(int)' at pipeline.cpp:688:1
           no member function changes (4 filtered);
           1 data member changes (4 filtered):
-            type of 'tbb::internal::input_buffer* tbb::filter::my_input_buffer' changed:
+            type of 'tbb::internal::input_buffer* my_input_buffer' changed:
               in pointed to type 'class tbb::internal::input_buffer' at pipeline.cpp:52:1:
                 type size hasn't changed
                 1 data member change:
-                  type of 'tbb::spin_mutex tbb::internal::input_buffer::array_mutex' changed:
+                  type of 'tbb::spin_mutex array_mutex' changed:
                     type size hasn't changed
                     1 base class insertion:
                       class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
@@ -52,27 +52,27 @@
             in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::task_group_context& tbb::internal::allocate_root_with_context_proxy::my_context' changed:
+                type of 'tbb::task_group_context& my_context' changed:
                   in referenced type 'class tbb::task_group_context' at task.h:302:1:
                     type size hasn't changed
                     1 data member insertion:
-                      'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
+                      'tbb::internal::cpu_ctl_env_space my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
                     2 data member changes (1 filtered):
-                      type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+                      type of 'char _leading_padding[80]' changed:
                         type name changed from 'char[80]' to 'char[72]'
                         array type size changed from 640 to 576
                         array type subrange 1 changed length from 80 to 72
-                      type of 'tbb::internal::generic_scheduler* tbb::task_group_context::my_owner' changed:
+                      type of 'tbb::internal::generic_scheduler* my_owner' changed:
                         in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
                           type size changed from 3136 to 3072 (in bits)
                           1 base class change:
                             'struct tbb::internal::scheduler_state' at scheduler.h:73:1 changed:
                               type size changed from 576 to 704 (in bits)
                               2 data member insertions:
-                                'volatile intptr_t* tbb::internal::scheduler_state::my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
-                                'volatile uintptr_t* tbb::internal::scheduler_state::my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
+                                'volatile intptr_t* my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
+                                'volatile uintptr_t* my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
                               2 data member changes (1 filtered):
-                                type of 'tbb::internal::arena* tbb::internal::scheduler_state::my_arena' changed:
+                                type of 'tbb::internal::arena* my_arena' changed:
                                   in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
                                     type size hasn't changed
                                     1 base class deletion:
@@ -80,7 +80,7 @@
                                     1 base class insertion:
                                       struct tbb::internal::padded<tbb::internal::arena_base, 128ul> at tbb_stddef.h:251:1
                                     1 data member change:
-                                      type of 'tbb::internal::arena_slot tbb::internal::arena::my_slots[1]' changed:
+                                      type of 'tbb::internal::arena_slot my_slots[1]' changed:
                                         array element type 'struct tbb::internal::arena_slot' changed:
                                           type size hasn't changed
                                           2 base class deletions:
@@ -90,10 +90,10 @@
                                             struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
                                             struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
                                         type size hasn't changed
-                                type of 'tbb::internal::mail_inbox tbb::internal::scheduler_state::my_inbox' changed:
+                                type of 'tbb::internal::mail_inbox my_inbox' changed:
                                   type size hasn't changed
                                   1 data member change:
-                                    type of 'tbb::internal::mail_outbox* tbb::internal::mail_inbox::my_putter' changed:
+                                    type of 'tbb::internal::mail_outbox* my_putter' changed:
                                       in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
                                         type size hasn't changed
                                         1 base class deletion:
@@ -101,26 +101,26 @@
                                         1 base class insertion:
                                           struct tbb::internal::padded<tbb::internal::unpadded_mail_outbox, 128ul> at tbb_stddef.h:251:1
                                         1 data member deletion:
-                                          'char tbb::internal::mail_outbox::pad[104]', at offset 136 (in bits) at mailbox.h:114:1
+                                          'char pad[104]', at offset 136 (in bits) at mailbox.h:114:1
                           1 member function deletion:
                             'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&, bool)' at scheduler.h:391:1, virtual at voffset 7/7
                           1 member function insertion:
                             'method virtual tbb::task* tbb::internal::generic_scheduler::receive_or_steal_task(tbb::internal::reference_count&)' at scheduler.h:362:1, virtual at voffset 7/7
                           no member function changes (4 filtered);
                           3 data member deletions:
-                            'unsigned int tbb::internal::generic_scheduler::hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
-                            'volatile intptr_t* tbb::internal::generic_scheduler::my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
-                            'volatile uintptr_t* tbb::internal::generic_scheduler::my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
+                            'unsigned int hint_for_push', at offset 896 (in bits) at scheduler.h:171:1
+                            'volatile intptr_t* my_ref_top_priority', at offset 2560 (in bits) at scheduler.h:433:1
+                            'volatile uintptr_t* my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
                           18 data member changes:
-                            'uintptr_t tbb::internal::generic_scheduler::my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
-                            type of 'tbb::internal::market* tbb::internal::generic_scheduler::my_market' changed:
+                            'uintptr_t my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
+                            type of 'tbb::internal::market* my_market' changed:
                               in pointed to type 'class tbb::internal::market' at market.h:49:1:
                                 type size changed from 1664 to 1728 (in bits)
                                 no member function changes (8 filtered);
                                 1 data member insertion:
-                                  'bool tbb::internal::market::join_workers', at offset 384 (in bits) at market.h:88:1
+                                  'bool join_workers', at offset 384 (in bits) at market.h:88:1
                                 7 data member changes:
-                                  type of 'tbb::internal::market::arenas_list_mutex_type tbb::internal::market::my_arenas_list_mutex' changed:
+                                  type of 'tbb::internal::market::arenas_list_mutex_type my_arenas_list_mutex' changed:
                                     underlying type 'typedef tbb::internal::scheduler_mutex_type' at scheduler_common.h:123:1 changed:
                                       typedef name changed from tbb::internal::scheduler_mutex_type to tbb::spin_rw_mutex at spin_rw_mutex.h:38:1
                                       underlying type 'class tbb::spin_mutex' at spin_mutex.h:47:1 changed:
@@ -129,7 +129,7 @@
                                         1 base class insertion:
                                           class tbb::internal::mutex_copy_deprecated_and_disabled at tbb_stddef.h:334:1
                                         1 data member change:
-                                          type of '__TBB_atomic_flag tbb::spin_mutex::flag' changed:
+                                          type of '__TBB_atomic_flag flag' changed:
                                             typedef name changed from __TBB_atomic_flag to tbb::spin_rw_mutex_v3::state_t at spin_rw_mutex.h:214:1
                                             underlying type 'typedef __TBB_Flag' at tbb_machine.h:875:1 changed:
                                               typedef name changed from __TBB_Flag to intptr_t at stdint.h:119:1
@@ -137,37 +137,37 @@
                                                 type name changed from 'unsigned char' to 'long int'
                                                 type size changed from 8 to 64 (in bits)
                                           and name of 'tbb::spin_mutex::flag' changed to 'tbb::spin_rw_mutex_v3::state' at spin_rw_mutex.h:224:1
-                                  'intptr_t tbb::internal::market::my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
-                                  'intptr_t tbb::internal::market::my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
-                                  'uintptr_t tbb::internal::market::my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
-                                  type of 'tbb::internal::market::priority_level_info tbb::internal::market::my_priority_levels[3]' changed:
+                                  'intptr_t my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
+                                  'intptr_t my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
+                                  'uintptr_t my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
+                                  type of 'tbb::internal::market::priority_level_info my_priority_levels[3]' changed:
                                     array element type 'struct tbb::internal::market::priority_level_info' changed:
                                       type size hasn't changed
                                       1 data member change:
-                                        type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator tbb::internal::market::priority_level_info::next_arena' changed:
+                                        type of 'tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator next_arena' changed:
                                           entity changed from 'class tbb::internal::intrusive_list_base<tbb::internal::intrusive_list<tbb::internal::arena>, tbb::internal::arena>::iterator' to 'tbb::internal::arena*'
                                           type size hasn't changed
                                     type size hasn't changed
                                   and offset changed from 576 to 640 (in bits) (by +64 bits)
-                                  'uintptr_t tbb::internal::market::my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-                                  'tbb::internal::generic_scheduler* tbb::internal::market::my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+                                  'uintptr_t my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+                                  'tbb::internal::generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
                             and offset changed from 768 to 896 (in bits) (by +128 bits)
-                            'tbb::internal::FastRandom tbb::internal::generic_scheduler::my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
-                            'long int tbb::internal::generic_scheduler::my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
-                            'bool tbb::internal::generic_scheduler::my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
-                            'intptr_t tbb::internal::generic_scheduler::my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
-                            'tbb::task* tbb::internal::generic_scheduler::my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
-                            'char tbb::internal::generic_scheduler::_padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
-                            'tbb::internal::context_list_node_t tbb::internal::generic_scheduler::my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
-                            'tbb::spin_mutex tbb::internal::generic_scheduler::my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
-                            'uintptr_t tbb::internal::generic_scheduler::my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
-                            'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
-                            'uintptr_t tbb::internal::generic_scheduler::my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
-                            'volatile bool tbb::internal::generic_scheduler::my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
-                            'tbb::atomic<long unsigned int> tbb::internal::generic_scheduler::my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
-                            '__cilk_tbb_unwatch_thunk tbb::internal::generic_scheduler::my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
+                            'tbb::internal::FastRandom my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
+                            'tbb::task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                            'tbb::task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                            'long int my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
+                            'bool my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
+                            'intptr_t my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
+                            'tbb::task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
+                            'char _padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
+                            'tbb::internal::context_list_node_t my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
+                            'tbb::spin_mutex my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
+                            'uintptr_t my_context_state_propagation_epoch' offset changed from 2432 to 2496 (in bits) (by +64 bits)
+                            'tbb::atomic<long unsigned int> my_local_ctx_list_update' offset changed from 2496 to 2560 (in bits) (by +64 bits)
+                            'uintptr_t my_local_reload_epoch' offset changed from 2816 to 2752 (in bits) (by -64 bits)
+                            'volatile bool my_pool_reshuffling_pending' offset changed from 2880 to 2816 (in bits) (by -64 bits)
+                            'tbb::atomic<long unsigned int> my_nonlocal_ctx_list_update' offset changed from 2944 to 2880 (in bits) (by -64 bits)
+                            '__cilk_tbb_unwatch_thunk my_cilk_unwatch_thunk' offset changed from 3008 to 2944 (in bits) (by -64 bits)
 
     [C] 'method void tbb::internal::concurrent_queue_base::internal_pop(void*)' at concurrent_queue_v2.cpp:240:1 has some indirect sub-type changes:
       implicit parameter 0 of type 'tbb::internal::concurrent_queue_base* const' has sub-type changes:
@@ -180,14 +180,14 @@
               'method virtual tbb::internal::concurrent_queue_base::~concurrent_queue_base(int)' at concurrent_queue_v2.cpp:217:1
             no member function changes (4 filtered);
             1 data member change:
-              type of 'tbb::internal::concurrent_queue_rep* tbb::internal::concurrent_queue_base::my_rep' changed:
+              type of 'tbb::internal::concurrent_queue_rep* my_rep' changed:
                 in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue_v2.cpp:102:1:
                   type size hasn't changed
                   1 data member changes (2 filtered):
-                    type of 'tbb::internal::concurrent_monitor tbb::internal::concurrent_queue_rep::items_avail' changed:
+                    type of 'tbb::internal::concurrent_monitor items_avail' changed:
                       type size hasn't changed
                       1 data member change:
-                        'tbb::spin_mutex tbb::internal::concurrent_monitor::mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
+                        'tbb::spin_mutex mutex_ec' offset changed from 0 to 8 (in bits) (by +8 bits)
 
     [C] 'method tbb::internal::concurrent_queue_iterator_base_v3::concurrent_queue_iterator_base_v3(const tbb::internal::concurrent_queue_base_v3&)' at concurrent_queue.cpp:622:1 has some indirect sub-type changes:
       parameter 1 of type 'const tbb::internal::concurrent_queue_base_v3&' has sub-type changes:
@@ -201,7 +201,7 @@
             in unqualified underlying type 'struct tbb::internal::hash_map_segment_base' at concurrent_hash_map.cpp:27:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::internal::hash_map_segment_base::segment_mutex_t tbb::internal::hash_map_segment_base::my_mutex' changed:
+                type of 'tbb::internal::hash_map_segment_base::segment_mutex_t my_mutex' changed:
                   underlying type 'typedef tbb::spin_rw_mutex' at spin_rw_mutex.h:39:1 changed:
                     underlying type 'class tbb::spin_rw_mutex_v3' at spin_rw_mutex.h:43:1 changed:
                       type size hasn't changed
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 dcd3087..18193d8 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
@@ -33,13 +33,13 @@
             in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
               type size hasn't changed
               1 data member change:
-                type of 'tbb::task_group_context& tbb::internal::allocate_root_with_context_proxy::my_context' changed:
+                type of 'tbb::task_group_context& my_context' changed:
                   in referenced type 'class tbb::task_group_context' at task.h:302:1:
                     type size hasn't changed
                     1 data member insertion:
-                      'tbb::internal::cpu_ctl_env_space tbb::task_group_context::my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
+                      'tbb::internal::cpu_ctl_env_space my_cpu_ctl_env', at offset 896 (in bits) at task.h:380:1
                     1 data member changes (2 filtered):
-                      type of 'char tbb::task_group_context::_leading_padding[80]' changed:
+                      type of 'char _leading_padding[80]' changed:
                         type name changed from 'char[80]' to 'char[72]'
                         array type size changed from 640 to 576
                         array type subrange 1 changed length from 80 to 72
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 431c891..a0c45d8 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
@@ -11,5 +11,5 @@ SONAME changed from 'test48-soname-abixml-v0' to 'test48-soname-abixml-v1'
       in pointed to type 'struct S' at test48-soname-abixml-v1.c:1:1:
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m1', at offset 32 (in bits) at test48-soname-abixml-v1.c:4:1
+          'char m1', at offset 32 (in bits) at test48-soname-abixml-v1.c:4:1
 
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 b5b4afe..35b2c40 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe..35b2c40 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe..35b2c40 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 b5b4afe..35b2c40 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* MyType::priv' changed:
+          type of 'MyType::Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char MyType::Private::m1', at offset 32 (in bits)
+                'char m1', at offset 32 (in bits)
 
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 e5c0b81..010ebfb 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char b_type::m_char', at offset 0 (in bits)
+          'char m_char', at offset 0 (in bits)
         1 data member change:
-          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 1 of type 'a_type*' has sub-type changes:
@@ -18,7 +18,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct a_type' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char a_type::m_char', at offset 0 (in bits)
+            'char m_char', at offset 0 (in bits)
           1 data member change:
-            'int a_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 e4021ae..f325cc7 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct b_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char b_type::m_char', at offset 0 (in bits)
+          'char m_char', at offset 0 (in bits)
         1 data member change:
-          'int b_type::m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m_int' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 4a6ff72..8e5cd6a 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 8 to 64 (in bits)
         2 data member insertions:
-          'char S::m1', at offset 8 (in bits)
-          'int S::m2', at offset 32 (in bits)
+          'char m1', at offset 8 (in bits)
+          'int m2', at offset 32 (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 cd301b5..d7456d7 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
         2 data member insertions:
-          'char S::m_inserted1', at offset 8 (in bits)
-          'char S::m_inserted2', at offset 64 (in bits)
+          'char m_inserted1', at offset 8 (in bits)
+          'char m_inserted2', at offset 64 (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 cd301b5..d7456d7 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
@@ -8,6 +8,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 64 to 96 (in bits)
         2 data member insertions:
-          'char S::m_inserted1', at offset 8 (in bits)
-          'char S::m_inserted2', at offset 64 (in bits)
+          'char m_inserted1', at offset 8 (in bits)
+          'char m_inserted2', at offset 64 (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 baf711f..f408f2d 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S)' has some indirect sub-type changes:
     parameter 1 of type 'struct S' has sub-type changes:
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 270ec1f..ae1b41d 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m1', at offset 32 (in bits)
+        'char m1', at offset 32 (in bits)
 
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 ddea850..f5dff29 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 86d49d1..c844866 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 4eaba5b..3f9c6fc 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 83dfe32..de11f9c 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 4eaba5b..3f9c6fc 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 b28fbd1..59592e3 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (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 1a826c1..5cc0afa 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (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 b28fbd1..59592e3 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'unsigned int S::bar', at offset 32 (in bits)
+          'unsigned int bar', at offset 32 (in 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 6965a15..b4a8507 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
       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)
+          'char m1', at offset 32 (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 deabb7b..b814eb5 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added (1 filtered out) variab
       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)
+          'char m1', at offset 32 (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 6965a15..b4a8507 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
@@ -12,5 +12,5 @@ Variables changes summary: 0 Removed, 1 Changed, 1 Added variables
       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)
+          'char m1', at offset 32 (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 3edf2bd..894d78d 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
@@ -12,5 +12,5 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
       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)
+          'char m1', at offset 32 (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 2e37538..feba3aa 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed (1 filtered out), 1 Changed, 0 Added variab
       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)
+          'char m1', at offset 32 (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 3edf2bd..894d78d 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
@@ -12,5 +12,5 @@ Variables changes summary: 1 Removed, 1 Changed, 0 Added variables
       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)
+          'char m1', at offset 32 (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 cb8a219..49d9575 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 0788d48..754de65 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
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct S' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::inserted_member', at offset 0 (in bits)
+            'char inserted_member', at offset 0 (in bits)
           1 data member change:
-            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 0788d48..754de65 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
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct S' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char S::inserted_member', at offset 0 (in bits)
+            'char inserted_member', at offset 0 (in bits)
           1 data member change:
-            'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-1.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-1.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-10.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-10.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-12.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-12.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-14.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-14.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-16.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-16.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 35e86ed..998b412 100644
--- a/tests/data/test-diff-suppr/test24-soname-report-4.txt
+++ b/tests/data/test-diff-suppr/test24-soname-report-4.txt
@@ -10,5 +10,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           in unqualified underlying type 'struct S':
             type size changed from 32 to 64 (in bits)
             1 data member insertion:
-              'char S::m1', at offset 32 (in bits)
+              'char m1', at offset 32 (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 e93b16c..ad78fc7 100644
--- a/tests/data/test-diff-suppr/test25-typedef-report-0.txt
+++ b/tests/data/test-diff-suppr/test25-typedef-report-0.txt
@@ -9,7 +9,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         underlying type 'struct PrivateType0' changed:
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char PrivateType0::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (in bits)
 
   [C] 'function void baz(TypePtr)' has some indirect sub-type changes:
     parameter 1 of type 'typedef TypePtr' has sub-type changes:
@@ -17,5 +17,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct PrivateType1':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char PrivateType1::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (in bits)
 
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 6a7f2fa..2556ae3 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::added_member', at offset 32 (in bits)
+          'char added_member', at offset 32 (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 6a7f2fa..2556ae3 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::added_member', at offset 32 (in bits)
+          'char added_member', at offset 32 (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 162ed9a..1759043 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-3.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-3.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 162ed9a..1759043 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-6.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-6.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 162ed9a..1759043 100644
--- a/tests/data/test-diff-suppr/test29-soname-report-8.txt
+++ b/tests/data/test-diff-suppr/test29-soname-report-8.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 d06b2c0..d8ca364 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
@@ -8,14 +8,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
     parameter 2 of type 'C&' has sub-type changes:
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 70d4a5c..b2bcb44 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class C':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char C::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int C::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 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 96c0786..e5b45ea 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::inserted_char_member', at offset 0 (in bits)
+          'char inserted_char_member', at offset 0 (in bits)
         1 data member change:
-          'int S::int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int int_member' offset changed from 0 to 32 (in bits) (by +32 bits)
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index 79b6cd7..7c85308 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -22,9 +22,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'S::priv_type* S::priv' changed:
+          type of 'S::priv_type* priv' changed:
             in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
               type size changed from 64 to 128 (in bits)
               1 data member insertion:
-                'int S::priv_type::member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
+                'int member1', at offset 64 (in bits) at test30-pub-lib-v1.cc:18:1
 
diff --git a/tests/data/test-diff-suppr/test31-report-1.txt b/tests/data/test-diff-suppr/test31-report-1.txt
index 95e78c6..404cef7 100644
--- a/tests/data/test-diff-suppr/test31-report-1.txt
+++ b/tests/data/test-diff-suppr/test31-report-1.txt
@@ -9,5 +9,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         in pointed to type 'struct hidden::S0':
           type size changed from 32 to 64 (in bits)
           1 data member insertion:
-            'char hidden::S0::m1', at offset 32 (in bits)
+            'char m1', at offset 32 (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 07f6812..0019f9a 100644
--- a/tests/data/test-diff-suppr/test33-report-0.txt
+++ b/tests/data/test-diff-suppr/test33-report-0.txt
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class to_keep':
         type size changed from 8 to 32 (in bits)
         1 data member insertion:
-          'int to_keep::member1', at offset 0 (in bits)
+          'int member1', at offset 0 (in bits)
 
diff --git a/tests/data/test-diff-suppr/test35-leaf-report-0.txt b/tests/data/test-diff-suppr/test35-leaf-report-0.txt
index 244455a..f949833 100644
--- a/tests/data/test-diff-suppr/test35-leaf-report-0.txt
+++ b/tests/data/test-diff-suppr/test35-leaf-report-0.txt
@@ -6,6 +6,6 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf at test35-leaf-v0.cc:5:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf::m1', at offset 32 (in bits) at test35-leaf-v1.cc:8:1
+    'char m1', at offset 32 (in bits) at test35-leaf-v1.cc:8:1
   one impacted interface:
     function void fn(C&)
diff --git a/tests/data/test-diff-suppr/test36-leaf-report-0.txt b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
index fcbb923..f5bb599 100644
--- a/tests/data/test-diff-suppr/test36-leaf-report-0.txt
+++ b/tests/data/test-diff-suppr/test36-leaf-report-0.txt
@@ -6,7 +6,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
 'struct leaf1 at test36-leaf-v0.cc:4:1' changed:
   type size changed from 32 to 64 (in bits)
   1 data member insertion:
-    'char leaf1::m1', at offset 32 (in bits) at test36-leaf-v1.cc:7:1
+    'char m1', at offset 32 (in bits) at test36-leaf-v1.cc:7:1
   3 impacted interfaces:
     function void interface1(struct_type*)
     function void interface2(struct_type&)
@@ -16,7 +16,7 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
   type size changed from 64 to 96 (in bits)
   there are data member changes:
     type 'struct leaf1' of 'leaf2::member0' changed, as reported earlier
-    'char leaf2::member1' offset changed from 32 to 64 (in bits) (by +32 bits)
+    'char member1' offset changed from 32 to 64 (in bits) (by +32 bits)
   3 impacted interfaces:
     function void interface1(struct_type*)
     function void interface2(struct_type&)
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 795ae55..c292424 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
@@ -8,17 +8,17 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'unsigned int public_type::oops', at offset 0 (in bits)
+          'unsigned int oops', at offset 0 (in bits)
         1 data member change:
-          type of 'private_data* public_type::priv_' changed:
+          type of 'private_data* priv_' changed:
             in pointed to type 'struct private_data':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
-                'char private_data::private_data1', at offset 32 (in bits)
+                'char private_data1', at offset 32 (in bits)
           and offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char a_not_private_type::j', at offset 32 (in bits)
+          'char j', at offset 32 (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 b8c1009..5c535e2 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
@@ -8,12 +8,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct public_type':
         type size changed from 64 to 128 (in bits)
         1 data member insertion:
-          'unsigned int public_type::oops', at offset 0 (in bits)
+          'unsigned int oops', at offset 0 (in bits)
         1 data member change:
-          'private_data* public_type::priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
+          'private_data* priv_' offset changed from 0 to 64 (in bits) (by +64 bits)
     parameter 2 of type 'a_not_private_type*' has sub-type changes:
       in pointed to type 'struct a_not_private_type':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char a_not_private_type::j', at offset 32 (in bits)
+          'char j', at offset 32 (in bits)
 
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 5a0aec3..4597f3c 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     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:
-        'char type_to_keep::m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
+        'char m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
 
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 5a0aec3..4597f3c 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
@@ -7,5 +7,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     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:
-        'char type_to_keep::m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
+        'char m1', at offset 32 (in bits) at test42-negative-suppr-type-v1.cc:4:1
 
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
index acff860..bf643fd 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-1.txt
@@ -13,4 +13,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
       entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
       type size changed from 64 to 192 (in bits)
-    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    'perf_domain* pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
diff --git a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
index 7982710..d708a34 100644
--- a/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
+++ b/tests/data/test-diff-suppr/test46-PR25128-report-2.txt
@@ -9,4 +9,4 @@ Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable
     type 'unsigned long int' of 'root_domain::max_cpu_capacity' changed:
       entity changed from 'unsigned long int' to 'struct max_cpu_capacity' at sched.h:722:1
       type size changed from 64 to 192 (in bits)
-    'perf_domain* root_domain::pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
+    'perf_domain* pd' offset changed from 14528 to 14656 (in bits) (by +128 bits)
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
index 8f65174..6132376 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-1.txt
@@ -11,7 +11,7 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
index 33e9ba0..047cbd5 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-2.txt
@@ -7,7 +7,7 @@ Unreachable types summary: 0 removed (1 filtered out), 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
index f2dc1ab..e53121c 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-4.txt
@@ -11,5 +11,5 @@ Unreachable types summary: 1 removed, 1 changed, 0 added (1 filtered out) types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
diff --git a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
index a2d41a3..3ffab28 100644
--- a/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
+++ b/tests/data/test-diff-suppr/test47-non-reachable-types-report-7.txt
@@ -13,7 +13,7 @@ Unreachable types summary: 1 removed, 1 changed, 1 added types
   [C] 'struct unreachable_struct2' changed:
     type size changed from 32 to 64 (in bits)
     1 data member insertion:
-      'char unreachable_struct2::m2', at offset 32 (in bits) at test-v1.c:9:1
+      'char m2', at offset 32 (in bits) at test-v1.c:9:1
 
 1 added type unreachable from any public interface:
 
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 4cdf875..0776abf 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
@@ -8,9 +8,9 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function void bar(int, S)' has some indirect sub-type changes:
     parameter 2 of type 'struct S' has sub-type changes:
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 bb8ff0b..9c00fe7 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 bb8ff0b..9c00fe7 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 bb8ff0b..9c00fe7 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 723c025..ac99550 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct S':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S::m0', at offset 0 (in bits)
+          'char m0', at offset 0 (in bits)
         1 data member change:
-          'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m1' offset changed from 0 to 32 (in bits) (by +32 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 bb8ff0b..9c00fe7 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
@@ -7,7 +7,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 2 of type 'struct S' has sub-type changes:
       type size changed from 32 to 64 (in bits)
       1 data member insertion:
-        'char S::m0', at offset 0 (in bits)
+        'char m0', at offset 0 (in bits)
       1 data member change:
-        'int S::m1' offset changed from 0 to 32 (in bits) (by +32 bits)
+        'int m1' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 03f89b7..8bcb277 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base at test6-fn-suppr-v1.cc:4:1
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int 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:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,5 +29,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base at test6-fn-suppr-v1.cc:4:1
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 3e54f60..c0d52de 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -29,5 +29,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd..43de5ac 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd..43de5ac 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 79c37bd..43de5ac 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function char bar(int, S2**)' has some indirect sub-type changes:
     parameter 2 of type 'S2**' has sub-type changes:
@@ -20,5 +20,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
           1 base class insertion:
             struct base
           1 data member change:
-            'int S2::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+            'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
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 094b490..caa7c52 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
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'function int bar(S&)' has some indirect sub-type changes:
     parameter 1 of type 'S&' has sub-type changes:
@@ -19,5 +19,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 base class insertion:
           struct base
         1 data member change:
-          'int S::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3cce1b3..acbaf39 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
@@ -8,16 +8,16 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3d8ac40..2823d1b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e60..18f5297 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3d8ac40..2823d1b 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e60..18f5297 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 0824e60..18f5297 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 1 Changed (1 filtered out), 0 Added variab
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 3cce1b3..acbaf39 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
@@ -8,16 +8,16 @@ Variables changes summary: 0 Removed, 2 Changed, 0 Added variables
       in pointed to type 'struct S0':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S0::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S0::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 bits)
 
   [C] 'S1* var1' was changed:
     type of variable changed:
       in pointed to type 'struct S1':
         type size changed from 32 to 64 (in bits)
         1 data member insertion:
-          'char S1::inserted_member', at offset 0 (in bits)
+          'char inserted_member', at offset 0 (in bits)
         1 data member change:
-          'int S1::m0' offset changed from 0 to 32 (in bits) (by +32 bits)
+          'int m0' offset changed from 0 to 32 (in bits) (by +32 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 ddea850..f5dff29 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
@@ -8,5 +8,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (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 9b7599d..21dec52 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
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       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)
+          'char m1', at offset 32 (in bits)
 
   [C] 'function void foo(S*)' has some indirect sub-type changes:
     parameter 1 of type 'S*' has sub-type changes:
-- 
1.8.3.1


Thanks for working on this.

Cheers,
-- 
		Dodji

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-02-08 16:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 12:08 [PATCH 0/1] do not qualify names in diff report Giuliano Procida
2021-01-27 12:08 ` [PATCH 1/1] abidiff: do not qualify member " Giuliano Procida
2021-02-08 16:26   ` Dodji Seketeli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).