diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b796a84f48be6..8cb88326eead3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -202,7 +202,7 @@ planning/sampling_based_planner/autoware_frenet_planner/** maxime.clement@tier4.
planning/sampling_based_planner/autoware_path_sampler/** maxime.clement@tier4.jp
planning/sampling_based_planner/autoware_sampler_common/** maxime.clement@tier4.jp
sensing/gnss_poser/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
-sensing/image_diagnostics/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp
+sensing/autoware_image_diagnostics/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp
sensing/image_transport_decompressor/** kenzo.lobos@tier4.jp yukihiro.saito@tier4.jp
sensing/imu_corrector/** taiki.yamada@tier4.jp yamato.ando@tier4.jp
sensing/livox/autoware_livox_tag_filter/** kenzo.lobos@tier4.jp ryohsuke.mitsudome@tier4.jp
diff --git a/sensing/image_diagnostics/CMakeLists.txt b/sensing/autoware_image_diagnostics/CMakeLists.txt
similarity index 96%
rename from sensing/image_diagnostics/CMakeLists.txt
rename to sensing/autoware_image_diagnostics/CMakeLists.txt
index 186d9340dc08a..6786249639e50 100644
--- a/sensing/image_diagnostics/CMakeLists.txt
+++ b/sensing/autoware_image_diagnostics/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
-project(image_diagnostics)
+project(autoware_image_diagnostics)
### Compile options
if(NOT CMAKE_CXX_STANDARD)
diff --git a/sensing/image_diagnostics/README.md b/sensing/autoware_image_diagnostics/README.md
similarity index 100%
rename from sensing/image_diagnostics/README.md
rename to sensing/autoware_image_diagnostics/README.md
diff --git a/sensing/image_diagnostics/image/block_state_decision.svg b/sensing/autoware_image_diagnostics/image/block_state_decision.svg
similarity index 100%
rename from sensing/image_diagnostics/image/block_state_decision.svg
rename to sensing/autoware_image_diagnostics/image/block_state_decision.svg
diff --git a/sensing/image_diagnostics/image/image_diagnostics_overview.svg b/sensing/autoware_image_diagnostics/image/image_diagnostics_overview.svg
similarity index 100%
rename from sensing/image_diagnostics/image/image_diagnostics_overview.svg
rename to sensing/autoware_image_diagnostics/image/image_diagnostics_overview.svg
diff --git a/sensing/image_diagnostics/image/image_status_decision.svg b/sensing/autoware_image_diagnostics/image/image_status_decision.svg
similarity index 100%
rename from sensing/image_diagnostics/image/image_status_decision.svg
rename to sensing/autoware_image_diagnostics/image/image_status_decision.svg
diff --git a/sensing/image_diagnostics/launch/image_diagnostics_node.launch.xml b/sensing/autoware_image_diagnostics/launch/image_diagnostics_node.launch.xml
similarity index 62%
rename from sensing/image_diagnostics/launch/image_diagnostics_node.launch.xml
rename to sensing/autoware_image_diagnostics/launch/image_diagnostics_node.launch.xml
index 4549ad43c7631..355400d3150da 100644
--- a/sensing/image_diagnostics/launch/image_diagnostics_node.launch.xml
+++ b/sensing/autoware_image_diagnostics/launch/image_diagnostics_node.launch.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/sensing/image_diagnostics/package.xml b/sensing/autoware_image_diagnostics/package.xml
similarity index 89%
rename from sensing/image_diagnostics/package.xml
rename to sensing/autoware_image_diagnostics/package.xml
index 00d2751b86aa1..37253e1431d3d 100644
--- a/sensing/image_diagnostics/package.xml
+++ b/sensing/autoware_image_diagnostics/package.xml
@@ -1,9 +1,9 @@
- image_diagnostics
+ autoware_image_diagnostics
0.1.0
- The image_diagnostics_package
+ The autoware_image_diagnostics package
Dai Nguyen
Yoshi Ri
Apache License 2.0
diff --git a/sensing/image_diagnostics/src/image_diagnostics_node.cpp b/sensing/autoware_image_diagnostics/src/image_diagnostics_node.cpp
similarity index 100%
rename from sensing/image_diagnostics/src/image_diagnostics_node.cpp
rename to sensing/autoware_image_diagnostics/src/image_diagnostics_node.cpp
diff --git a/sensing/image_diagnostics/src/image_diagnostics_node.hpp b/sensing/autoware_image_diagnostics/src/image_diagnostics_node.hpp
similarity index 100%
rename from sensing/image_diagnostics/src/image_diagnostics_node.hpp
rename to sensing/autoware_image_diagnostics/src/image_diagnostics_node.hpp