diff --git a/system/hazard_status_converter/CHANGELOG.rst b/system/autoware_hazard_status_converter/CHANGELOG.rst
similarity index 100%
rename from system/hazard_status_converter/CHANGELOG.rst
rename to system/autoware_hazard_status_converter/CHANGELOG.rst
diff --git a/system/hazard_status_converter/CMakeLists.txt b/system/autoware_hazard_status_converter/CMakeLists.txt
similarity index 66%
rename from system/hazard_status_converter/CMakeLists.txt
rename to system/autoware_hazard_status_converter/CMakeLists.txt
index b253f9fc51f2b..b49a67f24a693 100644
--- a/system/hazard_status_converter/CMakeLists.txt
+++ b/system/autoware_hazard_status_converter/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(hazard_status_converter)
+project(autoware_hazard_status_converter)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -9,8 +9,8 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "hazard_status_converter::Converter"
-  EXECUTABLE converter
+  PLUGIN "autoware::hazard_status_converter::Converter"
+  EXECUTABLE ${PROJECT_NAME}_node
 )
 
 ament_auto_package(INSTALL_TO_SHARE launch)
diff --git a/system/hazard_status_converter/launch/hazard_status_converter.launch.xml b/system/autoware_hazard_status_converter/launch/hazard_status_converter.launch.xml
similarity index 66%
rename from system/hazard_status_converter/launch/hazard_status_converter.launch.xml
rename to system/autoware_hazard_status_converter/launch/hazard_status_converter.launch.xml
index 84318a921d4ce..26164c5ad50b0 100644
--- a/system/hazard_status_converter/launch/hazard_status_converter.launch.xml
+++ b/system/autoware_hazard_status_converter/launch/hazard_status_converter.launch.xml
@@ -1,5 +1,5 @@
 <launch>
-  <node pkg="hazard_status_converter" exec="converter" name="hazard_status_converter">
+  <node pkg="autoware_hazard_status_converter" exec="autoware_hazard_status_converter_node" name="hazard_status_converter">
     <remap from="~/diagnostics_graph" to="/diagnostics_graph"/>
     <remap from="~/hazard_status" to="/system/emergency/hazard_status"/>
     <remap from="~/input/emergency_holding" to="/system/emergency_holding"/>
diff --git a/system/hazard_status_converter/package.xml b/system/autoware_hazard_status_converter/package.xml
similarity index 88%
rename from system/hazard_status_converter/package.xml
rename to system/autoware_hazard_status_converter/package.xml
index 80cc53c08e16d..412300df7202e 100644
--- a/system/hazard_status_converter/package.xml
+++ b/system/autoware_hazard_status_converter/package.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>hazard_status_converter</name>
+  <name>autoware_hazard_status_converter</name>
   <version>0.40.0</version>
   <description>The hazard_status_converter 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>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
diff --git a/system/hazard_status_converter/src/converter.cpp b/system/autoware_hazard_status_converter/src/converter.cpp
similarity index 95%
rename from system/hazard_status_converter/src/converter.cpp
rename to system/autoware_hazard_status_converter/src/converter.cpp
index 52cfef93aa522..4745c27dca592 100644
--- a/system/hazard_status_converter/src/converter.cpp
+++ b/system/autoware_hazard_status_converter/src/converter.cpp
@@ -1,4 +1,4 @@
-// Copyright 2023 The Autoware Contributors
+// Copyright 2025 The Autoware Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #include <utility>
 #include <vector>
 
-namespace hazard_status_converter
+namespace autoware::hazard_status_converter
 {
 
 Converter::Converter(const rclcpp::NodeOptions & options) : Node("converter", options)
@@ -125,7 +125,7 @@ void Converter::on_update(DiagGraph::ConstSharedPtr graph)
   pub_hazard_->publish(hazard);
 }
 
-}  // namespace hazard_status_converter
+}  // namespace autoware::hazard_status_converter
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(hazard_status_converter::Converter)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::hazard_status_converter::Converter)
diff --git a/system/hazard_status_converter/src/converter.hpp b/system/autoware_hazard_status_converter/src/converter.hpp
similarity index 92%
rename from system/hazard_status_converter/src/converter.hpp
rename to system/autoware_hazard_status_converter/src/converter.hpp
index 8011b911f3d42..a1fad4b93e2b6 100644
--- a/system/hazard_status_converter/src/converter.hpp
+++ b/system/autoware_hazard_status_converter/src/converter.hpp
@@ -1,4 +1,4 @@
-// Copyright 2023 The Autoware Contributors
+// Copyright 2025 The Autoware Contributors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 #include <unordered_set>
 
-namespace hazard_status_converter
+namespace autoware::hazard_status_converter
 {
 
 class Converter : public rclcpp::Node
@@ -48,6 +48,6 @@ class Converter : public rclcpp::Node
   std::unordered_set<DiagUnit *> auto_mode_tree_;
 };
 
-}  // namespace hazard_status_converter
+}  // namespace autoware::hazard_status_converter
 
 #endif  // CONVERTER_HPP_