diff --git a/mediapipe/tasks/cc/vision/hand_landmarker/BUILD b/mediapipe/tasks/cc/vision/hand_landmarker/BUILD
index 5449810ef..5b75ef8fc 100644
--- a/mediapipe/tasks/cc/vision/hand_landmarker/BUILD
+++ b/mediapipe/tasks/cc/vision/hand_landmarker/BUILD
@@ -54,12 +54,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "hand_landmark",
-    hdrs = ["hand_landmark.h"],
-    visibility = ["//visibility:public"],
-)
-
 cc_library(
     name = "hand_landmarks_detector_graph",
     srcs = ["hand_landmarks_detector_graph.cc"],
@@ -175,3 +169,8 @@ cc_library(
 )
 
 # TODO: Enable this test
+
+cc_library(
+    name = "hand_topology",
+    hdrs = ["hand_topology.h"],
+)
diff --git a/mediapipe/tasks/cc/vision/hand_landmarker/hand_landmark.h b/mediapipe/tasks/cc/vision/hand_landmarker/hand_topology.h
similarity index 50%
rename from mediapipe/tasks/cc/vision/hand_landmarker/hand_landmark.h
rename to mediapipe/tasks/cc/vision/hand_landmarker/hand_topology.h
index 3f70e7ee7..22657c6ed 100644
--- a/mediapipe/tasks/cc/vision/hand_landmarker/hand_landmark.h
+++ b/mediapipe/tasks/cc/vision/hand_landmarker/hand_topology.h
@@ -1,4 +1,4 @@
-/* Copyright 2022 The MediaPipe Authors.
+/* Copyright 2023 The MediaPipe Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,36 +13,36 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_LANDMARK_H_
-#define MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_LANDMARK_H_
+#ifndef MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_TOPOLOGY_H_
+#define MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_TOPOLOGY_H_
 
 namespace mediapipe::tasks::vision::hand_landmarker {
 
-// The 21 hand landmarks.
-enum HandLandmark {
-  WRIST = 0,
-  THUMB_CMC = 1,
-  THUMB_MCP = 2,
-  THUMB_IP = 3,
-  THUMB_TIP = 4,
-  INDEX_FINGER_MCP = 5,
-  INDEX_FINGER_PIP = 6,
-  INDEX_FINGER_DIP = 7,
-  INDEX_FINGER_TIP = 8,
-  MIDDLE_FINGER_MCP = 9,
-  MIDDLE_FINGER_PIP = 10,
-  MIDDLE_FINGER_DIP = 11,
-  MIDDLE_FINGER_TIP = 12,
-  RING_FINGER_MCP = 13,
-  RING_FINGER_PIP = 14,
-  RING_FINGER_DIP = 15,
-  RING_FINGER_TIP = 16,
-  PINKY_MCP = 17,
-  PINKY_PIP = 18,
-  PINKY_DIP = 19,
-  PINKY_TIP = 20
+// Hand model 21 landmark names.
+enum class HandLandmarkName {
+  kWrist = 0,
+  kThumb1,
+  kThumb2,
+  kThumb3,
+  kThumb4,
+  kIndex1,
+  kIndex2,
+  kIndex3,
+  kIndex4,
+  kMiddle1,
+  kMiddle2,
+  kMiddle3,
+  kMiddle4,
+  kRing1,
+  kRing2,
+  kRing3,
+  kRing4,
+  kPinky1,
+  kPinky2,
+  kPinky3,
+  kPinky4,
 };
 
 }  // namespace mediapipe::tasks::vision::hand_landmarker
 
-#endif  // MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_LANDMARK_H_
+#endif  // MEDIAPIPE_TASKS_CC_VISION_HAND_LANDMARKER_HAND_TOPOLOGY_H_