header-checker: Remove unique_id

This commit removes unique_id because it seems that there are some overlapping between unique_id and linker_set_key. Furthermore, this helps us centralize type ID related code. Bug: 74764811 Test: ./tests/test.py Test: lunch walleye-userdebug && make Change-Id: Ie7a27a428f9f8d729134047debc05d5a597e2452
2019-04-03 11:28:52 +08:00
parent becaf919d4
commit f6100313dd
172 changed files with 10100 additions and 11820 deletions
--- a/vndk/tools/header-checker/src/diff/abi_diff.cpp
+++ b/vndk/tools/header-checker/src/diff/abi_diff.cpp
@@ -121,11 +121,11 @@ HeaderAbiDiff::ExtractUserDefinedTypes(const repr::ModuleIR &tu) {
          continue;
        }
        record_types.emplace(
-            record_type->GetUniqueId(), record_type);
+            record_type->GetLinkerSetKey(), record_type);
        break;
      case repr::EnumTypeKind:
        enum_types.emplace(
-            static_cast<const repr::EnumTypeIR *>(type)->GetUniqueId(),
+            static_cast<const repr::EnumTypeIR *>(type)->GetLinkerSetKey(),
            static_cast<const repr::EnumTypeIR *>(type));
        break;
      case repr::FunctionTypeKind:
--- a/vndk/tools/header-checker/src/diff/abi_diff_wrappers.cpp
+++ b/vndk/tools/header-checker/src/diff/abi_diff_wrappers.cpp
@@ -32,7 +32,7 @@ template <>
 bool DiffWrapper<repr::RecordTypeIR>::DumpDiff(
    repr::DiffMessageIR::DiffKind diff_kind) {
  std::deque<std::string> type_queue;
-  if (oldp_->GetUniqueId() != newp_->GetUniqueId()) {
+  if (oldp_->GetLinkerSetKey() != newp_->GetLinkerSetKey()) {
    llvm::errs() << "Comparing two different unreferenced records\n";
    return false;
  }
@@ -48,7 +48,7 @@ template <>
 bool DiffWrapper<repr::EnumTypeIR>::DumpDiff(
    repr::DiffMessageIR::DiffKind diff_kind) {
  std::deque<std::string> type_queue;
-  if (oldp_->GetUniqueId() != newp_->GetUniqueId()) {
+  if (oldp_->GetLinkerSetKey() != newp_->GetLinkerSetKey()) {
    llvm::errs() << "Comparing two different unreferenced enums\n";
    return false;
  }
--- a/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.cpp
@@ -139,13 +139,6 @@ bool ABIWrapper::SetupFunctionParameter(
  return true;
 }

-static const clang::TagDecl *GetTagDecl(clang::QualType qual_type) {
-  const clang::Type *type_ptr = qual_type.getCanonicalType().getTypePtr();
-  assert(type_ptr != nullptr);
-  const clang::TagDecl *tag_decl = type_ptr->getAsTagDecl();
-  return tag_decl;
-}
-
 static const clang::RecordDecl *GetAnonymousRecord(clang::QualType type) {
  const clang::Type *type_ptr = type.getTypePtr();
  assert(type_ptr != nullptr);
@@ -218,22 +211,6 @@ static clang::QualType GetFinalReferencedType(clang::QualType qual_type) {
  return qual_type;
 }

-std::string ABIWrapper::TypeNameWithFinalDestination(
-    clang::QualType qual_type) {
-  clang::QualType canonical_qual_type = qual_type.getCanonicalType();
-  const std::string qual_type_name = QualTypeToString(canonical_qual_type);
-  clang::QualType final_destination_type =
-      GetFinalReferencedType(canonical_qual_type);
-  const clang::RecordDecl *anon_record =
-      GetAnonymousRecord(final_destination_type);
-  if (anon_record) {
-    clang::SourceManager &sm = cip_->getSourceManager();
-    clang::SourceLocation location = anon_record->getLocation();
-    return qual_type_name + " at " + location.printToString(sm);
-  }
-  return qual_type_name;
-}
-
 std::string ABIWrapper::GetTypeId(clang::QualType qual_type) {
  return ast_caches_->GetTypeId(GetKeyForTypeId(qual_type));
 }
@@ -246,8 +223,7 @@ std::string ABIWrapper::GetKeyForTypeId(clang::QualType qual_type) {
  // final destination. This helps in avoiding aliasing of types when fully
  // qualified type-name doesn't expand all template parameters with their
  // namespaces.
-  return TypeNameWithFinalDestination(qual_type) +
-      GetTypeUniqueId(GetTagDecl(final_destination_type));
+  return QualTypeToString(qual_type) + GetTypeUniqueId(final_destination_type);
 }

 bool ABIWrapper::CreateAnonymousRecord(const clang::RecordDecl *record_decl) {
@@ -263,19 +239,14 @@ bool ABIWrapper::CreateExtendedType(clang::QualType qual_type,
  return CreateBasicNamedAndTypedDecl(canonical_type, typep, "");
 }

-std::string ABIWrapper::GetTypeUniqueId(const clang::TagDecl *tag_decl) {
-  if (!tag_decl) {
-    return "";
-  }
-  clang::QualType qual_type =
-      tag_decl->getTypeForDecl()->getCanonicalTypeInternal();
-  if (!tag_decl->isExternCContext() && ast_contextp_->getLangOpts().CPlusPlus) {
-    llvm::SmallString<256> uid;
-    llvm::raw_svector_ostream out(uid);
-    mangle_contextp_->mangleCXXRTTIName(qual_type, out);
-    return uid.str();
-  }
-  return QualTypeToString(qual_type);
+std::string ABIWrapper::GetTypeUniqueId(clang::QualType qual_type) {
+  const clang::Type *canonical_type = qual_type.getCanonicalType().getTypePtr();
+  assert(canonical_type != nullptr);
+
+  llvm::SmallString<256> uid;
+  llvm::raw_svector_ostream out(uid);
+  mangle_contextp_->mangleCXXRTTI(qual_type, out);
+  return uid.str();
 }

 // CreateBasicNamedAndTypedDecl creates a BasicNamedAndTypedDecl which will
@@ -300,10 +271,10 @@ bool ABIWrapper::CreateBasicNamedAndTypedDecl(
    typep->SetAlignment(size_and_alignment.second.getQuantity());
  }

-  std::string type_name_with_destination =
-      TypeNameWithFinalDestination(canonical_type);
-  typep->SetName(type_name_with_destination);
-  typep->SetLinkerSetKey(type_name_with_destination);
+  std::string human_name = QualTypeToString(canonical_type);
+  std::string mangled_name = GetTypeUniqueId(canonical_type);
+  typep->SetName(human_name);
+  typep->SetLinkerSetKey(mangled_name);

  // This type has a reference type if its a pointer / reference OR it has CVR
  // qualifiers.
@@ -819,7 +790,6 @@ bool RecordDeclWrapper::SetupRecordInfo(repr::RecordTypeIR *record_declp,
      record_decl_->isAnonymousStructOrUnion()) {
    record_declp->SetAnonymity(true);
  }
-  record_declp->SetUniqueId(GetTypeUniqueId(record_decl_));
  record_declp->SetAccess(AccessClangToIR(record_decl_->getAccess()));
  return SetupRecordFields(record_declp, source_file) &&
      SetupCXXRecordInfo(record_declp, source_file);
@@ -903,7 +873,6 @@ bool EnumDeclWrapper::SetupEnum(repr::EnumTypeIR *enum_type,
  enum_type->SetSourceFile(source_file);
  enum_type->SetUnderlyingType(GetTypeId(enum_decl_->getIntegerType()));
  enum_type->SetAccess(AccessClangToIR(enum_decl_->getAccess()));
-  enum_type->SetUniqueId(GetTypeUniqueId(enum_decl_));
  return SetupEnumFields(enum_type) &&
      CreateBasicNamedAndTypedDecl(enum_decl_->getIntegerType(), "");
 }
--- a/vndk/tools/header-checker/src/dumper/abi_wrappers.h
+++ b/vndk/tools/header-checker/src/dumper/abi_wrappers.h
@@ -86,15 +86,13 @@ class ABIWrapper {
  bool CreateExtendedType(clang::QualType canonical_type,
                          repr::TypeIR *typep);

-  std::string GetTypeUniqueId(const clang::TagDecl *tag_decl);
-
 private:
+  std::string GetTypeUniqueId(clang::QualType qual_type);
+
  std::string QualTypeToString(const clang::QualType &sweet_qt);

  std::string GetKeyForTypeId(clang::QualType qual_type);

-  std::string TypeNameWithFinalDestination(clang::QualType qual_type);
-
  TypeAndCreationStatus SetTypeKind(const clang::QualType qtype,
                                    const std::string &source_file);

--- a/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
+++ b/vndk/tools/header-checker/src/repr/abi_diff_helpers.cpp
@@ -199,7 +199,7 @@ DiffStatus AbiDiffHelper::CompareEnumTypes(
    const EnumTypeIR *old_type, const EnumTypeIR *new_type,
    std::deque<std::string> *type_queue,
    DiffMessageIR::DiffKind diff_kind) {
-  if (old_type->GetUniqueId() != new_type->GetUniqueId()) {
+  if (old_type->GetLinkerSetKey() != new_type->GetLinkerSetKey()) {
    return DiffStatus::direct_diff;
  }
  auto enum_type_diff_ir = std::make_unique<EnumTypeDiffIR>();
@@ -548,7 +548,7 @@ DiffStatus AbiDiffHelper::CompareRecordTypes(
  auto record_type_diff_ir = std::make_unique<RecordTypeDiffIR>();
  // Compare names.
  if (!old_type->IsAnonymous() && !new_type->IsAnonymous() &&
-      old_type->GetUniqueId() != new_type->GetUniqueId()) {
+      old_type->GetLinkerSetKey() != new_type->GetLinkerSetKey()) {
    // Do not dump anything since the record types themselves are fundamentally
    // different.
    return DiffStatus::direct_diff;
--- a/vndk/tools/header-checker/src/repr/ir_representation.h
+++ b/vndk/tools/header-checker/src/repr/ir_representation.h
@@ -191,20 +191,6 @@ class TypeIR : public LinkableMessageIR, public ReferencesOtherType {
  uint32_t alignment_ = 0;
 };

-class TagTypeIR {
- public:
-  const std::string &GetUniqueId() const {
-    return unique_id_;
-  }
-
-  void SetUniqueId(const std::string &unique_id) {
-    unique_id_ = unique_id;
-  }
-
- protected:
-  std::string unique_id_;
-};
-
 class VTableComponentIR {
 public:
  enum Kind {
@@ -360,8 +346,7 @@ class RecordFieldIR : public ReferencesOtherType {
  AccessSpecifierIR access_ = AccessSpecifierIR::PublicAccess;
 };

-class RecordTypeIR : public TypeIR, public TemplatedArtifactIR,
-                     public TagTypeIR {
+class RecordTypeIR : public TypeIR, public TemplatedArtifactIR {
 public:
  enum RecordKind {
    struct_kind,
@@ -466,7 +451,7 @@ class EnumFieldIR {
  int value_ = 0;
 };

-class EnumTypeIR : public TypeIR, public TagTypeIR {
+class EnumTypeIR : public TypeIR {
 public:
  // Add Methods to get information from the IR.
  void AddEnumField(EnumFieldIR &&field) {
--- a/vndk/tools/header-checker/src/repr/ir_representation_internal.h
+++ b/vndk/tools/header-checker/src/repr/ir_representation_internal.h
@@ -53,13 +53,13 @@ inline std::string GetReferencedTypeMapKey<QualifiedTypeIR>(

 inline std::string GetODRListMapKey(const RecordTypeIR *record_type_ir) {
  if (record_type_ir->IsAnonymous()) {
-    return record_type_ir->GetLinkerSetKey() + record_type_ir->GetUniqueId();
+    return record_type_ir->GetLinkerSetKey();
  }
-  return record_type_ir->GetUniqueId() + record_type_ir->GetSourceFile();
+  return record_type_ir->GetLinkerSetKey() + record_type_ir->GetSourceFile();
 }

 inline std::string GetODRListMapKey(const EnumTypeIR *enum_type_ir) {
-  return enum_type_ir->GetUniqueId() + enum_type_ir->GetSourceFile();
+  return enum_type_ir->GetLinkerSetKey() + enum_type_ir->GetSourceFile();
 }

 inline std::string GetODRListMapKey(const FunctionTypeIR *function_type_ir) {
--- a/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp
+++ b/vndk/tools/header-checker/src/repr/json/ir_dumper.cpp
@@ -147,11 +147,6 @@ void IRToJsonConverter::AddVTableLayout(JsonObject &record_type,
  record_type.Set("vtable_components", vtable_components);
 }

-void IRToJsonConverter::AddTagTypeInfo(JsonObject &type_decl,
-                                       const TagTypeIR *tag_type_ir) {
-  type_decl.Set("unique_id", tag_type_ir->GetUniqueId());
-}
-
 JsonObject IRToJsonConverter::ConvertRecordTypeIR(const RecordTypeIR *recordp) {
  JsonObject record_type;

@@ -162,7 +157,6 @@ JsonObject IRToJsonConverter::ConvertRecordTypeIR(const RecordTypeIR *recordp) {
  AddRecordFields(record_type, recordp);
  AddBaseSpecifiers(record_type, recordp);
  AddVTableLayout(record_type, recordp);
-  AddTagTypeInfo(record_type, recordp);
  AddTemplateInfo(record_type, recordp);
  return record_type;
 }
@@ -228,7 +222,6 @@ JsonObject IRToJsonConverter::ConvertEnumTypeIR(const EnumTypeIR *enump) {
  enum_type.Set("underlying_type", enump->GetUnderlyingType());
  AddTypeInfo(enum_type, enump);
  AddEnumFields(enum_type, enump);
-  AddTagTypeInfo(enum_type, enump);
  return enum_type;
 }

--- a/vndk/tools/header-checker/src/repr/json/ir_dumper.h
+++ b/vndk/tools/header-checker/src/repr/json/ir_dumper.h
@@ -42,9 +42,6 @@ class IRToJsonConverter {
  static void AddVTableLayout(JsonObject &record_type,
                              const RecordTypeIR *record_ir);

-  static void AddTagTypeInfo(JsonObject &type_decl,
-                             const TagTypeIR *tag_type_ir);
-
  static void AddEnumFields(JsonObject &enum_type, const EnumTypeIR *enum_ir);

 public:
--- a/vndk/tools/header-checker/src/repr/json/ir_reader.cpp
+++ b/vndk/tools/header-checker/src/repr/json/ir_reader.cpp
@@ -189,11 +189,6 @@ bool JsonIRReader::ReadDump(const std::string &dump_file) {
  return true;
 }

-void JsonIRReader::ReadTagTypeInfo(const JsonObjectRef &type_decl,
-                                   TagTypeIR *tag_type_ir) {
-  tag_type_ir->SetUniqueId(type_decl.GetString("unique_id"));
-}
-
 void JsonIRReader::ReadTemplateInfo(const JsonObjectRef &type_decl,
                                    TemplatedArtifactIR *template_ir) {
  TemplateInfoIR template_info_ir;
@@ -299,7 +294,6 @@ JsonIRReader::RecordTypeJsonToIR(const JsonObjectRef &record_type) {
  ReadBaseSpecifiers(record_type, &record_type_ir);
  record_type_ir.SetRecordKind(GetRecordKind(record_type));
  record_type_ir.SetAnonymity(record_type.GetBool("is_anonymous"));
-  ReadTagTypeInfo(record_type, &record_type_ir);
  return record_type_ir;
 }

@@ -309,7 +303,6 @@ EnumTypeIR JsonIRReader::EnumTypeJsonToIR(const JsonObjectRef &enum_type) {
  enum_type_ir.SetUnderlyingType(enum_type.GetString("underlying_type"));
  enum_type_ir.SetAccess(GetAccess(enum_type));
  ReadEnumFields(enum_type, &enum_type_ir);
-  ReadTagTypeInfo(enum_type, &enum_type_ir);
  return enum_type_ir;
 }

--- a/vndk/tools/header-checker/src/repr/json/ir_reader.h
+++ b/vndk/tools/header-checker/src/repr/json/ir_reader.h
@@ -159,9 +159,6 @@ class JsonIRReader : public IRReader {
  static void ReadVTableLayout(const JsonObjectRef &record_type,
                               RecordTypeIR *record_ir);

-  static void ReadTagTypeInfo(const JsonObjectRef &type_decl,
-                              TagTypeIR *tag_type_ir);
-
  static void ReadEnumFields(const JsonObjectRef &enum_type,
                             EnumTypeIR *enum_ir);

--- a/vndk/tools/header-checker/src/repr/protobuf/converter.h
+++ b/vndk/tools/header-checker/src/repr/protobuf/converter.h
@@ -207,9 +207,6 @@ class IRToProtobufConverter {
  static bool AddVTableLayout(
      abi_dump::RecordType *record_protobuf, const RecordTypeIR *record_ir);

-  static bool AddTagTypeInfo(abi_dump::TagType *tag_type_protobuf,
-                             const TagTypeIR *tag_type_ir);
-
  static bool AddEnumFields(abi_dump::EnumType *enum_protobuf,
                            const EnumTypeIR *enum_ir);

--- a/vndk/tools/header-checker/src/repr/protobuf/ir_dumper.cpp
+++ b/vndk/tools/header-checker/src/repr/protobuf/ir_dumper.cpp
@@ -102,16 +102,6 @@ bool IRToProtobufConverter::AddVTableLayout(
  return true;
 }

-bool IRToProtobufConverter::AddTagTypeInfo(
-    abi_dump::TagType *tag_type_protobuf,
-    const TagTypeIR *tag_type_ir) {
-  if (!tag_type_protobuf || !tag_type_ir) {
-    return false;
-  }
-  tag_type_protobuf->set_unique_id(tag_type_ir->GetUniqueId());
-  return true;
-}
-
 abi_dump::RecordType IRToProtobufConverter::ConvertRecordTypeIR(
    const RecordTypeIR *recordp) {
  abi_dump::RecordType added_record_type;
@@ -125,7 +115,6 @@ abi_dump::RecordType IRToProtobufConverter::ConvertRecordTypeIR(
      !AddRecordFields(&added_record_type, recordp) ||
      !AddBaseSpecifiers(&added_record_type, recordp) ||
      !AddVTableLayout(&added_record_type, recordp) ||
-      !AddTagTypeInfo(added_record_type.mutable_tag_info(), recordp) ||
      !(recordp->GetTemplateElements().size() ?
        AddTemplateInformation(added_record_type.mutable_template_info(),
                               recordp) : true)) {
@@ -223,8 +212,7 @@ abi_dump::EnumType IRToProtobufConverter::ConvertEnumTypeIR(
  added_enum_type.set_access(AccessIRToProtobuf(enump->GetAccess()));
  added_enum_type.set_underlying_type(enump->GetUnderlyingType());
  if (!AddTypeInfo(added_enum_type.mutable_type_info(), enump) ||
-      !AddEnumFields(&added_enum_type, enump) ||
-      !AddTagTypeInfo(added_enum_type.mutable_tag_info(), enump)) {
+      !AddEnumFields(&added_enum_type, enump)) {
    llvm::errs() << "EnumTypeIR could not be converted\n";
    ::exit(1);
  }
--- a/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp
+++ b/vndk/tools/header-checker/src/repr/protobuf/ir_reader.cpp
@@ -172,7 +172,6 @@ RecordTypeIR ProtobufIRReader::RecordTypeProtobufToIR(
  record_type_ir.SetRecordKind(
      RecordKindProtobufToIR(record_type_protobuf.record_kind()));
  record_type_ir.SetAnonymity(record_type_protobuf.is_anonymous());
-  record_type_ir.SetUniqueId(record_type_protobuf.tag_info().unique_id());
  return record_type_ir;
 }

@@ -194,7 +193,6 @@ EnumTypeIR ProtobufIRReader::EnumTypeProtobufToIR(
  enum_type_ir.SetAccess(AccessProtobufToIR(enum_type_protobuf.access()));
  enum_type_ir.SetFields(
      EnumFieldsProtobufToIR(enum_type_protobuf.enum_fields()));
-  enum_type_ir.SetUniqueId(enum_type_protobuf.tag_info().unique_id());
  return enum_type_ir;
 }

--- a/vndk/tools/header-checker/src/repr/protobuf/proto/abi_dump.proto
+++ b/vndk/tools/header-checker/src/repr/protobuf/proto/abi_dump.proto
@@ -128,10 +128,6 @@ message VTableLayout {
  repeated VTableComponent vtable_components = 1;
 }

-message TagType {
-  optional string unique_id = 1 [default = ""];
-}
-
 message RecordType {
  optional BasicNamedAndTypedDecl type_info = 1;
  repeated RecordFieldDecl fields = 2;
@@ -141,7 +137,6 @@ message RecordType {
  optional AccessSpecifier access = 8 [default = public_access];
  optional bool is_anonymous = 9;
  optional RecordKind record_kind = 10 [default = struct_kind];
-  optional TagType tag_info = 11;
 }

 message EnumType {
@@ -149,7 +144,6 @@ message EnumType {
  optional string underlying_type = 2;
  repeated EnumFieldDecl enum_fields = 3;
  optional AccessSpecifier access = 4 [default = public_access];
-  optional TagType tag_info = 5;
 }

 message GlobalVarDecl {
--- a/vndk/tools/header-checker/tests/expected/example1.cpp
+++ b/vndk/tools/header-checker/tests/expected/example1.cpp
@@ -1,3 +1,125 @@
+record_types {
+  type_info {
+    name: "HiddenBase"
+    size: 8
+    alignment: 4
+    referenced_type: "type-1"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
+    linker_set_key: "_ZTI10HiddenBase"
+    self_type: "type-1"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "hide"
+    access: private_access
+  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 32
+    field_name: "seek"
+    access: private_access
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "List<float>"
+    size: 8
+    alignment: 8
+    referenced_type: "type-31"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI4ListIfE"
+    self_type: "type-31"
+  }
+  fields {
+    referenced_type: "type-33"
+    field_offset: 0
+    field_name: "middle"
+    access: public_access
+  }
+  template_info {
+    elements {
+      referenced_type: "type-3"
+    }
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "List<int>"
+    size: 8
+    alignment: 8
+    referenced_type: "type-35"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI4ListIiE"
+    self_type: "type-35"
+  }
+  fields {
+    referenced_type: "type-37"
+    field_offset: 0
+    field_name: "middle"
+    access: public_access
+  }
+  template_info {
+    elements {
+      referenced_type: "type-2"
+    }
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "Hello"
+    size: 32
+    alignment: 4
+    referenced_type: "type-19"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI5Hello"
+    self_type: "type-19"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "foo"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 32
+    field_name: "bar"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-20"
+    field_offset: 64
+    field_name: "d"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-9"
+    field_offset: 96
+    field_name: "enum_field"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-9"
+    field_offset: 128
+    field_name: "enum_field2"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-21"
+    field_offset: 160
+    field_name: ""
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
 record_types {
  type_info {
    name: "CPPHello"
@@ -5,7 +127,7 @@ record_types {
    alignment: 8
    referenced_type: "type-23"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello"
+    linker_set_key: "_ZTI8CPPHello"
    self_type: "type-23"
  }
  fields {
@@ -64,70 +186,46 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS8CPPHello"
-  }
 }
 record_types {
  type_info {
-    name: "Hello"
-    size: 32
-    alignment: 4
-    referenced_type: "type-19"
+    name: "List<float>::_Node"
+    size: 24
+    alignment: 8
+    referenced_type: "type-32"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello"
-    self_type: "type-19"
+    linker_set_key: "_ZTIN4ListIfE5_NodeE"
+    self_type: "type-32"
  }
  fields {
-    referenced_type: "type-2"
+    referenced_type: "type-3"
    field_offset: 0
-    field_name: "foo"
-    access: public_access
+    field_name: "mVal"
+    access: private_access
  }
  fields {
-    referenced_type: "type-2"
-    field_offset: 32
-    field_name: "bar"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-20"
+    referenced_type: "type-33"
    field_offset: 64
-    field_name: "d"
-    access: public_access
+    field_name: "mpPrev"
+    access: private_access
  }
  fields {
-    referenced_type: "type-9"
-    field_offset: 96
-    field_name: "enum_field"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-9"
+    referenced_type: "type-33"
    field_offset: 128
-    field_name: "enum_field2"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-21"
-    field_offset: 160
-    field_name: ""
-    access: public_access
+    field_name: "mpNext"
+    access: private_access
  }
  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello"
-  }
+  record_kind: class_kind
 }
 record_types {
  type_info {
-    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3"
+    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
    size: 12
    alignment: 4
    referenced_type: "type-21"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3"
+    linker_set_key: "_ZTIN5HelloUt1_E"
    self_type: "type-21"
  }
  fields {
@@ -151,18 +249,15 @@ record_types {
  access: public_access
  is_anonymous: true
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
-  }
 }
 record_types {
  type_info {
-    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5"
+    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)"
    size: 4
    alignment: 4
    referenced_type: "type-22"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5"
+    linker_set_key: "_ZTIN5HelloUt1_Ut_E"
    self_type: "type-22"
  }
  fields {
@@ -174,125 +269,6 @@ record_types {
  access: public_access
  is_anonymous: true
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)"
-  }
-}
-record_types {
-  type_info {
-    name: "HiddenBase"
-    size: 8
-    alignment: 4
-    referenced_type: "type-1"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
-    linker_set_key: "HiddenBase"
-    self_type: "type-1"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "hide"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 32
-    field_name: "seek"
-    access: private_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10HiddenBase"
-  }
-}
-record_types {
-  type_info {
-    name: "List<float>"
-    size: 8
-    alignment: 8
-    referenced_type: "type-31"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>"
-    self_type: "type-31"
-  }
-  fields {
-    referenced_type: "type-33"
-    field_offset: 0
-    field_name: "middle"
-    access: public_access
-  }
-  template_info {
-    elements {
-      referenced_type: "type-3"
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS4ListIfE"
-  }
-}
-record_types {
-  type_info {
-    name: "List<float>::_Node"
-    size: 24
-    alignment: 8
-    referenced_type: "type-32"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>::_Node"
-    self_type: "type-32"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "mVal"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-33"
-    field_offset: 64
-    field_name: "mpPrev"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-33"
-    field_offset: 128
-    field_name: "mpNext"
-    access: private_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN4ListIfE5_NodeE"
-  }
-}
-record_types {
-  type_info {
-    name: "List<int>"
-    size: 8
-    alignment: 8
-    referenced_type: "type-35"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<int>"
-    self_type: "type-35"
-  }
-  fields {
-    referenced_type: "type-37"
-    field_offset: 0
-    field_name: "middle"
-    access: public_access
-  }
-  template_info {
-    elements {
-      referenced_type: "type-2"
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS4ListIiE"
-  }
 }
 record_types {
  type_info {
@@ -301,7 +277,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain"
+    linker_set_key: "_ZTIN5test210HelloAgainE"
    self_type: "type-4"
  }
  fields {
@@ -350,9 +326,44 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test210HelloAgainE"
+}
+record_types {
+  type_info {
+    name: "test3::Outer::Inner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-18"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35Outer5InnerE"
+    self_type: "type-18"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "b"
+    access: private_access
+  }
+  access: private_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "test3::Outer"
+    size: 4
+    alignment: 4
+    referenced_type: "type-17"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35OuterE"
+    self_type: "type-17"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  access: public_access
+  record_kind: class_kind
 }
 record_types {
  type_info {
@@ -361,7 +372,7 @@ record_types {
    alignment: 8
    referenced_type: "type-13"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<double>"
+    linker_set_key: "_ZTIN5test38ByeAgainIdEE"
    self_type: "type-13"
  }
  fields {
@@ -383,9 +394,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIdEE"
-  }
 }
 record_types {
  type_info {
@@ -394,7 +402,7 @@ record_types {
    alignment: 4
    referenced_type: "type-15"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<float>"
+    linker_set_key: "_ZTIN5test38ByeAgainIfEE"
    self_type: "type-15"
  }
  fields {
@@ -416,73 +424,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIfEE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer"
-    size: 4
-    alignment: 4
-    referenced_type: "type-17"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer"
-    self_type: "type-17"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35OuterE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer::Inner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-18"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer::Inner"
-    self_type: "type-18"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "b"
-    access: private_access
-  }
-  access: private_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35Outer5InnerE"
-  }
-}
-enum_types {
-  type_info {
-    name: "CPPHello::Bla"
-    size: 4
-    alignment: 4
-    referenced_type: "type-27"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello::Bla"
-    self_type: "type-27"
-  }
-  underlying_type: "type-9"
-  enum_fields {
-    enum_field_value: 1
-    name: "CPPHello::BLA"
-  }
-  access: public_access
-  tag_info {
-    unique_id: "_ZTSN8CPPHello3BlaE"
-  }
 }
 enum_types {
  type_info {
@@ -491,7 +432,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "Foo_s"
+    linker_set_key: "_ZTI5Foo_s"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -504,9 +445,6 @@ enum_types {
    name: "foosbat"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTS5Foo_s"
-  }
 }
 enum_types {
  type_info {
@@ -515,7 +453,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-16"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Kind"
+    linker_set_key: "_ZTIN5test34KindE"
    self_type: "type-16"
  }
  underlying_type: "type-9"
@@ -528,9 +466,23 @@ enum_types {
    name: "test3::kind2"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTSN5test34KindE"
+}
+enum_types {
+  type_info {
+    name: "CPPHello::Bla"
+    size: 4
+    alignment: 4
+    referenced_type: "type-27"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTIN8CPPHello3BlaE"
+    self_type: "type-27"
  }
+  underlying_type: "type-9"
+  enum_fields {
+    enum_field_value: 1
+    name: "CPPHello::BLA"
+  }
+  access: public_access
 }
 pointer_types {
  type_info {
@@ -539,10 +491,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-23"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello *"
+    linker_set_key: "_ZTIP8CPPHello"
    self_type: "type-26"
  }
 }
+pointer_types {
+  type_info {
+    name: "const char *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-38"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTIPKc"
+    self_type: "type-39"
+  }
+}
 pointer_types {
  type_info {
    name: "List<float>::_Node *"
@@ -550,7 +513,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-32"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>::_Node *"
+    linker_set_key: "_ZTIPN4ListIfE5_NodeE"
    self_type: "type-33"
  }
 }
@@ -561,19 +524,19 @@ pointer_types {
    alignment: 8
    referenced_type: "type-36"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<int>::_Node *"
+    linker_set_key: "_ZTIPN4ListIiE5_NodeE"
    self_type: "type-37"
  }
 }
 pointer_types {
  type_info {
-    name: "const char *"
+    name: "test2::HelloAgain *"
    size: 8
    alignment: 8
-    referenced_type: "type-38"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const char *"
-    self_type: "type-39"
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIPN5test210HelloAgainE"
+    self_type: "type-7"
  }
 }
 pointer_types {
@@ -583,7 +546,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-30"
  }
 }
@@ -594,21 +557,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "int *"
+    linker_set_key: "_ZTIPi"
    self_type: "type-29"
  }
 }
-pointer_types {
-  type_info {
-    name: "test2::HelloAgain *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain *"
-    self_type: "type-7"
-  }
-}
 lvalue_reference_types {
  type_info {
    name: "const float &"
@@ -616,7 +568,7 @@ lvalue_reference_types {
    alignment: 8
    referenced_type: "type-25"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const float &"
+    linker_set_key: "_ZTIRKf"
    self_type: "type-34"
  }
 }
@@ -627,7 +579,7 @@ builtin_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: ""
-    linker_set_key: "bool"
+    linker_set_key: "_ZTIb"
    self_type: "type-12"
  }
  is_unsigned: true
@@ -640,7 +592,7 @@ builtin_types {
    alignment: 1
    referenced_type: "type-40"
    source_file: ""
-    linker_set_key: "char"
+    linker_set_key: "_ZTIc"
    self_type: "type-40"
  }
  is_unsigned: false
@@ -653,7 +605,7 @@ builtin_types {
    alignment: 8
    referenced_type: "type-14"
    source_file: ""
-    linker_set_key: "double"
+    linker_set_key: "_ZTId"
    self_type: "type-14"
  }
  is_unsigned: false
@@ -666,7 +618,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -679,7 +631,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -692,7 +644,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -705,7 +657,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-6"
  }
  is_unsigned: false
@@ -718,7 +670,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-20"
    source_file: ""
-    linker_set_key: "wchar_t"
+    linker_set_key: "_ZTIw"
    self_type: "type-20"
  }
  is_unsigned: false
@@ -731,7 +683,7 @@ qualified_types {
    alignment: 1
    referenced_type: "type-10"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool const[2]"
+    linker_set_key: "_ZTIA2_Kb"
    self_type: "type-11"
  }
  is_const: true
@@ -745,7 +697,7 @@ qualified_types {
    alignment: 8
    referenced_type: "type-23"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const CPPHello"
+    linker_set_key: "_ZTIK8CPPHello"
    self_type: "type-28"
  }
  is_const: true
@@ -759,7 +711,7 @@ qualified_types {
    alignment: 1
    referenced_type: "type-40"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const char"
+    linker_set_key: "_ZTIKc"
    self_type: "type-38"
  }
  is_const: true
@@ -773,7 +725,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const float"
+    linker_set_key: "_ZTIKf"
    self_type: "type-25"
  }
  is_const: true
@@ -787,7 +739,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const int"
+    linker_set_key: "_ZTIKi"
    self_type: "type-24"
  }
  is_const: true
@@ -801,7 +753,7 @@ array_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool [2]"
+    linker_set_key: "_ZTIA2_b"
    self_type: "type-10"
  }
 }
--- a/vndk/tools/header-checker/tests/expected/example1.h
+++ b/vndk/tools/header-checker/tests/expected/example1.h
@@ -1,3 +1,125 @@
+record_types {
+  type_info {
+    name: "HiddenBase"
+    size: 8
+    alignment: 4
+    referenced_type: "type-1"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
+    linker_set_key: "_ZTI10HiddenBase"
+    self_type: "type-1"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "hide"
+    access: private_access
+  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 32
+    field_name: "seek"
+    access: private_access
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "List<float>"
+    size: 8
+    alignment: 8
+    referenced_type: "type-34"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI4ListIfE"
+    self_type: "type-34"
+  }
+  fields {
+    referenced_type: "type-36"
+    field_offset: 0
+    field_name: "middle"
+    access: public_access
+  }
+  template_info {
+    elements {
+      referenced_type: "type-3"
+    }
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "List<int>"
+    size: 8
+    alignment: 8
+    referenced_type: "type-41"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI4ListIiE"
+    self_type: "type-41"
+  }
+  fields {
+    referenced_type: "type-43"
+    field_offset: 0
+    field_name: "middle"
+    access: public_access
+  }
+  template_info {
+    elements {
+      referenced_type: "type-2"
+    }
+  }
+  access: public_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "Hello"
+    size: 32
+    alignment: 4
+    referenced_type: "type-21"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTI5Hello"
+    self_type: "type-21"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "foo"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 32
+    field_name: "bar"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-22"
+    field_offset: 64
+    field_name: "d"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-9"
+    field_offset: 96
+    field_name: "enum_field"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-9"
+    field_offset: 128
+    field_name: "enum_field2"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-23"
+    field_offset: 160
+    field_name: ""
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
 record_types {
  type_info {
    name: "CPPHello"
@@ -5,7 +127,7 @@ record_types {
    alignment: 8
    referenced_type: "type-25"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello"
+    linker_set_key: "_ZTI8CPPHello"
    self_type: "type-25"
  }
  fields {
@@ -64,70 +186,46 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS8CPPHello"
-  }
 }
 record_types {
  type_info {
-    name: "Hello"
-    size: 32
-    alignment: 4
-    referenced_type: "type-21"
+    name: "List<float>::_Node"
+    size: 24
+    alignment: 8
+    referenced_type: "type-35"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello"
-    self_type: "type-21"
+    linker_set_key: "_ZTIN4ListIfE5_NodeE"
+    self_type: "type-35"
  }
  fields {
-    referenced_type: "type-2"
+    referenced_type: "type-3"
    field_offset: 0
-    field_name: "foo"
-    access: public_access
+    field_name: "mVal"
+    access: private_access
  }
  fields {
-    referenced_type: "type-2"
-    field_offset: 32
-    field_name: "bar"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-22"
+    referenced_type: "type-36"
    field_offset: 64
-    field_name: "d"
-    access: public_access
+    field_name: "mpPrev"
+    access: private_access
  }
  fields {
-    referenced_type: "type-9"
-    field_offset: 96
-    field_name: "enum_field"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-9"
+    referenced_type: "type-36"
    field_offset: 128
-    field_name: "enum_field2"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-23"
-    field_offset: 160
-    field_name: ""
-    access: public_access
+    field_name: "mpNext"
+    access: private_access
  }
  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello"
-  }
+  record_kind: class_kind
 }
 record_types {
  type_info {
-    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3"
+    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
    size: 12
    alignment: 4
    referenced_type: "type-23"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3) at /development/vndk/tools/header-checker/tests/input/example1.h:19:3"
+    linker_set_key: "_ZTIN5HelloUt1_E"
    self_type: "type-23"
  }
  fields {
@@ -151,18 +249,15 @@ record_types {
  access: public_access
  is_anonymous: true
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)"
-  }
 }
 record_types {
  type_info {
-    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5"
+    name: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)"
    size: 4
    alignment: 4
    referenced_type: "type-24"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5) at /development/vndk/tools/header-checker/tests/input/example1.h:22:5"
+    linker_set_key: "_ZTIN5HelloUt1_Ut_E"
    self_type: "type-24"
  }
  fields {
@@ -174,125 +269,6 @@ record_types {
  access: public_access
  is_anonymous: true
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Hello::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:19:3)::(anonymous struct at /development/vndk/tools/header-checker/tests/input/example1.h:22:5)"
-  }
-}
-record_types {
-  type_info {
-    name: "HiddenBase"
-    size: 8
-    alignment: 4
-    referenced_type: "type-1"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
-    linker_set_key: "HiddenBase"
-    self_type: "type-1"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "hide"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 32
-    field_name: "seek"
-    access: private_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10HiddenBase"
-  }
-}
-record_types {
-  type_info {
-    name: "List<float>"
-    size: 8
-    alignment: 8
-    referenced_type: "type-34"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>"
-    self_type: "type-34"
-  }
-  fields {
-    referenced_type: "type-36"
-    field_offset: 0
-    field_name: "middle"
-    access: public_access
-  }
-  template_info {
-    elements {
-      referenced_type: "type-3"
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS4ListIfE"
-  }
-}
-record_types {
-  type_info {
-    name: "List<float>::_Node"
-    size: 24
-    alignment: 8
-    referenced_type: "type-35"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>::_Node"
-    self_type: "type-35"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "mVal"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-36"
-    field_offset: 64
-    field_name: "mpPrev"
-    access: private_access
-  }
-  fields {
-    referenced_type: "type-36"
-    field_offset: 128
-    field_name: "mpNext"
-    access: private_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN4ListIfE5_NodeE"
-  }
-}
-record_types {
-  type_info {
-    name: "List<int>"
-    size: 8
-    alignment: 8
-    referenced_type: "type-41"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<int>"
-    self_type: "type-41"
-  }
-  fields {
-    referenced_type: "type-43"
-    field_offset: 0
-    field_name: "middle"
-    access: public_access
-  }
-  template_info {
-    elements {
-      referenced_type: "type-2"
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS4ListIiE"
-  }
 }
 record_types {
  type_info {
@@ -301,7 +277,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain"
+    linker_set_key: "_ZTIN5test210HelloAgainE"
    self_type: "type-4"
  }
  fields {
@@ -350,9 +326,44 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test210HelloAgainE"
+}
+record_types {
+  type_info {
+    name: "test3::Outer::Inner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-18"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35Outer5InnerE"
+    self_type: "type-18"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "b"
+    access: private_access
+  }
+  access: private_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "test3::Outer"
+    size: 4
+    alignment: 4
+    referenced_type: "type-17"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35OuterE"
+    self_type: "type-17"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  access: public_access
+  record_kind: class_kind
 }
 record_types {
  type_info {
@@ -361,7 +372,7 @@ record_types {
    alignment: 8
    referenced_type: "type-13"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<double>"
+    linker_set_key: "_ZTIN5test38ByeAgainIdEE"
    self_type: "type-13"
  }
  fields {
@@ -383,9 +394,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIdEE"
-  }
 }
 record_types {
  type_info {
@@ -394,7 +402,7 @@ record_types {
    alignment: 4
    referenced_type: "type-15"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<float>"
+    linker_set_key: "_ZTIN5test38ByeAgainIfEE"
    self_type: "type-15"
  }
  fields {
@@ -416,73 +424,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIfEE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer"
-    size: 4
-    alignment: 4
-    referenced_type: "type-17"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer"
-    self_type: "type-17"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35OuterE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer::Inner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-18"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer::Inner"
-    self_type: "type-18"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "b"
-    access: private_access
-  }
-  access: private_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35Outer5InnerE"
-  }
-}
-enum_types {
-  type_info {
-    name: "CPPHello::Bla"
-    size: 4
-    alignment: 4
-    referenced_type: "type-29"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello::Bla"
-    self_type: "type-29"
-  }
-  underlying_type: "type-9"
-  enum_fields {
-    enum_field_value: 1
-    name: "CPPHello::BLA"
-  }
-  access: public_access
-  tag_info {
-    unique_id: "_ZTSN8CPPHello3BlaE"
-  }
 }
 enum_types {
  type_info {
@@ -491,7 +432,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "Foo_s"
+    linker_set_key: "_ZTI5Foo_s"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -504,9 +445,6 @@ enum_types {
    name: "foosbat"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTS5Foo_s"
-  }
 }
 enum_types {
  type_info {
@@ -515,7 +453,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-16"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Kind"
+    linker_set_key: "_ZTIN5test34KindE"
    self_type: "type-16"
  }
  underlying_type: "type-9"
@@ -528,20 +466,23 @@ enum_types {
    name: "test3::kind2"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTSN5test34KindE"
-  }
 }
-pointer_types {
+enum_types {
  type_info {
-    name: "CPPHello *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-25"
+    name: "CPPHello::Bla"
+    size: 4
+    alignment: 4
+    referenced_type: "type-29"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "CPPHello *"
-    self_type: "type-28"
+    linker_set_key: "_ZTIN8CPPHello3BlaE"
+    self_type: "type-29"
  }
+  underlying_type: "type-9"
+  enum_fields {
+    enum_field_value: 1
+    name: "CPPHello::BLA"
+  }
+  access: public_access
 }
 pointer_types {
  type_info {
@@ -550,21 +491,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-19"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "ForwardDeclaration *"
+    linker_set_key: "_ZTIP18ForwardDeclaration"
    self_type: "type-20"
  }
 }
-pointer_types {
-  type_info {
-    name: "List<float>::_Node *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-35"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<float>::_Node *"
-    self_type: "type-36"
-  }
-}
 pointer_types {
  type_info {
    name: "List<int> *"
@@ -572,19 +502,19 @@ pointer_types {
    alignment: 8
    referenced_type: "type-41"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<int> *"
+    linker_set_key: "_ZTIP4ListIiE"
    self_type: "type-44"
  }
 }
 pointer_types {
  type_info {
-    name: "List<int>::_Node *"
+    name: "CPPHello *"
    size: 8
    alignment: 8
-    referenced_type: "type-42"
+    referenced_type: "type-25"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "List<int>::_Node *"
-    self_type: "type-43"
+    linker_set_key: "_ZTIP8CPPHello"
+    self_type: "type-28"
  }
 }
 pointer_types {
@@ -594,7 +524,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-45"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "StackNode<int> *"
+    linker_set_key: "_ZTIP9StackNodeIiE"
    self_type: "type-46"
  }
 }
@@ -605,7 +535,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-39"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const List<float>::_Node *"
+    linker_set_key: "_ZTIPKN4ListIfE5_NodeE"
    self_type: "type-40"
  }
 }
@@ -616,10 +546,43 @@ pointer_types {
    alignment: 8
    referenced_type: "type-47"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const char *"
+    linker_set_key: "_ZTIPKc"
    self_type: "type-48"
  }
 }
+pointer_types {
+  type_info {
+    name: "List<float>::_Node *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-35"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTIPN4ListIfE5_NodeE"
+    self_type: "type-36"
+  }
+}
+pointer_types {
+  type_info {
+    name: "List<int>::_Node *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-42"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
+    linker_set_key: "_ZTIPN4ListIiE5_NodeE"
+    self_type: "type-43"
+  }
+}
+pointer_types {
+  type_info {
+    name: "test2::HelloAgain *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIPN5test210HelloAgainE"
+    self_type: "type-7"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -627,7 +590,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-33"
  }
 }
@@ -638,21 +601,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "int *"
+    linker_set_key: "_ZTIPi"
    self_type: "type-31"
  }
 }
-pointer_types {
-  type_info {
-    name: "test2::HelloAgain *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain *"
-    self_type: "type-7"
-  }
-}
 lvalue_reference_types {
  type_info {
    name: "const float &"
@@ -660,7 +612,7 @@ lvalue_reference_types {
    alignment: 8
    referenced_type: "type-27"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const float &"
+    linker_set_key: "_ZTIRKf"
    self_type: "type-37"
  }
 }
@@ -671,7 +623,7 @@ lvalue_reference_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "float &"
+    linker_set_key: "_ZTIRf"
    self_type: "type-38"
  }
 }
@@ -682,7 +634,7 @@ lvalue_reference_types {
    alignment: 8
    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "int &"
+    linker_set_key: "_ZTIRi"
    self_type: "type-30"
  }
 }
@@ -693,7 +645,7 @@ builtin_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: ""
-    linker_set_key: "bool"
+    linker_set_key: "_ZTIb"
    self_type: "type-12"
  }
  is_unsigned: true
@@ -706,7 +658,7 @@ builtin_types {
    alignment: 1
    referenced_type: "type-49"
    source_file: ""
-    linker_set_key: "char"
+    linker_set_key: "_ZTIc"
    self_type: "type-49"
  }
  is_unsigned: false
@@ -719,7 +671,7 @@ builtin_types {
    alignment: 8
    referenced_type: "type-14"
    source_file: ""
-    linker_set_key: "double"
+    linker_set_key: "_ZTId"
    self_type: "type-14"
  }
  is_unsigned: false
@@ -732,7 +684,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -745,7 +697,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -758,7 +710,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -771,7 +723,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-6"
  }
  is_unsigned: false
@@ -784,7 +736,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-22"
    source_file: ""
-    linker_set_key: "wchar_t"
+    linker_set_key: "_ZTIw"
    self_type: "type-22"
  }
  is_unsigned: false
@@ -797,7 +749,7 @@ qualified_types {
    alignment: 1
    referenced_type: "type-10"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool const[2]"
+    linker_set_key: "_ZTIA2_Kb"
    self_type: "type-11"
  }
  is_const: true
@@ -811,7 +763,7 @@ qualified_types {
    alignment: 8
    referenced_type: "type-25"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const CPPHello"
+    linker_set_key: "_ZTIK8CPPHello"
    self_type: "type-32"
  }
  is_const: true
@@ -825,7 +777,7 @@ qualified_types {
    alignment: 8
    referenced_type: "type-35"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const List<float>::_Node"
+    linker_set_key: "_ZTIKN4ListIfE5_NodeE"
    self_type: "type-39"
  }
  is_const: true
@@ -839,7 +791,7 @@ qualified_types {
    alignment: 1
    referenced_type: "type-49"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const char"
+    linker_set_key: "_ZTIKc"
    self_type: "type-47"
  }
  is_const: true
@@ -853,7 +805,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const float"
+    linker_set_key: "_ZTIKf"
    self_type: "type-27"
  }
  is_const: true
@@ -867,7 +819,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/input/example1.h"
-    linker_set_key: "const int"
+    linker_set_key: "_ZTIKi"
    self_type: "type-26"
  }
  is_const: true
@@ -881,7 +833,7 @@ array_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool [2]"
+    linker_set_key: "_ZTIA2_b"
    self_type: "type-10"
  }
 }
--- a/vndk/tools/header-checker/tests/expected/example2.h
+++ b/vndk/tools/header-checker/tests/expected/example2.h
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
-    linker_set_key: "HiddenBase"
+    linker_set_key: "_ZTI10HiddenBase"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10HiddenBase"
-  }
 }
 record_types {
  type_info {
@@ -33,7 +30,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain"
+    linker_set_key: "_ZTIN5test210HelloAgainE"
    self_type: "type-4"
  }
  fields {
@@ -82,9 +79,44 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test210HelloAgainE"
+}
+record_types {
+  type_info {
+    name: "test3::Outer::Inner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-20"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35Outer5InnerE"
+    self_type: "type-20"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "b"
+    access: private_access
+  }
+  access: private_access
+  record_kind: class_kind
+}
+record_types {
+  type_info {
+    name: "test3::Outer"
+    size: 4
+    alignment: 4
+    referenced_type: "type-19"
+    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
+    linker_set_key: "_ZTIN5test35OuterE"
+    self_type: "type-19"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  access: public_access
+  record_kind: class_kind
 }
 record_types {
  type_info {
@@ -93,7 +125,7 @@ record_types {
    alignment: 8
    referenced_type: "type-13"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<double>"
+    linker_set_key: "_ZTIN5test38ByeAgainIdEE"
    self_type: "type-13"
  }
  fields {
@@ -115,9 +147,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIdEE"
-  }
 }
 record_types {
  type_info {
@@ -126,7 +155,7 @@ record_types {
    alignment: 4
    referenced_type: "type-16"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<float>"
+    linker_set_key: "_ZTIN5test38ByeAgainIfEE"
    self_type: "type-16"
  }
  fields {
@@ -148,53 +177,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTSN5test38ByeAgainIfEE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer"
-    size: 4
-    alignment: 4
-    referenced_type: "type-19"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer"
-    self_type: "type-19"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35OuterE"
-  }
-}
-record_types {
-  type_info {
-    name: "test3::Outer::Inner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-20"
-    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Outer::Inner"
-    self_type: "type-20"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "b"
-    access: private_access
-  }
-  access: private_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTSN5test35Outer5InnerE"
-  }
 }
 enum_types {
  type_info {
@@ -203,7 +185,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "Foo_s"
+    linker_set_key: "_ZTI5Foo_s"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +198,6 @@ enum_types {
    name: "foosbat"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTS5Foo_s"
-  }
 }
 enum_types {
  type_info {
@@ -227,7 +206,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-18"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::Kind"
+    linker_set_key: "_ZTIN5test34KindE"
    self_type: "type-18"
  }
  underlying_type: "type-9"
@@ -240,9 +219,6 @@ enum_types {
    name: "test3::kind2"
  }
  access: public_access
-  tag_info {
-    unique_id: "_ZTSN5test34KindE"
-  }
 }
 pointer_types {
  type_info {
@@ -251,7 +227,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test2::HelloAgain *"
+    linker_set_key: "_ZTIPN5test210HelloAgainE"
    self_type: "type-6"
  }
 }
@@ -262,7 +238,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-13"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<double> *"
+    linker_set_key: "_ZTIPN5test38ByeAgainIdEE"
    self_type: "type-15"
  }
 }
@@ -273,7 +249,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-16"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "test3::ByeAgain<float> *"
+    linker_set_key: "_ZTIPN5test38ByeAgainIfEE"
    self_type: "type-17"
  }
 }
@@ -284,7 +260,7 @@ builtin_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: ""
-    linker_set_key: "bool"
+    linker_set_key: "_ZTIb"
    self_type: "type-12"
  }
  is_unsigned: true
@@ -297,7 +273,7 @@ builtin_types {
    alignment: 8
    referenced_type: "type-14"
    source_file: ""
-    linker_set_key: "double"
+    linker_set_key: "_ZTId"
    self_type: "type-14"
  }
  is_unsigned: false
@@ -310,7 +286,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -323,7 +299,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -336,7 +312,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -349,7 +325,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -362,7 +338,7 @@ qualified_types {
    alignment: 1
    referenced_type: "type-10"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool const[2]"
+    linker_set_key: "_ZTIA2_Kb"
    self_type: "type-11"
  }
  is_const: true
@@ -376,7 +352,7 @@ array_types {
    alignment: 1
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/input/example2.h"
-    linker_set_key: "bool [2]"
+    linker_set_key: "_ZTIA2_b"
    self_type: "type-10"
  }
 }
--- a/vndk/tools/header-checker/tests/expected/example3.h
+++ b/vndk/tools/header-checker/tests/expected/example3.h
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/input/example3.h"
-    linker_set_key: "HiddenBase"
+    linker_set_key: "_ZTI10HiddenBase"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10HiddenBase"
-  }
 }
 builtin_types {
  type_info {
@@ -33,7 +30,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -46,7 +43,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/known_issues.h.sdump
@@ -5,7 +5,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-1",
   "self_type" : "type-1",
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,25 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
+}
+record_types {
+  type_info {
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-7"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-7"
  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
 record_types {
  type_info {
@@ -33,7 +49,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
+    linker_set_key: "_ZTI7Cstruct"
    self_type: "type-5"
  }
  fields {
@@ -50,31 +66,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-7"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-7"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 pointer_types {
  type_info {
@@ -83,43 +74,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
+    linker_set_key: "_ZTIP3Foo"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "int *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-3"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-2"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 4
-    alignment: 4
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-8"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-4"
-  }
-}
 pointer_types {
  type_info {
    name: "Cinner *"
@@ -127,10 +85,43 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-6"
  }
 }
+pointer_types {
+  type_info {
+    name: "Cstruct *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-4"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 4
+    alignment: 4
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-8"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-2"
+  }
+}
 builtin_types {
  type_info {
    name: "int"
@@ -138,7 +129,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -151,7 +142,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-9"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libc_and_cpp_with_unused_struct.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "UnusedStruct"
+    linker_set_key: "_ZTI12UnusedStruct"
    self_type: "type-1"
  }
  fields {
@@ -16,59 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS12UnusedStruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cstruct"
-    size: 8
-    alignment: 4
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
-    self_type: "type-4"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-5"
-    field_offset: 32
-    field_name: "b"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-6"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 record_types {
  type_info {
@@ -77,7 +24,7 @@ record_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-8"
  }
  fields {
@@ -94,41 +41,60 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
-  }
 }
-pointer_types {
+record_types {
  type_info {
-    name: "int *"
+    name: "Cinner"
    size: 4
    alignment: 4
-    referenced_type: "type-2"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-9"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 4
-    alignment: 4
-    referenced_type: "type-3"
+    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-7"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-6"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
-pointer_types {
+record_types {
  type_info {
-    name: "Cstruct *"
-    size: 4
+    name: "Cstruct"
+    size: 8
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-3"
+    linker_set_key: "_ZTI7Cstruct"
+    self_type: "type-4"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-5"
+    field_offset: 32
+    field_name: "b"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
+pointer_types {
+  type_info {
+    name: "Foo *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-8"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIP3Foo"
+    self_type: "type-11"
  }
 }
 pointer_types {
@@ -138,19 +104,41 @@ pointer_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-5"
  }
 }
 pointer_types {
  type_info {
-    name: "Foo *"
+    name: "Cstruct *"
    size: 4
    alignment: 4
-    referenced_type: "type-8"
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-3"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 4
+    alignment: 4
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-7"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
-    self_type: "type-11"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-9"
  }
 }
 builtin_types {
@@ -160,7 +148,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -173,7 +161,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_function_sybmol_only.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_add_global_variable.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_function_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_change_member_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-2"
@@ -212,9 +203,6 @@ enum_types {
    name: "SuperSpeaker::Loudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -223,21 +211,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -245,10 +222,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -256,7 +244,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -267,7 +255,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -280,7 +268,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -293,7 +281,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -306,7 +294,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_enum_extended.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -220,9 +211,6 @@ enum_types {
    name: "SuperSpeaker::LouderThanLoudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -231,10 +219,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -242,7 +241,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -253,21 +252,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -275,7 +263,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -288,7 +276,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -301,7 +289,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -314,7 +302,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_inheritance_type_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -244,9 +182,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -255,7 +246,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -276,9 +267,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -287,10 +275,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -298,7 +297,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -309,21 +308,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -331,7 +319,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -344,7 +332,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -357,7 +345,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -370,7 +358,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_json.so.lsdump
@@ -4,7 +4,7 @@
 [
  {
   "alignment" : 4,
-   "linker_set_key" : "float",
+   "linker_set_key" : "_ZTIf",
   "name" : "float",
   "referenced_type" : "type-3",
   "self_type" : "type-3",
@@ -13,7 +13,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
@@ -23,14 +23,14 @@
   "alignment" : 4,
   "is_integral" : true,
   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
+   "linker_set_key" : "_ZTIj",
   "name" : "unsigned int",
   "referenced_type" : "type-6",
   "self_type" : "type-6",
   "size" : 4
  },
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-10",
   "self_type" : "type-10"
@@ -102,14 +102,13 @@
     "name" : "SuperSpeaker::Lower"
    }
   ],
-   "linker_set_key" : "SuperSpeaker::Volume",
+   "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE",
   "name" : "SuperSpeaker::Volume",
   "referenced_type" : "type-8",
   "self_type" : "type-8",
   "size" : 4,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "underlying_type" : "type-6",
-   "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
+   "underlying_type" : "type-6"
  }
 ],
 "function_types" : [],
@@ -228,25 +227,7 @@
 [
  {
   "alignment" : 4,
-   "linker_set_key" : "HighVolumeSpeaker *",
-   "name" : "HighVolumeSpeaker *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "LowVolumeSpeaker *",
-   "name" : "LowVolumeSpeaker *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 4,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "SuperSpeaker *",
+   "linker_set_key" : "_ZTIP12SuperSpeaker",
   "name" : "SuperSpeaker *",
   "referenced_type" : "type-1",
   "self_type" : "type-9",
@@ -255,7 +236,25 @@
  },
  {
   "alignment" : 4,
-   "linker_set_key" : "float *",
+   "linker_set_key" : "_ZTIP16LowVolumeSpeaker",
+   "name" : "LowVolumeSpeaker *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 4,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker *",
+   "referenced_type" : "type-11",
+   "self_type" : "type-12",
+   "size" : 4,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPf",
   "name" : "float *",
   "referenced_type" : "type-3",
   "self_type" : "type-7",
@@ -268,20 +267,22 @@
 [
  {
   "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
   [
    {
-     "referenced_type" : "type-1"
+     "access" : "private",
+     "field_name" : "mSpeakderId",
+     "field_offset" : 32,
+     "referenced_type" : "type-2"
    }
   ],
-   "linker_set_key" : "HighVolumeSpeaker",
-   "name" : "HighVolumeSpeaker",
+   "linker_set_key" : "_ZTI12SuperSpeaker",
+   "name" : "SuperSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
-   "unique_id" : "_ZTS17HighVolumeSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
   "vtable_components" :
   [
    {
@@ -289,21 +290,23 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
+     "mangled_component_name" : "_ZTI12SuperSpeaker"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
    }
   ]
  },
@@ -328,14 +331,13 @@
     "referenced_type" : "type-7"
    }
   ],
-   "linker_set_key" : "LowVolumeSpeaker",
+   "linker_set_key" : "_ZTI16LowVolumeSpeaker",
   "name" : "LowVolumeSpeaker",
   "record_kind" : "class",
   "referenced_type" : "type-5",
   "self_type" : "type-5",
   "size" : 16,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
-   "unique_id" : "_ZTS16LowVolumeSpeaker",
   "vtable_components" :
   [
    {
@@ -363,23 +365,19 @@
  },
  {
   "alignment" : 4,
-   "fields" :
+   "base_specifiers" :
   [
    {
-     "access" : "private",
-     "field_name" : "mSpeakderId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1"
    }
   ],
-   "linker_set_key" : "SuperSpeaker",
-   "name" : "SuperSpeaker",
+   "linker_set_key" : "_ZTI17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "unique_id" : "_ZTS12SuperSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
   "vtable_components" :
   [
    {
@@ -387,23 +385,21 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI12SuperSpeaker"
+     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
    }
   ]
  }
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_cv_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-9"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "const float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float *"
+    linker_set_key: "_ZTIPKf"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
@@ -323,7 +311,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float"
+    linker_set_key: "_ZTIKf"
    self_type: "type-8"
  }
  is_const: true
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "long long *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "long long *"
+    linker_set_key: "_ZTIPx"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,25 +272,12 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
  is_integral: true
 }
-builtin_types {
-  type_info {
-    name: "long long"
-    size: 8
-    alignment: 8
-    referenced_type: "type-6"
-    source_file: ""
-    linker_set_key: "long long"
-    self_type: "type-6"
-  }
-  is_unsigned: false
-  is_integral: true
-}
 builtin_types {
  type_info {
    name: "unsigned int"
@@ -310,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,12 +298,25 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
  is_integral: false
 }
+builtin_types {
+  type_info {
+    name: "long long"
+    size: 8
+    alignment: 8
+    referenced_type: "type-6"
+    source_file: ""
+    linker_set_key: "_ZTIx"
+    self_type: "type-6"
+  }
+  is_unsigned: false
+  is_integral: true
+}
 functions {
  return_type: "type-11"
  function_name: "SuperSpeaker::SpeakLouder"
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_fake_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-6"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-6"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-5"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-13"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-4"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-5"
-  }
-}
 builtin_types {
  type_info {
    name: "char32_t"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "char32_t"
+    linker_set_key: "_ZTIDi"
    self_type: "type-7"
  }
  is_unsigned: true
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,7 +311,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_integral_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-7"
  }
  underlying_type: "type-8"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-8"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_member_name_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_parameter_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-5"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_return_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libgolden_cpp_vtable_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libpure_virtual_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar"
+    linker_set_key: "_ZTI10DerivedBar"
    self_type: "type-4"
  }
  base_specifiers {
@@ -53,9 +53,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10DerivedBar"
-  }
 }
 record_types {
  type_info {
@@ -64,7 +61,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase"
+    linker_set_key: "_ZTI15PureVirtualBase"
    self_type: "type-1"
  }
  vtable_layout {
@@ -107,9 +104,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS15PureVirtualBase"
-  }
 }
 pointer_types {
  type_info {
@@ -118,7 +112,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar *"
+    linker_set_key: "_ZTIP10DerivedBar"
    self_type: "type-5"
  }
 }
@@ -129,7 +123,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase *"
+    linker_set_key: "_ZTIP15PureVirtualBase"
    self_type: "type-3"
  }
 }
@@ -140,7 +134,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/libreproducability.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h"
-    linker_set_key: "ShouldRepro"
+    linker_set_key: "_ZTI11ShouldRepro"
    self_type: "type-1"
  }
  fields {
@@ -16,9 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "ShouldRepro"
-  }
 }
 builtin_types {
  type_info {
@@ -27,7 +24,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm/undeclared_types.h.sdump
@@ -68,7 +68,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "namespace_a::A &",
+   "linker_set_key" : "_ZTIRN11namespace_a1AE",
   "name" : "namespace_a::A &",
   "referenced_type" : "type-1",
   "self_type" : "type-4",
@@ -80,7 +80,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "InvalidClass *",
+   "linker_set_key" : "_ZTIP12InvalidClass",
   "name" : "InvalidClass *",
   "referenced_type" : "type-7",
   "self_type" : "type-8",
@@ -89,7 +89,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "TemplateInMacro<F> *",
+   "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE",
   "name" : "TemplateInMacro<F> *",
   "referenced_type" : "type-10",
   "self_type" : "type-11",
@@ -101,7 +101,7 @@
 [
  {
   "is_const" : true,
-   "linker_set_key" : "const namespace_b::template_b<const B *>",
+   "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE",
   "name" : "const namespace_b::template_b<const B *>",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/known_issues.h.sdump
@@ -5,7 +5,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-1",
   "self_type" : "type-1",
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,25 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
+}
+record_types {
+  type_info {
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-7"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-7"
  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
 record_types {
  type_info {
@@ -33,7 +49,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
+    linker_set_key: "_ZTI7Cstruct"
    self_type: "type-5"
  }
  fields {
@@ -50,31 +66,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-7"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-7"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 pointer_types {
  type_info {
@@ -83,43 +74,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
+    linker_set_key: "_ZTIP3Foo"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "int *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-3"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-2"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 8
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-8"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-4"
-  }
-}
 pointer_types {
  type_info {
    name: "Cinner *"
@@ -127,10 +85,43 @@ pointer_types {
    alignment: 8
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-6"
  }
 }
+pointer_types {
+  type_info {
+    name: "Cstruct *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-4"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 8
+    alignment: 8
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-8"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-2"
+  }
+}
 builtin_types {
  type_info {
    name: "int"
@@ -138,7 +129,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -151,7 +142,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-9"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libc_and_cpp_with_unused_struct.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "UnusedStruct"
+    linker_set_key: "_ZTI12UnusedStruct"
    self_type: "type-1"
  }
  fields {
@@ -16,59 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS12UnusedStruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cstruct"
-    size: 16
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
-    self_type: "type-4"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-5"
-    field_offset: 64
-    field_name: "b"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-6"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 record_types {
  type_info {
@@ -77,7 +24,7 @@ record_types {
    alignment: 8
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-8"
  }
  fields {
@@ -94,41 +41,60 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
-  }
 }
-pointer_types {
+record_types {
  type_info {
-    name: "int *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-2"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-9"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 8
-    alignment: 8
-    referenced_type: "type-3"
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-7"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-6"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
-pointer_types {
+record_types {
  type_info {
-    name: "Cstruct *"
-    size: 8
+    name: "Cstruct"
+    size: 16
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-3"
+    linker_set_key: "_ZTI7Cstruct"
+    self_type: "type-4"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-5"
+    field_offset: 64
+    field_name: "b"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
+pointer_types {
+  type_info {
+    name: "Foo *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-8"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIP3Foo"
+    self_type: "type-11"
  }
 }
 pointer_types {
@@ -138,19 +104,41 @@ pointer_types {
    alignment: 8
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-5"
  }
 }
 pointer_types {
  type_info {
-    name: "Foo *"
+    name: "Cstruct *"
    size: 8
    alignment: 8
-    referenced_type: "type-8"
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-3"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 8
+    alignment: 8
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-7"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
-    self_type: "type-11"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-9"
  }
 }
 builtin_types {
@@ -160,7 +148,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -173,7 +161,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_function_sybmol_only.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_add_global_variable.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_function_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_change_member_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-2"
@@ -212,9 +203,6 @@ enum_types {
    name: "SuperSpeaker::Loudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -223,21 +211,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -245,10 +222,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -256,7 +244,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -267,7 +255,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -280,7 +268,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -293,7 +281,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -306,7 +294,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_enum_extended.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -220,9 +211,6 @@ enum_types {
    name: "SuperSpeaker::LouderThanLoudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -231,10 +219,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -242,7 +241,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -253,21 +252,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -275,7 +263,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -288,7 +276,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -301,7 +289,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -314,7 +302,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_inheritance_type_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -244,9 +182,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -255,7 +246,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -276,9 +267,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -287,10 +275,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -298,7 +297,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -309,21 +308,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -331,7 +319,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -344,7 +332,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -357,7 +345,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -370,7 +358,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_json.so.lsdump
@@ -4,7 +4,7 @@
 [
  {
   "alignment" : 4,
-   "linker_set_key" : "float",
+   "linker_set_key" : "_ZTIf",
   "name" : "float",
   "referenced_type" : "type-3",
   "self_type" : "type-3",
@@ -13,7 +13,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
@@ -23,14 +23,14 @@
   "alignment" : 4,
   "is_integral" : true,
   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
+   "linker_set_key" : "_ZTIj",
   "name" : "unsigned int",
   "referenced_type" : "type-6",
   "self_type" : "type-6",
   "size" : 4
  },
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-10",
   "self_type" : "type-10"
@@ -102,14 +102,13 @@
     "name" : "SuperSpeaker::Lower"
    }
   ],
-   "linker_set_key" : "SuperSpeaker::Volume",
+   "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE",
   "name" : "SuperSpeaker::Volume",
   "referenced_type" : "type-8",
   "self_type" : "type-8",
   "size" : 4,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "underlying_type" : "type-6",
-   "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
+   "underlying_type" : "type-6"
  }
 ],
 "function_types" : [],
@@ -228,25 +227,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "HighVolumeSpeaker *",
-   "name" : "HighVolumeSpeaker *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-12",
-   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "LowVolumeSpeaker *",
-   "name" : "LowVolumeSpeaker *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "SuperSpeaker *",
+   "linker_set_key" : "_ZTIP12SuperSpeaker",
   "name" : "SuperSpeaker *",
   "referenced_type" : "type-1",
   "self_type" : "type-9",
@@ -255,7 +236,25 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "float *",
+   "linker_set_key" : "_ZTIP16LowVolumeSpeaker",
+   "name" : "LowVolumeSpeaker *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 8,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIP17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker *",
+   "referenced_type" : "type-11",
+   "self_type" : "type-12",
+   "size" : 8,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "_ZTIPf",
   "name" : "float *",
   "referenced_type" : "type-3",
   "self_type" : "type-7",
@@ -268,20 +267,22 @@
 [
  {
   "alignment" : 8,
-   "base_specifiers" :
+   "fields" :
   [
    {
-     "referenced_type" : "type-1"
+     "access" : "private",
+     "field_name" : "mSpeakderId",
+     "field_offset" : 64,
+     "referenced_type" : "type-2"
    }
   ],
-   "linker_set_key" : "HighVolumeSpeaker",
-   "name" : "HighVolumeSpeaker",
+   "linker_set_key" : "_ZTI12SuperSpeaker",
+   "name" : "SuperSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
   "size" : 16,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
-   "unique_id" : "_ZTS17HighVolumeSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
   "vtable_components" :
   [
    {
@@ -289,21 +290,23 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
+     "mangled_component_name" : "_ZTI12SuperSpeaker"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
    }
   ]
  },
@@ -328,14 +331,13 @@
     "referenced_type" : "type-7"
    }
   ],
-   "linker_set_key" : "LowVolumeSpeaker",
+   "linker_set_key" : "_ZTI16LowVolumeSpeaker",
   "name" : "LowVolumeSpeaker",
   "record_kind" : "class",
   "referenced_type" : "type-5",
   "self_type" : "type-5",
   "size" : 24,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
-   "unique_id" : "_ZTS16LowVolumeSpeaker",
   "vtable_components" :
   [
    {
@@ -363,23 +365,19 @@
  },
  {
   "alignment" : 8,
-   "fields" :
+   "base_specifiers" :
   [
    {
-     "access" : "private",
-     "field_name" : "mSpeakderId",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1"
    }
   ],
-   "linker_set_key" : "SuperSpeaker",
-   "name" : "SuperSpeaker",
+   "linker_set_key" : "_ZTI17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
   "size" : 16,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "unique_id" : "_ZTS12SuperSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
   "vtable_components" :
   [
    {
@@ -387,23 +385,21 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI12SuperSpeaker"
+     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
    }
   ]
  }
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_cv_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-9"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "const float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float *"
+    linker_set_key: "_ZTIPKf"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
@@ -323,7 +311,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float"
+    linker_set_key: "_ZTIKf"
    self_type: "type-8"
  }
  is_const: true
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "long long *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "long long *"
+    linker_set_key: "_ZTIPx"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,25 +272,12 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
  is_integral: true
 }
-builtin_types {
-  type_info {
-    name: "long long"
-    size: 8
-    alignment: 8
-    referenced_type: "type-6"
-    source_file: ""
-    linker_set_key: "long long"
-    self_type: "type-6"
-  }
-  is_unsigned: false
-  is_integral: true
-}
 builtin_types {
  type_info {
    name: "unsigned int"
@@ -310,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,12 +298,25 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
  is_integral: false
 }
+builtin_types {
+  type_info {
+    name: "long long"
+    size: 8
+    alignment: 8
+    referenced_type: "type-6"
+    source_file: ""
+    linker_set_key: "_ZTIx"
+    self_type: "type-6"
+  }
+  is_unsigned: false
+  is_integral: true
+}
 functions {
  return_type: "type-11"
  function_name: "SuperSpeaker::SpeakLouder"
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_fake_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-6"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-6"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-5"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-13"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-4"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-5"
-  }
-}
 builtin_types {
  type_info {
    name: "char32_t"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "char32_t"
+    linker_set_key: "_ZTIDi"
    self_type: "type-7"
  }
  is_unsigned: true
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,7 +311,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_integral_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-7"
  }
  underlying_type: "type-8"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-8"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_member_name_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_parameter_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-5"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_return_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_cpp_vtable_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 16
-    alignment: 8
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 16
+    alignment: 8
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libpure_virtual_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar"
+    linker_set_key: "_ZTI10DerivedBar"
    self_type: "type-4"
  }
  base_specifiers {
@@ -53,9 +53,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10DerivedBar"
-  }
 }
 record_types {
  type_info {
@@ -64,7 +61,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase"
+    linker_set_key: "_ZTI15PureVirtualBase"
    self_type: "type-1"
  }
  vtable_layout {
@@ -107,9 +104,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS15PureVirtualBase"
-  }
 }
 pointer_types {
  type_info {
@@ -118,7 +112,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar *"
+    linker_set_key: "_ZTIP10DerivedBar"
    self_type: "type-5"
  }
 }
@@ -129,7 +123,7 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase *"
+    linker_set_key: "_ZTIP15PureVirtualBase"
    self_type: "type-3"
  }
 }
@@ -140,7 +134,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libreproducability.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h"
-    linker_set_key: "ShouldRepro"
+    linker_set_key: "_ZTI11ShouldRepro"
    self_type: "type-1"
  }
  fields {
@@ -16,9 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "ShouldRepro"
-  }
 }
 builtin_types {
  type_info {
@@ -27,7 +24,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example.so.lsdump
@@ -3,7 +3,7 @@
 "builtin_types" :
 [
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-1",
   "self_type" : "type-1"
@@ -74,7 +74,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "Test3 *",
+   "linker_set_key" : "_ZTIP5Test3",
   "name" : "Test3 *",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
@@ -83,7 +83,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "Test4 *",
+   "linker_set_key" : "_ZTIP5Test4",
   "name" : "Test4 *",
   "referenced_type" : "type-4",
   "self_type" : "type-5",
@@ -96,25 +96,23 @@
 [
  {
   "alignment" : 1,
-   "linker_set_key" : "Test3",
+   "linker_set_key" : "_ZTI5Test3",
   "name" : "Test3",
   "record_kind" : "class",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test3"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  },
  {
   "alignment" : 1,
-   "linker_set_key" : "Test4",
+   "linker_set_key" : "_ZTI5Test4",
   "name" : "Test4",
   "record_kind" : "class",
   "referenced_type" : "type-4",
   "self_type" : "type-4",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test4"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  }
 ],
 "rvalue_reference_types" : []
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_mytag.so.lsdump
@@ -3,7 +3,7 @@
 "builtin_types" :
 [
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-1",
   "self_type" : "type-1"
@@ -49,7 +49,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "Test3 *",
+   "linker_set_key" : "_ZTIP5Test3",
   "name" : "Test3 *",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
@@ -58,7 +58,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "Test4 *",
+   "linker_set_key" : "_ZTIP5Test4",
   "name" : "Test4 *",
   "referenced_type" : "type-4",
   "self_type" : "type-5",
@@ -71,25 +71,23 @@
 [
  {
   "alignment" : 1,
-   "linker_set_key" : "Test3",
+   "linker_set_key" : "_ZTI5Test3",
   "name" : "Test3",
   "record_kind" : "class",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test3"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  },
  {
   "alignment" : 1,
-   "linker_set_key" : "Test4",
+   "linker_set_key" : "_ZTI5Test4",
   "name" : "Test4",
   "record_kind" : "class",
   "referenced_type" : "type-4",
   "self_type" : "type-4",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test4"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  }
 ],
 "rvalue_reference_types" : []
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libversion_script_example_no_private.so.lsdump
@@ -3,7 +3,7 @@
 "builtin_types" :
 [
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-1",
   "self_type" : "type-1"
@@ -49,7 +49,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "Test3 *",
+   "linker_set_key" : "_ZTIP5Test3",
   "name" : "Test3 *",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
@@ -58,7 +58,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "Test4 *",
+   "linker_set_key" : "_ZTIP5Test4",
   "name" : "Test4 *",
   "referenced_type" : "type-4",
   "self_type" : "type-5",
@@ -71,25 +71,23 @@
 [
  {
   "alignment" : 1,
-   "linker_set_key" : "Test3",
+   "linker_set_key" : "_ZTI5Test3",
   "name" : "Test3",
   "record_kind" : "class",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test3"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  },
  {
   "alignment" : 1,
-   "linker_set_key" : "Test4",
+   "linker_set_key" : "_ZTI5Test4",
   "name" : "Test4",
   "record_kind" : "class",
   "referenced_type" : "type-4",
   "self_type" : "type-4",
   "size" : 1,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h",
-   "unique_id" : "_ZTS5Test4"
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/version_script_example/example.h"
  }
 ],
 "rvalue_reference_types" : []
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/undeclared_types.h.sdump
@@ -68,7 +68,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "namespace_a::A &",
+   "linker_set_key" : "_ZTIRN11namespace_a1AE",
   "name" : "namespace_a::A &",
   "referenced_type" : "type-1",
   "self_type" : "type-4",
@@ -80,7 +80,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "InvalidClass *",
+   "linker_set_key" : "_ZTIP12InvalidClass",
   "name" : "InvalidClass *",
   "referenced_type" : "type-7",
   "self_type" : "type-8",
@@ -89,7 +89,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "TemplateInMacro<F> *",
+   "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE",
   "name" : "TemplateInMacro<F> *",
   "referenced_type" : "type-10",
   "self_type" : "type-11",
@@ -101,7 +101,7 @@
 [
  {
   "is_const" : true,
-   "linker_set_key" : "const namespace_b::template_b<const B *>",
+   "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE",
   "name" : "const namespace_b::template_b<const B *>",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/known_issues.h.sdump
@@ -5,7 +5,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-1",
   "self_type" : "type-1",
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,25 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
+}
+record_types {
+  type_info {
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-7"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-7"
  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
 record_types {
  type_info {
@@ -33,7 +49,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
+    linker_set_key: "_ZTI7Cstruct"
    self_type: "type-5"
  }
  fields {
@@ -50,31 +66,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-7"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-7"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 pointer_types {
  type_info {
@@ -83,43 +74,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
+    linker_set_key: "_ZTIP3Foo"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "int *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-3"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-2"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 4
-    alignment: 4
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-8"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-4"
-  }
-}
 pointer_types {
  type_info {
    name: "Cinner *"
@@ -127,10 +85,43 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-6"
  }
 }
+pointer_types {
+  type_info {
+    name: "Cstruct *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-4"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 4
+    alignment: 4
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-8"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-2"
+  }
+}
 builtin_types {
  type_info {
    name: "int"
@@ -138,7 +129,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -151,7 +142,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-9"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libc_and_cpp_with_unused_struct.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "UnusedStruct"
+    linker_set_key: "_ZTI12UnusedStruct"
    self_type: "type-1"
  }
  fields {
@@ -16,59 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS12UnusedStruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cstruct"
-    size: 8
-    alignment: 4
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
-    self_type: "type-4"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-5"
-    field_offset: 32
-    field_name: "b"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-6"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 record_types {
  type_info {
@@ -77,7 +24,7 @@ record_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-8"
  }
  fields {
@@ -94,41 +41,60 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
-  }
 }
-pointer_types {
+record_types {
  type_info {
-    name: "int *"
+    name: "Cinner"
    size: 4
    alignment: 4
-    referenced_type: "type-2"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-9"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 4
-    alignment: 4
-    referenced_type: "type-3"
+    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-7"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-6"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
-pointer_types {
+record_types {
  type_info {
-    name: "Cstruct *"
-    size: 4
+    name: "Cstruct"
+    size: 8
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-3"
+    linker_set_key: "_ZTI7Cstruct"
+    self_type: "type-4"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-5"
+    field_offset: 32
+    field_name: "b"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
+pointer_types {
+  type_info {
+    name: "Foo *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-8"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIP3Foo"
+    self_type: "type-11"
  }
 }
 pointer_types {
@@ -138,19 +104,41 @@ pointer_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-5"
  }
 }
 pointer_types {
  type_info {
-    name: "Foo *"
+    name: "Cstruct *"
    size: 4
    alignment: 4
-    referenced_type: "type-8"
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-3"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 4
+    alignment: 4
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-7"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
-    self_type: "type-11"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-9"
  }
 }
 builtin_types {
@@ -160,7 +148,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -173,7 +161,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_function_sybmol_only.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_add_global_variable.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_function_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_change_member_access.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-2"
@@ -212,9 +203,6 @@ enum_types {
    name: "SuperSpeaker::Loudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -223,21 +211,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -245,10 +222,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -256,7 +244,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -267,7 +255,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -280,7 +268,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -293,7 +281,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -306,7 +294,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_enum_extended.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -220,9 +211,6 @@ enum_types {
    name: "SuperSpeaker::LouderThanLoudest"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -231,10 +219,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -242,7 +241,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -253,21 +252,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -275,7 +263,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -288,7 +276,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -301,7 +289,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -314,7 +302,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_inheritance_type_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -244,9 +182,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -255,7 +246,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -276,9 +267,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -287,10 +275,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -298,7 +297,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -309,21 +308,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -331,7 +319,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -344,7 +332,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -357,7 +345,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -370,7 +358,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_json.so.lsdump
@@ -4,7 +4,7 @@
 [
  {
   "alignment" : 4,
-   "linker_set_key" : "float",
+   "linker_set_key" : "_ZTIf",
   "name" : "float",
   "referenced_type" : "type-3",
   "self_type" : "type-3",
@@ -13,7 +13,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-2",
   "self_type" : "type-2",
@@ -23,14 +23,14 @@
   "alignment" : 4,
   "is_integral" : true,
   "is_unsigned" : true,
-   "linker_set_key" : "unsigned int",
+   "linker_set_key" : "_ZTIj",
   "name" : "unsigned int",
   "referenced_type" : "type-6",
   "self_type" : "type-6",
   "size" : 4
  },
  {
-   "linker_set_key" : "void",
+   "linker_set_key" : "_ZTIv",
   "name" : "void",
   "referenced_type" : "type-10",
   "self_type" : "type-10"
@@ -102,14 +102,13 @@
     "name" : "SuperSpeaker::Lower"
    }
   ],
-   "linker_set_key" : "SuperSpeaker::Volume",
+   "linker_set_key" : "_ZTIN12SuperSpeaker6VolumeE",
   "name" : "SuperSpeaker::Volume",
   "referenced_type" : "type-8",
   "self_type" : "type-8",
   "size" : 4,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "underlying_type" : "type-6",
-   "unique_id" : "_ZTSN12SuperSpeaker6VolumeE"
+   "underlying_type" : "type-6"
  }
 ],
 "function_types" : [],
@@ -228,25 +227,7 @@
 [
  {
   "alignment" : 4,
-   "linker_set_key" : "HighVolumeSpeaker *",
-   "name" : "HighVolumeSpeaker *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-12",
-   "size" : 4,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "LowVolumeSpeaker *",
-   "name" : "LowVolumeSpeaker *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 4,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "SuperSpeaker *",
+   "linker_set_key" : "_ZTIP12SuperSpeaker",
   "name" : "SuperSpeaker *",
   "referenced_type" : "type-1",
   "self_type" : "type-9",
@@ -255,7 +236,25 @@
  },
  {
   "alignment" : 4,
-   "linker_set_key" : "float *",
+   "linker_set_key" : "_ZTIP16LowVolumeSpeaker",
+   "name" : "LowVolumeSpeaker *",
+   "referenced_type" : "type-5",
+   "self_type" : "type-4",
+   "size" : 4,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIP17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker *",
+   "referenced_type" : "type-11",
+   "self_type" : "type-12",
+   "size" : 4,
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "_ZTIPf",
   "name" : "float *",
   "referenced_type" : "type-3",
   "self_type" : "type-7",
@@ -268,20 +267,22 @@
 [
  {
   "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
   [
    {
-     "referenced_type" : "type-1"
+     "access" : "private",
+     "field_name" : "mSpeakderId",
+     "field_offset" : 32,
+     "referenced_type" : "type-2"
    }
   ],
-   "linker_set_key" : "HighVolumeSpeaker",
-   "name" : "HighVolumeSpeaker",
+   "linker_set_key" : "_ZTI12SuperSpeaker",
+   "name" : "SuperSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
-   "unique_id" : "_ZTS17HighVolumeSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
   "vtable_components" :
   [
    {
@@ -289,21 +290,23 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
+     "mangled_component_name" : "_ZTI12SuperSpeaker"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
    },
    {
-     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
+     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
    }
   ]
  },
@@ -328,14 +331,13 @@
     "referenced_type" : "type-7"
    }
   ],
-   "linker_set_key" : "LowVolumeSpeaker",
+   "linker_set_key" : "_ZTI16LowVolumeSpeaker",
   "name" : "LowVolumeSpeaker",
   "record_kind" : "class",
   "referenced_type" : "type-5",
   "self_type" : "type-5",
   "size" : 16,
   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h",
-   "unique_id" : "_ZTS16LowVolumeSpeaker",
   "vtable_components" :
   [
    {
@@ -363,23 +365,19 @@
  },
  {
   "alignment" : 4,
-   "fields" :
+   "base_specifiers" :
   [
    {
-     "access" : "private",
-     "field_name" : "mSpeakderId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1"
    }
   ],
-   "linker_set_key" : "SuperSpeaker",
-   "name" : "SuperSpeaker",
+   "linker_set_key" : "_ZTI17HighVolumeSpeaker",
+   "name" : "HighVolumeSpeaker",
   "record_kind" : "class",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
   "size" : 8,
-   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h",
-   "unique_id" : "_ZTS12SuperSpeaker",
+   "source_file" : "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h",
   "vtable_components" :
   [
    {
@@ -387,23 +385,21 @@
    },
    {
     "kind" : "rtti",
-     "mangled_component_name" : "_ZTI12SuperSpeaker"
+     "mangled_component_name" : "_ZTI17HighVolumeSpeaker"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker5SpeakEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker5SpeakEv"
    },
    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN12SuperSpeaker6ListenEv"
+     "mangled_component_name" : "_ZN17HighVolumeSpeaker6ListenEv"
    },
    {
     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD1Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD1Ev"
    },
    {
     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN12SuperSpeakerD0Ev"
+     "mangled_component_name" : "_ZN17HighVolumeSpeakerD0Ev"
    }
   ]
  }
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_cv_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-9"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "const float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float *"
+    linker_set_key: "_ZTIPKf"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
@@ -323,7 +311,7 @@ qualified_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "const float"
+    linker_set_key: "_ZTIKf"
    self_type: "type-8"
  }
  is_const: true
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-13"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-4"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-13"
+  }
+}
 pointer_types {
  type_info {
    name: "long long *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "long long *"
+    linker_set_key: "_ZTIPx"
    self_type: "type-7"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,25 +272,12 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
  is_integral: true
 }
-builtin_types {
-  type_info {
-    name: "long long"
-    size: 8
-    alignment: 8
-    referenced_type: "type-6"
-    source_file: ""
-    linker_set_key: "long long"
-    self_type: "type-6"
-  }
-  is_unsigned: false
-  is_integral: true
-}
 builtin_types {
  type_info {
    name: "unsigned int"
@@ -310,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,12 +298,25 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
  is_integral: false
 }
+builtin_types {
+  type_info {
+    name: "long long"
+    size: 8
+    alignment: 8
+    referenced_type: "type-6"
+    source_file: ""
+    linker_set_key: "_ZTIx"
+    self_type: "type-6"
+  }
+  is_unsigned: false
+  is_integral: true
+}
 functions {
  return_type: "type-11"
  function_name: "SuperSpeaker::SpeakLouder"
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_fake_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-12"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-12"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-6"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-12"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-12"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-9"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-10"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-6"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-5"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-12"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-13"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-4"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-5"
-  }
-}
 builtin_types {
  type_info {
    name: "char32_t"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "char32_t"
+    linker_set_key: "_ZTIDi"
    self_type: "type-7"
  }
  is_unsigned: true
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-9"
  }
  is_unsigned: true
@@ -323,7 +311,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-11"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-11"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_integral_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-7"
  }
  underlying_type: "type-8"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-8"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_member_name_changed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_parameter_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-4"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-5"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,21 +215,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
-pointer_types {
-  type_info {
-    name: "HighVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
-    self_type: "type-12"
-  }
-}
 pointer_types {
  type_info {
    name: "LowVolumeSpeaker *"
@@ -249,10 +226,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
    self_type: "type-3"
  }
 }
+pointer_types {
+  type_info {
+    name: "HighVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
+    self_type: "type-12"
+  }
+}
 pointer_types {
  type_info {
    name: "float *"
@@ -260,7 +248,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-6"
  }
 }
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-7"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-7"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-5"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_return_type_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_unreferenced_elf_symbol_removed.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libgolden_cpp_vtable_diff.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker"
+    linker_set_key: "_ZTI12SuperSpeaker"
    self_type: "type-1"
  }
  fields {
@@ -54,68 +54,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS12SuperSpeaker"
-  }
-}
-record_types {
-  type_info {
-    name: "HighVolumeSpeaker"
-    size: 8
-    alignment: 4
-    referenced_type: "type-11"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker"
-    self_type: "type-11"
-  }
-  base_specifiers {
-    referenced_type: "type-1"
-    is_virtual: false
-    access: public_access
-  }
-  vtable_layout {
-    vtable_components {
-      kind: OffsetToTop
-      mangled_component_name: ""
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: RTTI
-      mangled_component_name: "_ZTI17HighVolumeSpeaker"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: FunctionPointer
-      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: CompleteDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
-      component_value: 0
-      is_pure: false
-    }
-    vtable_components {
-      kind: DeletingDtorPointer
-      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
-      component_value: 0
-      is_pure: false
-    }
-  }
-  access: public_access
-  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS17HighVolumeSpeaker"
-  }
 }
 record_types {
  type_info {
@@ -124,7 +62,7 @@ record_types {
    alignment: 4
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker"
+    linker_set_key: "_ZTI16LowVolumeSpeaker"
    self_type: "type-5"
  }
  fields {
@@ -184,9 +122,62 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS16LowVolumeSpeaker"
+}
+record_types {
+  type_info {
+    name: "HighVolumeSpeaker"
+    size: 8
+    alignment: 4
+    referenced_type: "type-11"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
+    linker_set_key: "_ZTI17HighVolumeSpeaker"
+    self_type: "type-11"
  }
+  base_specifiers {
+    referenced_type: "type-1"
+    is_virtual: false
+    access: public_access
+  }
+  vtable_layout {
+    vtable_components {
+      kind: OffsetToTop
+      mangled_component_name: ""
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: RTTI
+      mangled_component_name: "_ZTI17HighVolumeSpeaker"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker6ListenEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: FunctionPointer
+      mangled_component_name: "_ZN17HighVolumeSpeaker5SpeakEv"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: CompleteDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD1Ev"
+      component_value: 0
+      is_pure: false
+    }
+    vtable_components {
+      kind: DeletingDtorPointer
+      mangled_component_name: "_ZN17HighVolumeSpeakerD0Ev"
+      component_value: 0
+      is_pure: false
+    }
+  }
+  access: public_access
+  record_kind: class_kind
 }
 enum_types {
  type_info {
@@ -195,7 +186,7 @@ enum_types {
    alignment: 4
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker::Volume"
+    linker_set_key: "_ZTIN12SuperSpeaker6VolumeE"
    self_type: "type-8"
  }
  underlying_type: "type-6"
@@ -216,9 +207,6 @@ enum_types {
    name: "SuperSpeaker::Lower"
  }
  access: private_access
-  tag_info {
-    unique_id: "_ZTSN12SuperSpeaker6VolumeE"
-  }
 }
 pointer_types {
  type_info {
@@ -227,10 +215,21 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/abstract_class.h"
-    linker_set_key: "SuperSpeaker *"
+    linker_set_key: "_ZTIP12SuperSpeaker"
    self_type: "type-9"
  }
 }
+pointer_types {
+  type_info {
+    name: "LowVolumeSpeaker *"
+    size: 4
+    alignment: 4
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
+    linker_set_key: "_ZTIP16LowVolumeSpeaker"
+    self_type: "type-4"
+  }
+}
 pointer_types {
  type_info {
    name: "HighVolumeSpeaker *"
@@ -238,7 +237,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-11"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/high_volume_speaker.h"
-    linker_set_key: "HighVolumeSpeaker *"
+    linker_set_key: "_ZTIP17HighVolumeSpeaker"
    self_type: "type-12"
  }
 }
@@ -249,21 +248,10 @@ pointer_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "float *"
+    linker_set_key: "_ZTIPf"
    self_type: "type-7"
  }
 }
-pointer_types {
-  type_info {
-    name: "LowVolumeSpeaker *"
-    size: 4
-    alignment: 4
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/gold/include/low_volume_speaker.h"
-    linker_set_key: "LowVolumeSpeaker *"
-    self_type: "type-4"
-  }
-}
 builtin_types {
  type_info {
    name: "float"
@@ -271,7 +259,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "float"
+    linker_set_key: "_ZTIf"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -284,7 +272,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -297,7 +285,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-6"
    source_file: ""
-    linker_set_key: "unsigned int"
+    linker_set_key: "_ZTIj"
    self_type: "type-6"
  }
  is_unsigned: true
@@ -310,7 +298,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libpure_virtual_function.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar"
+    linker_set_key: "_ZTI10DerivedBar"
    self_type: "type-4"
  }
  base_specifiers {
@@ -53,9 +53,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS10DerivedBar"
-  }
 }
 record_types {
  type_info {
@@ -64,7 +61,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase"
+    linker_set_key: "_ZTI15PureVirtualBase"
    self_type: "type-1"
  }
  vtable_layout {
@@ -107,9 +104,6 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS15PureVirtualBase"
-  }
 }
 pointer_types {
  type_info {
@@ -118,7 +112,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "DerivedBar *"
+    linker_set_key: "_ZTIP10DerivedBar"
    self_type: "type-5"
  }
 }
@@ -129,7 +123,7 @@ pointer_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/cpp/pure_virtual/include/header1.h"
-    linker_set_key: "PureVirtualBase *"
+    linker_set_key: "_ZTIP15PureVirtualBase"
    self_type: "type-3"
  }
 }
@@ -140,7 +134,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/libreproducability.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/reproducability_c.h"
-    linker_set_key: "ShouldRepro"
+    linker_set_key: "_ZTI11ShouldRepro"
    self_type: "type-1"
  }
  fields {
@@ -16,9 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "ShouldRepro"
-  }
 }
 builtin_types {
  type_info {
@@ -27,7 +24,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips/undeclared_types.h.sdump
@@ -68,7 +68,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "namespace_a::A &",
+   "linker_set_key" : "_ZTIRN11namespace_a1AE",
   "name" : "namespace_a::A &",
   "referenced_type" : "type-1",
   "self_type" : "type-4",
@@ -80,7 +80,7 @@
 [
  {
   "alignment" : 8,
-   "linker_set_key" : "InvalidClass *",
+   "linker_set_key" : "_ZTIP12InvalidClass",
   "name" : "InvalidClass *",
   "referenced_type" : "type-7",
   "self_type" : "type-8",
@@ -89,7 +89,7 @@
  },
  {
   "alignment" : 8,
-   "linker_set_key" : "TemplateInMacro<F> *",
+   "linker_set_key" : "_ZTIP15TemplateInMacroIJ1FEE",
   "name" : "TemplateInMacro<F> *",
   "referenced_type" : "type-10",
   "self_type" : "type-11",
@@ -101,7 +101,7 @@
 [
  {
   "is_const" : true,
-   "linker_set_key" : "const namespace_b::template_b<const B *>",
+   "linker_set_key" : "_ZTIKN11namespace_b10template_bIJPKNS_1BEEEE",
   "name" : "const namespace_b::template_b<const B *>",
   "referenced_type" : "type-2",
   "self_type" : "type-3",
--- a/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/known_issues.h.sdump
@@ -5,7 +5,7 @@
  {
   "alignment" : 4,
   "is_integral" : true,
-   "linker_set_key" : "int",
+   "linker_set_key" : "_ZTIi",
   "name" : "int",
   "referenced_type" : "type-1",
   "self_type" : "type-1",
--- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-1"
  }
  fields {
@@ -22,9 +22,25 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
+}
+record_types {
+  type_info {
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-7"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-7"
  }
+  fields {
+    referenced_type: "type-3"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
 record_types {
  type_info {
@@ -33,7 +49,7 @@ record_types {
    alignment: 8
    referenced_type: "type-5"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
+    linker_set_key: "_ZTI7Cstruct"
    self_type: "type-5"
  }
  fields {
@@ -50,31 +66,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-7"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-7"
-  }
-  fields {
-    referenced_type: "type-3"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 pointer_types {
  type_info {
@@ -83,43 +74,10 @@ pointer_types {
    alignment: 8
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
+    linker_set_key: "_ZTIP3Foo"
    self_type: "type-10"
  }
 }
-pointer_types {
-  type_info {
-    name: "int *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-3"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-2"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 8
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-8"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-5"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-4"
-  }
-}
 pointer_types {
  type_info {
    name: "Cinner *"
@@ -127,10 +85,43 @@ pointer_types {
    alignment: 8
    referenced_type: "type-7"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-6"
  }
 }
+pointer_types {
+  type_info {
+    name: "Cstruct *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-5"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-4"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 8
+    alignment: 8
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-8"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-2"
+  }
+}
 builtin_types {
  type_info {
    name: "int"
@@ -138,7 +129,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-3"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-3"
  }
  is_unsigned: false
@@ -151,7 +142,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-9"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-9"
  }
  is_unsigned: false
--- a/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/mips64/libc_and_cpp_with_unused_struct.so.lsdump
@@ -5,7 +5,7 @@ record_types {
    alignment: 4
    referenced_type: "type-1"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "UnusedStruct"
+    linker_set_key: "_ZTI12UnusedStruct"
    self_type: "type-1"
  }
  fields {
@@ -16,59 +16,6 @@ record_types {
  }
  access: public_access
  record_kind: struct_kind
-  tag_info {
-    unique_id: "_ZTS12UnusedStruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cstruct"
-    size: 16
-    alignment: 8
-    referenced_type: "type-4"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct"
-    self_type: "type-4"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "a"
-    access: public_access
-  }
-  fields {
-    referenced_type: "type-5"
-    field_offset: 64
-    field_name: "b"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cstruct"
-  }
-}
-record_types {
-  type_info {
-    name: "Cinner"
-    size: 4
-    alignment: 4
-    referenced_type: "type-6"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner"
-    self_type: "type-6"
-  }
-  fields {
-    referenced_type: "type-2"
-    field_offset: 0
-    field_name: "c"
-    access: public_access
-  }
-  access: public_access
-  record_kind: struct_kind
-  tag_info {
-    unique_id: "Cinner"
-  }
 }
 record_types {
  type_info {
@@ -77,7 +24,7 @@ record_types {
    alignment: 8
    referenced_type: "type-8"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo"
+    linker_set_key: "_ZTI3Foo"
    self_type: "type-8"
  }
  fields {
@@ -94,41 +41,60 @@ record_types {
  }
  access: public_access
  record_kind: class_kind
-  tag_info {
-    unique_id: "_ZTS3Foo"
-  }
 }
-pointer_types {
+record_types {
  type_info {
-    name: "int *"
-    size: 8
-    alignment: 8
-    referenced_type: "type-2"
-    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "int *"
-    self_type: "type-9"
-  }
-}
-pointer_types {
-  type_info {
-    name: "Cstruct **"
-    size: 8
-    alignment: 8
-    referenced_type: "type-3"
+    name: "Cinner"
+    size: 4
+    alignment: 4
+    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct **"
-    self_type: "type-7"
+    linker_set_key: "_ZTI6Cinner"
+    self_type: "type-6"
  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "c"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
 }
-pointer_types {
+record_types {
  type_info {
-    name: "Cstruct *"
-    size: 8
+    name: "Cstruct"
+    size: 16
    alignment: 8
    referenced_type: "type-4"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cstruct *"
-    self_type: "type-3"
+    linker_set_key: "_ZTI7Cstruct"
+    self_type: "type-4"
+  }
+  fields {
+    referenced_type: "type-2"
+    field_offset: 0
+    field_name: "a"
+    access: public_access
+  }
+  fields {
+    referenced_type: "type-5"
+    field_offset: 64
+    field_name: "b"
+    access: public_access
+  }
+  access: public_access
+  record_kind: struct_kind
+}
+pointer_types {
+  type_info {
+    name: "Foo *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-8"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
+    linker_set_key: "_ZTIP3Foo"
+    self_type: "type-11"
  }
 }
 pointer_types {
@@ -138,19 +104,41 @@ pointer_types {
    alignment: 8
    referenced_type: "type-6"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
-    linker_set_key: "Cinner *"
+    linker_set_key: "_ZTIP6Cinner"
    self_type: "type-5"
  }
 }
 pointer_types {
  type_info {
-    name: "Foo *"
+    name: "Cstruct *"
    size: 8
    alignment: 8
-    referenced_type: "type-8"
+    referenced_type: "type-4"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIP7Cstruct"
+    self_type: "type-3"
+  }
+}
+pointer_types {
+  type_info {
+    name: "Cstruct **"
+    size: 8
+    alignment: 8
+    referenced_type: "type-3"
+    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_include.h"
+    linker_set_key: "_ZTIPP7Cstruct"
+    self_type: "type-7"
+  }
+}
+pointer_types {
+  type_info {
+    name: "int *"
+    size: 8
+    alignment: 8
+    referenced_type: "type-2"
    source_file: "/development/vndk/tools/header-checker/tests/integration/c_and_cpp/include/c_and_cpp.h"
-    linker_set_key: "Foo *"
-    self_type: "type-11"
+    linker_set_key: "_ZTIPi"
+    self_type: "type-9"
  }
 }
 builtin_types {
@@ -160,7 +148,7 @@ builtin_types {
    alignment: 4
    referenced_type: "type-2"
    source_file: ""
-    linker_set_key: "int"
+    linker_set_key: "_ZTIi"
    self_type: "type-2"
  }
  is_unsigned: false
@@ -173,7 +161,7 @@ builtin_types {
    alignment: 0
    referenced_type: "type-10"
    source_file: ""
-    linker_set_key: "void"
+    linker_set_key: "_ZTIv"
    self_type: "type-10"
  }
  is_unsigned: false
--- a/Show More
+++ b/Show More