diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7e76a883c36e9..fafe8432a51ba 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -221,7 +221,7 @@ system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguch
 system/autoware_dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp
 system/autoware_duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp junya.sasaki@tier4.jp
 system/hazard_status_converter/** isamu.takagi@tier4.jp
-system/mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
+system/autoware_mrm_comfortable_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp junya.sasaki@tier4.jp
 system/mrm_emergency_stop_operator/** makoto.kurihara@tier4.jp tomohito.ando@tier4.jp
 system/mrm_handler/** makoto.kurihara@tier4.jp ryuta.kambe@tier4.jp tetsuhiro.kawaguchi@tier4.jp
 system/system_diagnostic_monitor/** isamu.takagi@tier4.jp
diff --git a/launch/tier4_system_launch/launch/system.launch.xml b/launch/tier4_system_launch/launch/system.launch.xml
index b61007dcfa209..7b7d192dd1879 100644
--- a/launch/tier4_system_launch/launch/system.launch.xml
+++ b/launch/tier4_system_launch/launch/system.launch.xml
@@ -80,7 +80,7 @@
 
     <!-- MRM Operator -->
     <group>
-      <include file="$(find-pkg-share mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
+      <include file="$(find-pkg-share autoware_mrm_comfortable_stop_operator)/launch/mrm_comfortable_stop_operator.launch.py">
         <arg name="config_file" value="$(var mrm_comfortable_stop_operator_param_path)"/>
       </include>
     </group>
diff --git a/system/mrm_comfortable_stop_operator/CHANGELOG.rst b/system/autoware_mrm_comfortable_stop_operator/CHANGELOG.rst
similarity index 100%
rename from system/mrm_comfortable_stop_operator/CHANGELOG.rst
rename to system/autoware_mrm_comfortable_stop_operator/CHANGELOG.rst
diff --git a/system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt b/system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt
new file mode 100644
index 0000000000000..3ee028cd31608
--- /dev/null
+++ b/system/autoware_mrm_comfortable_stop_operator/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14)
+project(autoware_mrm_comfortable_stop_operator)
+
+find_package(autoware_cmake REQUIRED)
+autoware_package()
+
+ament_auto_add_library(${PROJECT_NAME}_component SHARED
+  src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
+)
+
+rclcpp_components_register_node(${PROJECT_NAME}_component
+  PLUGIN "autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator"
+  EXECUTABLE ${PROJECT_NAME}_node
+)
+
+ament_auto_package(INSTALL_TO_SHARE
+  launch
+  config
+)
diff --git a/system/mrm_comfortable_stop_operator/README.md b/system/autoware_mrm_comfortable_stop_operator/README.md
similarity index 100%
rename from system/mrm_comfortable_stop_operator/README.md
rename to system/autoware_mrm_comfortable_stop_operator/README.md
diff --git a/system/mrm_comfortable_stop_operator/config/mrm_comfortable_stop_operator.param.yaml b/system/autoware_mrm_comfortable_stop_operator/config/mrm_comfortable_stop_operator.param.yaml
similarity index 100%
rename from system/mrm_comfortable_stop_operator/config/mrm_comfortable_stop_operator.param.yaml
rename to system/autoware_mrm_comfortable_stop_operator/config/mrm_comfortable_stop_operator.param.yaml
diff --git a/system/mrm_comfortable_stop_operator/include/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp b/system/autoware_mrm_comfortable_stop_operator/include/autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp
similarity index 86%
rename from system/mrm_comfortable_stop_operator/include/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp
rename to system/autoware_mrm_comfortable_stop_operator/include/autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp
index eb84191f481f9..0dbaef1f1df21 100644
--- a/system/mrm_comfortable_stop_operator/include/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp
+++ b/system/autoware_mrm_comfortable_stop_operator/include/autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
-#define MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#ifndef AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#define AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
 
 // Core
 #include <memory>
@@ -29,7 +29,7 @@
 // ROS 2 core
 #include <rclcpp/rclcpp.hpp>
 
-namespace mrm_comfortable_stop_operator
+namespace autoware::mrm_comfortable_stop_operator
 {
 
 struct Parameters
@@ -81,6 +81,6 @@ class MrmComfortableStopOperator : public rclcpp::Node
   OnSetParametersCallbackHandle::SharedPtr set_param_res_;
 };
 
-}  // namespace mrm_comfortable_stop_operator
+}  // namespace autoware::mrm_comfortable_stop_operator
 
-#endif  // MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
+#endif  // AUTOWARE__MRM_COMFORTABLE_STOP_OPERATOR__MRM_COMFORTABLE_STOP_OPERATOR_CORE_HPP_
diff --git a/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py b/system/autoware_mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py
similarity index 91%
rename from system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py
rename to system/autoware_mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py
index 9181af398e3d6..50dabf74206af 100644
--- a/system/mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py
+++ b/system/autoware_mrm_comfortable_stop_operator/launch/mrm_comfortable_stop_operator.launch.py
@@ -28,8 +28,8 @@ def launch_setup(context, *args, **kwargs):
         params = yaml.safe_load(f)["/**"]["ros__parameters"]
 
     component = ComposableNode(
-        package="mrm_comfortable_stop_operator",
-        plugin="mrm_comfortable_stop_operator::MrmComfortableStopOperator",
+        package="autoware_mrm_comfortable_stop_operator",
+        plugin="autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator",
         name="mrm_comfortable_stop_operator",
         parameters=[
             params,
@@ -61,7 +61,7 @@ def generate_launch_description():
         DeclareLaunchArgument(
             "config_file",
             default_value=[
-                FindPackageShare("mrm_comfortable_stop_operator"),
+                FindPackageShare("autoware_mrm_comfortable_stop_operator"),
                 "/config/mrm_comfortable_stop_operator.param.yaml",
             ],
             description="path to the parameter file of mrm_comfortable_stop_operator",
diff --git a/system/mrm_comfortable_stop_operator/package.xml b/system/autoware_mrm_comfortable_stop_operator/package.xml
similarity index 89%
rename from system/mrm_comfortable_stop_operator/package.xml
rename to system/autoware_mrm_comfortable_stop_operator/package.xml
index 58ff309d825f1..8437a4c926b2d 100644
--- a/system/mrm_comfortable_stop_operator/package.xml
+++ b/system/autoware_mrm_comfortable_stop_operator/package.xml
@@ -1,11 +1,12 @@
 <?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>mrm_comfortable_stop_operator</name>
+  <name>autoware_mrm_comfortable_stop_operator</name>
   <version>0.40.0</version>
   <description>The MRM comfortable stop operator package</description>
   <maintainer email="makoto.kurihara@tier4.jp">Makoto Kurihara</maintainer>
   <maintainer email="tomohito.ando@tier4.jp">Tomohito Ando</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/mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp b/system/autoware_mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
similarity index 94%
rename from system/mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
rename to system/autoware_mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
index fc703ab16e259..397367e568a25 100644
--- a/system/mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
+++ b/system/autoware_mrm_comfortable_stop_operator/src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
+#include "autoware/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.hpp"
 
 #include <autoware/universe_utils/ros/update_param.hpp>
 
 #include <vector>
 
-namespace mrm_comfortable_stop_operator
+namespace autoware::mrm_comfortable_stop_operator
 {
 
 MrmComfortableStopOperator::MrmComfortableStopOperator(const rclcpp::NodeOptions & node_options)
@@ -123,7 +123,7 @@ void MrmComfortableStopOperator::onTimer() const
   publishStatus();
 }
 
-}  // namespace mrm_comfortable_stop_operator
+}  // namespace autoware::mrm_comfortable_stop_operator
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(mrm_comfortable_stop_operator::MrmComfortableStopOperator)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::mrm_comfortable_stop_operator::MrmComfortableStopOperator)
diff --git a/system/mrm_comfortable_stop_operator/CMakeLists.txt b/system/mrm_comfortable_stop_operator/CMakeLists.txt
deleted file mode 100644
index 19bc4f6d66d5f..0000000000000
--- a/system/mrm_comfortable_stop_operator/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 3.14)
-project(mrm_comfortable_stop_operator)
-
-find_package(autoware_cmake REQUIRED)
-autoware_package()
-
-ament_auto_add_library(mrm_comfortable_stop_operator_component SHARED
-  src/mrm_comfortable_stop_operator/mrm_comfortable_stop_operator_core.cpp
-)
-
-rclcpp_components_register_node(mrm_comfortable_stop_operator_component
-  PLUGIN "mrm_comfortable_stop_operator::MrmComfortableStopOperator"
-  EXECUTABLE mrm_comfortable_stop_operator)
-
-ament_auto_package(INSTALL_TO_SHARE
-  launch
-  config
-)