diff --git a/test/hyperpod/hyperpod_metrics_test.go b/test/hyperpod/hyperpod_metrics_test.go
index 9c8d1f59b..5c47ceaaa 100644
--- a/test/hyperpod/hyperpod_metrics_test.go
+++ b/test/hyperpod/hyperpod_metrics_test.go
@@ -15,14 +15,14 @@ import (
 )
 
 const (
-	awsHyperPodMetricIndicator = "hyper_pod_"
+	awsHyperPodMetricIndicator = "hyperpod_"
 )
 
 const (
-	UnschedulablePendingReplacementMetric = "hyper_pod_node_health_status_unschedulable_pending_replacement"
-	UnschedulablePendingRebootMetric      = "hyper_pod_node_health_status_unschedulable_pending_reboot"
-	SchedulableMetric                     = "hyper_pod_node_health_status_schedulable"
-	UnschedulableMetric                   = "hyper_pod_node_health_status_unschedulable"
+	UnschedulablePendingReplacementMetric = "hyperpod_node_health_status_unschedulable_pending_replacement"
+	UnschedulablePendingRebootMetric      = "hyperpod_node_health_status_unschedulable_pending_reboot"
+	SchedulableMetric                     = "hyperpod_node_health_status_schedulable"
+	UnschedulableMetric                   = "hyperpod_node_health_status_unschedulable"
 )
 
 var expectedDimsToMetrics = map[string][]string{
diff --git a/test/metric_value_benchmark/eks_resources/test_schemas/node_hyperpod.json b/test/metric_value_benchmark/eks_resources/test_schemas/node_hyperpod.json
index 253d58b44..4efbccf79 100644
--- a/test/metric_value_benchmark/eks_resources/test_schemas/node_hyperpod.json
+++ b/test/metric_value_benchmark/eks_resources/test_schemas/node_hyperpod.json
@@ -11,10 +11,10 @@
     "Version": {},
     "InstanceId": {},
     "NodeName": {},
-    "hyper_pod_node_health_status_unschedulable_pending_replacement": {},
-    "hyper_pod_node_health_status_unschedulable_pending_reboot" : {},
-    "hyper_pod_node_health_status_schedulable": {},
-    "hyper_pod_node_health_status_unschedulable": {}
+    "hyperpod_node_health_status_unschedulable_pending_replacement": {},
+    "hyperpod_node_health_status_unschedulable_pending_reboot" : {},
+    "hyperpod_node_health_status_schedulable": {},
+    "hyperpod_node_health_status_unschedulable": {}
   },
   "required": [
     "Type",