diff --git a/autoware_adapi_v1_msgs/CMakeLists.txt b/autoware_adapi_v1_msgs/CMakeLists.txt
index 05e9465..bbf6ac1 100644
--- a/autoware_adapi_v1_msgs/CMakeLists.txt
+++ b/autoware_adapi_v1_msgs/CMakeLists.txt
@@ -46,10 +46,8 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   system/msg/DiagLinkStruct.msg
   system/msg/DiagNodeStruct.msg
   system/msg/DiagNodeStatus.msg
-  system/msg/MetricArrayStruct.msg
-  system/msg/MetricArrayStatus.msg
-  system/msg/MetricDataStruct.msg
-  system/msg/MetricDataStatus.msg
+  system/msg/MetricArray.msg
+  system/msg/MetricData.msg
   vehicle/msg/DoorCommand.msg
   vehicle/msg/DoorLayout.msg
   vehicle/msg/DoorStatus.msg
diff --git a/autoware_adapi_v1_msgs/system/msg/MetricArray.msg b/autoware_adapi_v1_msgs/system/msg/MetricArray.msg
new file mode 100644
index 0000000..21a733b
--- /dev/null
+++ b/autoware_adapi_v1_msgs/system/msg/MetricArray.msg
@@ -0,0 +1,2 @@
+builtin_interfaces/Time stamp
+autoware_adapi_v1_msgs/MetricData[] metrics
diff --git a/autoware_adapi_v1_msgs/system/msg/MetricArrayStatus.msg b/autoware_adapi_v1_msgs/system/msg/MetricArrayStatus.msg
deleted file mode 100644
index 2bcfe86..0000000
--- a/autoware_adapi_v1_msgs/system/msg/MetricArrayStatus.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-builtin_interfaces/Time stamp
-string id
-autoware_adapi_v1_msgs/MetricDataStatus[] metrics
diff --git a/autoware_adapi_v1_msgs/system/msg/MetricArrayStruct.msg b/autoware_adapi_v1_msgs/system/msg/MetricArrayStruct.msg
deleted file mode 100644
index 25c05c1..0000000
--- a/autoware_adapi_v1_msgs/system/msg/MetricArrayStruct.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-builtin_interfaces/Time stamp
-string id
-autoware_adapi_v1_msgs/MetricDataStruct[] metrics
diff --git a/autoware_adapi_v1_msgs/system/msg/MetricDataStatus.msg b/autoware_adapi_v1_msgs/system/msg/MetricData.msg
similarity index 50%
rename from autoware_adapi_v1_msgs/system/msg/MetricDataStatus.msg
rename to autoware_adapi_v1_msgs/system/msg/MetricData.msg
index ae72173..5e84702 100644
--- a/autoware_adapi_v1_msgs/system/msg/MetricDataStatus.msg
+++ b/autoware_adapi_v1_msgs/system/msg/MetricData.msg
@@ -1 +1,2 @@
+string name
 string data
diff --git a/autoware_adapi_v1_msgs/system/msg/MetricDataStruct.msg b/autoware_adapi_v1_msgs/system/msg/MetricDataStruct.msg
deleted file mode 100644
index 42f2bc1..0000000
--- a/autoware_adapi_v1_msgs/system/msg/MetricDataStruct.msg
+++ /dev/null
@@ -1 +0,0 @@
-string name