diff --git a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp b/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp
index d4f535d1f..e75d4ce55 100644
--- a/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp
+++ b/vndk/tools/header-checker/header-abi-diff/src/abi_diff_wrappers.cpp
@@ -144,7 +144,8 @@ bool Diff<VTableComponent>(const VTableComponent &old_element,
   bool kind_comparison = old_element.kind() != new_element.kind();
   bool mangled_name_comparison = old_element.mangled_component_name() !=
       new_element.mangled_component_name();
-  bool value_comparison = old_element.value() != new_element.value();
+  bool value_comparison =
+      old_element.component_value() != new_element.component_value();
   return kind_comparison || mangled_name_comparison || value_comparison;
 }
 
diff --git a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp b/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp
index 850a9ca2e..32bb3c736 100644
--- a/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp
+++ b/vndk/tools/header-checker/header-abi-dumper/src/abi_wrappers.cpp
@@ -474,7 +474,7 @@ bool RecordDeclWrapper::SetupRecordVTableComponent(
         return false;
     }
   added_vtable_component->set_kind(kind);
-  added_vtable_component->set_value(value);
+  added_vtable_component->set_component_value(value);
   added_vtable_component->set_mangled_component_name(mangled_component_name);
   return true;
 }
diff --git a/vndk/tools/header-checker/proto/abi_dump.proto b/vndk/tools/header-checker/proto/abi_dump.proto
index 0f43d9e6a..3633d208b 100644
--- a/vndk/tools/header-checker/proto/abi_dump.proto
+++ b/vndk/tools/header-checker/proto/abi_dump.proto
@@ -79,7 +79,10 @@ message VTableComponent {
   }
   optional Kind kind = 1;
   optional string mangled_component_name = 2 [default = ""];
-  optional int64 value = 3 [default = 0];
+  // Maintain backwards compatibility. Builds don't break while updating
+  // reference dumps. TODO: b/63081517
+  optional uint64 value = 3 [default = 0];
+  optional int64 component_value = 4 [default = 0];
 }
 
 message VTableLayout {
diff --git a/vndk/tools/header-checker/tests/expected/example1.h b/vndk/tools/header-checker/tests/expected/example1.h
index 6503af2b7..78d1c1e2e 100644
--- a/vndk/tools/header-checker/tests/expected/example1.h
+++ b/vndk/tools/header-checker/tests/expected/example1.h
@@ -73,17 +73,17 @@ records {
     vtable_components {
       kind: OffsetToTop
       mangled_component_name: ""
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: RTTI
       mangled_component_name: "test2::HelloAgain"
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: FunctionPointer
       mangled_component_name: "_ZN5test210HelloAgain5againEv"
-      value: 0
+      component_value: 0
     }
   }
 }
@@ -324,17 +324,17 @@ records {
     vtable_components {
       kind: OffsetToTop
       mangled_component_name: ""
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: RTTI
       mangled_component_name: "CPPHello"
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: FunctionPointer
       mangled_component_name: "_ZN8CPPHello5againEv"
-      value: 0
+      component_value: 0
     }
   }
 }
diff --git a/vndk/tools/header-checker/tests/expected/example2.h b/vndk/tools/header-checker/tests/expected/example2.h
index 2b1c9720e..9f21b7815 100644
--- a/vndk/tools/header-checker/tests/expected/example2.h
+++ b/vndk/tools/header-checker/tests/expected/example2.h
@@ -73,17 +73,17 @@ records {
     vtable_components {
       kind: OffsetToTop
       mangled_component_name: ""
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: RTTI
       mangled_component_name: "test2::HelloAgain"
-      value: 0
+      component_value: 0
     }
     vtable_components {
       kind: FunctionPointer
       mangled_component_name: "_ZN5test210HelloAgain5againEv"
-      value: 0
+      component_value: 0
     }
   }
 }