diff --git a/vndk/tools/header-checker/tests/expected/example1.cpp b/vndk/tools/header-checker/tests/expected/example1.cpp
index b9c5c1d8f..50f89e7df 100644
--- a/vndk/tools/header-checker/tests/expected/example1.cpp
+++ b/vndk/tools/header-checker/tests/expected/example1.cpp
@@ -448,7 +448,7 @@ enum_types {
 }
 enum_types {
   type_info {
-    name: "Hello::(anonymous enum at development/vndk/tools/header-checker/tests/input/example1.h:17:3)"
+    name: "Hello::(unnamed enum at development/vndk/tools/header-checker/tests/input/example1.h:17:3)"
     size: 4
     alignment: 4
     referenced_type: "_ZTIN5Hello2$AE"
@@ -469,7 +469,7 @@ enum_types {
 }
 enum_types {
   type_info {
-    name: "Hello::(anonymous enum at development/vndk/tools/header-checker/tests/input/example1.h:18:3)"
+    name: "Hello::(unnamed enum at development/vndk/tools/header-checker/tests/input/example1.h:18:3)"
     size: 4
     alignment: 4
     referenced_type: "_ZTIN5Hello2$CE"
@@ -720,7 +720,7 @@ builtin_types {
 }
 qualified_types {
   type_info {
-    name: "bool const[2]"
+    name: "const bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIA2_b"
@@ -790,7 +790,7 @@ qualified_types {
 }
 array_types {
   type_info {
-    name: "bool [2]"
+    name: "bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIb"
diff --git a/vndk/tools/header-checker/tests/expected/example1.h b/vndk/tools/header-checker/tests/expected/example1.h
index d8c770ccc..963597037 100644
--- a/vndk/tools/header-checker/tests/expected/example1.h
+++ b/vndk/tools/header-checker/tests/expected/example1.h
@@ -448,7 +448,7 @@ enum_types {
 }
 enum_types {
   type_info {
-    name: "Hello::(anonymous enum at development/vndk/tools/header-checker/tests/input/example1.h:17:3)"
+    name: "Hello::(unnamed enum at development/vndk/tools/header-checker/tests/input/example1.h:17:3)"
     size: 4
     alignment: 4
     referenced_type: "_ZTIN5Hello2$AE"
@@ -469,7 +469,7 @@ enum_types {
 }
 enum_types {
   type_info {
-    name: "Hello::(anonymous enum at development/vndk/tools/header-checker/tests/input/example1.h:18:3)"
+    name: "Hello::(unnamed enum at development/vndk/tools/header-checker/tests/input/example1.h:18:3)"
     size: 4
     alignment: 4
     referenced_type: "_ZTIN5Hello2$CE"
@@ -786,7 +786,7 @@ builtin_types {
 }
 qualified_types {
   type_info {
-    name: "bool const[2]"
+    name: "const bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIA2_b"
@@ -870,7 +870,7 @@ qualified_types {
 }
 array_types {
   type_info {
-    name: "bool [2]"
+    name: "bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIb"
diff --git a/vndk/tools/header-checker/tests/expected/example2.h b/vndk/tools/header-checker/tests/expected/example2.h
index 4cd0d1c12..23d4241d1 100644
--- a/vndk/tools/header-checker/tests/expected/example2.h
+++ b/vndk/tools/header-checker/tests/expected/example2.h
@@ -333,7 +333,7 @@ builtin_types {
 }
 qualified_types {
   type_info {
-    name: "bool const[2]"
+    name: "const bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIA2_b"
@@ -347,7 +347,7 @@ qualified_types {
 }
 array_types {
   type_info {
-    name: "bool [2]"
+    name: "bool[2]"
     size: 2
     alignment: 1
     referenced_type: "_ZTIb"
diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump
index 32adb44b2..eecb0cb07 100644
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libanonymous_enum_odr.so.lsdump
@@ -37,7 +37,7 @@
     }
    ],
    "linker_set_key" : "_ZTI2$A",
-   "name" : "(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:1:1)",
+   "name" : "(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:1:1)",
    "referenced_type" : "_ZTI2$A",
    "self_type" : "_ZTI2$A",
    "size" : 1,
@@ -54,7 +54,7 @@
     }
    ],
    "linker_set_key" : "_ZTI2$B",
-   "name" : "(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:5:1)",
+   "name" : "(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:5:1)",
    "referenced_type" : "_ZTI2$B",
    "self_type" : "_ZTI2$B",
    "size" : 1,
@@ -71,7 +71,7 @@
     }
    ],
    "linker_set_key" : "_ZTI21$FIRST_ANONYMOUS_ENUM",
-   "name" : "(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/include_golden.h:1:1)",
+   "name" : "(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/include_golden.h:1:1)",
    "referenced_type" : "_ZTI21$FIRST_ANONYMOUS_ENUM",
    "self_type" : "_ZTI21$FIRST_ANONYMOUS_ENUM",
    "size" : 4,
@@ -92,7 +92,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN3$_22$BE",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
    "referenced_type" : "_ZTIN3$_22$BE",
    "self_type" : "_ZTIN3$_22$BE",
    "size" : 4,
@@ -113,7 +113,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN3$_32$BE",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
    "referenced_type" : "_ZTIN3$_32$BE",
    "self_type" : "_ZTIN3$_32$BE",
    "size" : 4,
@@ -140,7 +140,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI3$_2",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
    "referenced_type" : "_ZTI3$_2",
    "self_type" : "_ZTI3$_2",
    "size" : 4,
@@ -157,7 +157,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI3$_3",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
    "referenced_type" : "_ZTI3$_3",
    "self_type" : "_ZTI3$_3",
    "size" : 4,
diff --git a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump
index 57ce96e68..9be3f3471 100644
--- a/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump
+++ b/vndk/tools/header-checker/tests/reference_dumps/arm64/libgolden_anonymous_enum.so.lsdump
@@ -37,7 +37,7 @@
     }
    ],
    "linker_set_key" : "_ZTI2$A",
-   "name" : "(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:1:1)",
+   "name" : "(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:1:1)",
    "referenced_type" : "_ZTI2$A",
    "self_type" : "_ZTI2$A",
    "size" : 1,
@@ -54,7 +54,7 @@
     }
    ],
    "linker_set_key" : "_ZTI2$B",
-   "name" : "(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:5:1)",
+   "name" : "(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:5:1)",
    "referenced_type" : "_ZTI2$B",
    "self_type" : "_ZTI2$B",
    "size" : 1,
@@ -75,7 +75,7 @@
     }
    ],
    "linker_set_key" : "_ZTIN3$_22$BE",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(anonymous enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)::(unnamed enum at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:10:3)",
    "referenced_type" : "_ZTIN3$_22$BE",
    "self_type" : "_ZTIN3$_22$BE",
    "size" : 4,
@@ -102,7 +102,7 @@
    ],
    "is_anonymous" : true,
    "linker_set_key" : "_ZTI3$_2",
-   "name" : "(anonymous struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
+   "name" : "(unnamed struct at development/vndk/tools/header-checker/tests/integration/cpp/anonymous_enum/include/golden.h:9:1)",
    "referenced_type" : "_ZTI3$_2",
    "self_type" : "_ZTI3$_2",
    "size" : 4,