diff --git a/system/autoware_diagnostic_graph_utils/README.md b/system/autoware_diagnostic_graph_utils/README.md
index 18cb6e8fc3051..ac941a3575445 100644
--- a/system/autoware_diagnostic_graph_utils/README.md
+++ b/system/autoware_diagnostic_graph_utils/README.md
@@ -1,4 +1,4 @@
-# diagnostic_graph_utils
+# autoware_diagnostic_graph_utils
 
 This package is a utility for diagnostic graph published by [diagnostic_graph_aggregator](../diagnostic_graph_aggregator/README.md).
 
diff --git a/system/autoware_diagnostic_graph_utils/doc/node/converter.md b/system/autoware_diagnostic_graph_utils/doc/node/converter.md
index 407a99c87f73e..a7793b815c0b7 100644
--- a/system/autoware_diagnostic_graph_utils/doc/node/converter.md
+++ b/system/autoware_diagnostic_graph_utils/doc/node/converter.md
@@ -5,7 +5,7 @@ This tool converts `/diagnostics_graph` to `/diagnostics_array` so it can be rea
 ## Usage
 
 ```bash
-ros2 run diagnostic_graph_utils converter_node
+ros2 run autoware_diagnostic_graph_utils converter_node
 ```
 
 ## Examples
@@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml
 Terminal 2:
 
 ```bash
-ros2 run diagnostic_graph_utils converter_node
+ros2 run autoware_diagnostic_graph_utils converter_node
 ```
 
 Terminal 3:
diff --git a/system/autoware_diagnostic_graph_utils/doc/node/dump.md b/system/autoware_diagnostic_graph_utils/doc/node/dump.md
index c76bb85ed75cb..fac23d655ed64 100644
--- a/system/autoware_diagnostic_graph_utils/doc/node/dump.md
+++ b/system/autoware_diagnostic_graph_utils/doc/node/dump.md
@@ -5,7 +5,7 @@ This tool displays `/diagnostics_graph` in table format.
 ## Usage
 
 ```bash
-ros2 run diagnostic_graph_utils dump_node
+ros2 run autoware_diagnostic_graph_utils dump_node
 ```
 
 ## Examples
@@ -19,7 +19,7 @@ ros2 launch diagnostic_graph_aggregator example-main.launch.xml
 Terminal 2:
 
 ```bash
-ros2 run diagnostic_graph_utils dump_node
+ros2 run autoware_diagnostic_graph_utils dump_node
 ```
 
 Output:
diff --git a/system/autoware_diagnostic_graph_utils/package.xml b/system/autoware_diagnostic_graph_utils/package.xml
index 29d0f8e59c6c2..57e35d149bc0a 100644
--- a/system/autoware_diagnostic_graph_utils/package.xml
+++ b/system/autoware_diagnostic_graph_utils/package.xml
@@ -3,7 +3,7 @@
 <package format="3">
   <name>autoware_diagnostic_graph_utils</name>
   <version>0.40.0</version>
-  <description>The diagnostic_graph_utils package</description>
+  <description>The autoware_diagnostic_graph_utils package</description>
   <maintainer email="isamu.takagi@tier4.jp">Takagi, Isamu</maintainer>
   <maintainer email="junya.sasaki@tier4.jp">Junya Sasaki</maintainer>
   <license>Apache License 2.0</license>
diff --git a/system/diagnostic_graph_aggregator/README.md b/system/diagnostic_graph_aggregator/README.md
index c0cd78e0610c2..76513ca414541 100644
--- a/system/diagnostic_graph_aggregator/README.md
+++ b/system/diagnostic_graph_aggregator/README.md
@@ -80,7 +80,7 @@ ros2 launch diagnostic_graph_aggregator example-edit.launch.xml
 ## Debug tools
 
 - [tree](./doc/tool/tree.md)
-- [diagnostic_graph_utils](../diagnostic_graph_utils/README.md)
+- [autoware_diagnostic_graph_utils](../autoware_diagnostic_graph_utils/README.md)
 
 ## Graph file format