diff --git a/system/velodyne_monitor/CHANGELOG.rst b/system/autoware_velodyne_monitor/CHANGELOG.rst
similarity index 98%
rename from system/velodyne_monitor/CHANGELOG.rst
rename to system/autoware_velodyne_monitor/CHANGELOG.rst
index 4cc3be4c7a3f0..67e7f7732653b 100644
--- a/system/velodyne_monitor/CHANGELOG.rst
+++ b/system/autoware_velodyne_monitor/CHANGELOG.rst
@@ -1,6 +1,6 @@
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package velodyne_monitor
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package autoware_velodyne_monitor
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 0.40.0 (2024-12-12)
 -------------------
diff --git a/system/velodyne_monitor/CMakeLists.txt b/system/autoware_velodyne_monitor/CMakeLists.txt
similarity index 83%
rename from system/velodyne_monitor/CMakeLists.txt
rename to system/autoware_velodyne_monitor/CMakeLists.txt
index a09e1fe1bf012..ab2fe0aa5f56d 100644
--- a/system/velodyne_monitor/CMakeLists.txt
+++ b/system/autoware_velodyne_monitor/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(velodyne_monitor)
+project(autoware_velodyne_monitor)
 
 find_package(autoware_cmake REQUIRED)
 find_package(fmt)
@@ -13,7 +13,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 target_link_libraries(${PROJECT_NAME} cpprest crypto fmt)
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "VelodyneMonitor"
+  PLUGIN "autoware::velodyne_monitor::VelodyneMonitor"
   EXECUTABLE ${PROJECT_NAME}_node
 )
 
diff --git a/system/velodyne_monitor/README.md b/system/autoware_velodyne_monitor/README.md
similarity index 99%
rename from system/velodyne_monitor/README.md
rename to system/autoware_velodyne_monitor/README.md
index f8381dbd41159..9d45f3d6a501f 100644
--- a/system/velodyne_monitor/README.md
+++ b/system/autoware_velodyne_monitor/README.md
@@ -1,4 +1,4 @@
-# velodyne_monitor
+# autoware_velodyne_monitor
 
 ## Purpose
 
diff --git a/system/velodyne_monitor/config/HDL-32E.param.yaml b/system/autoware_velodyne_monitor/config/HDL-32E.param.yaml
similarity index 100%
rename from system/velodyne_monitor/config/HDL-32E.param.yaml
rename to system/autoware_velodyne_monitor/config/HDL-32E.param.yaml
diff --git a/system/velodyne_monitor/config/VLP-16.param.yaml b/system/autoware_velodyne_monitor/config/VLP-16.param.yaml
similarity index 100%
rename from system/velodyne_monitor/config/VLP-16.param.yaml
rename to system/autoware_velodyne_monitor/config/VLP-16.param.yaml
diff --git a/system/velodyne_monitor/config/VLP-32C.param.yaml b/system/autoware_velodyne_monitor/config/VLP-32C.param.yaml
similarity index 100%
rename from system/velodyne_monitor/config/VLP-32C.param.yaml
rename to system/autoware_velodyne_monitor/config/VLP-32C.param.yaml
diff --git a/system/velodyne_monitor/config/VLS-128.param.yaml b/system/autoware_velodyne_monitor/config/VLS-128.param.yaml
similarity index 100%
rename from system/velodyne_monitor/config/VLS-128.param.yaml
rename to system/autoware_velodyne_monitor/config/VLS-128.param.yaml
diff --git a/system/velodyne_monitor/config/Velarray_M1600.param.yaml b/system/autoware_velodyne_monitor/config/Velarray_M1600.param.yaml
similarity index 100%
rename from system/velodyne_monitor/config/Velarray_M1600.param.yaml
rename to system/autoware_velodyne_monitor/config/Velarray_M1600.param.yaml
diff --git a/system/velodyne_monitor/include/velodyne_monitor/velodyne_monitor.hpp b/system/autoware_velodyne_monitor/include/autoware/velodyne_monitor/velodyne_monitor.hpp
similarity index 94%
rename from system/velodyne_monitor/include/velodyne_monitor/velodyne_monitor.hpp
rename to system/autoware_velodyne_monitor/include/autoware/velodyne_monitor/velodyne_monitor.hpp
index 841199a845bbf..092dcb24d7ae9 100644
--- a/system/velodyne_monitor/include/velodyne_monitor/velodyne_monitor.hpp
+++ b/system/autoware_velodyne_monitor/include/autoware/velodyne_monitor/velodyne_monitor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
-#define VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
+#ifndef AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
+#define AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
 
 /**
  * @file velodyne_monitor.hpp
@@ -31,6 +31,9 @@
 // Include after diagnostic_updater because it causes errors
 #include <cpprest/http_client.h>
 
+namespace autoware::velodyne_monitor
+{
+
 namespace http = web::http;
 namespace client = web::http::client;
 namespace json = web::json;
@@ -115,4 +118,6 @@ class VelodyneMonitor : public rclcpp::Node
     {DiagStatus::OK, "OK"}, {DiagStatus::WARN, "RPM low"}, {DiagStatus::ERROR, "RPM too low"}};
 };
 
-#endif  // VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
+}  // namespace autoware::velodyne_monitor
+
+#endif  // AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
diff --git a/system/velodyne_monitor/launch/velodyne_monitor.launch.xml b/system/autoware_velodyne_monitor/launch/velodyne_monitor.launch.xml
similarity index 57%
rename from system/velodyne_monitor/launch/velodyne_monitor.launch.xml
rename to system/autoware_velodyne_monitor/launch/velodyne_monitor.launch.xml
index 0dbbc39a9f9e4..3d72d4f1f077e 100644
--- a/system/velodyne_monitor/launch/velodyne_monitor.launch.xml
+++ b/system/autoware_velodyne_monitor/launch/velodyne_monitor.launch.xml
@@ -1,8 +1,8 @@
 <launch>
-  <arg name="velodyne_monitor_param_file" default="$(find-pkg-share velodyne_monitor)/config/VLP-16.param.yaml"/>
+  <arg name="velodyne_monitor_param_file" default="$(find-pkg-share autoware_velodyne_monitor)/config/VLP-16.param.yaml"/>
   <arg name="ip_address" default="192.168.1.201"/>
 
-  <node pkg="velodyne_monitor" exec="velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
+  <node pkg="autoware_velodyne_monitor" exec="autoware_velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
     <param from="$(var velodyne_monitor_param_file)"/>
     <param name="ip_address" value="$(var ip_address)"/>
   </node>
diff --git a/system/velodyne_monitor/package.xml b/system/autoware_velodyne_monitor/package.xml
similarity index 82%
rename from system/velodyne_monitor/package.xml
rename to system/autoware_velodyne_monitor/package.xml
index 0dc8ae5f00a5d..677df93ecde43 100644
--- a/system/velodyne_monitor/package.xml
+++ b/system/autoware_velodyne_monitor/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>velodyne_monitor</name>
+  <name>autoware_velodyne_monitor</name>
   <version>0.40.0</version>
-  <description>The velodyne_monitor package</description>
+  <description>The autoware_velodyne_monitor package</description>
   <maintainer email="fumihito.ito@tier4.jp">Fumihito Ito</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/velodyne_monitor/schema/velodyne_monitor.json b/system/autoware_velodyne_monitor/schema/velodyne_monitor.json
similarity index 100%
rename from system/velodyne_monitor/schema/velodyne_monitor.json
rename to system/autoware_velodyne_monitor/schema/velodyne_monitor.json
diff --git a/system/velodyne_monitor/src/velodyne_monitor.cpp b/system/autoware_velodyne_monitor/src/velodyne_monitor.cpp
similarity index 97%
rename from system/velodyne_monitor/src/velodyne_monitor.cpp
rename to system/autoware_velodyne_monitor/src/velodyne_monitor.cpp
index f9ab3ea14b4c0..83429229b7c4c 100644
--- a/system/velodyne_monitor/src/velodyne_monitor.cpp
+++ b/system/autoware_velodyne_monitor/src/velodyne_monitor.cpp
@@ -17,7 +17,7 @@
  * @brief Velodyne monitor class
  */
 
-#include "velodyne_monitor/velodyne_monitor.hpp"
+#include "autoware/velodyne_monitor/velodyne_monitor.hpp"
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -30,6 +30,9 @@
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 
+namespace autoware::velodyne_monitor
+{
+
 VelodyneMonitor::VelodyneMonitor(const rclcpp::NodeOptions & options)
 : Node("velodyne_monitor", options), updater_(this)
 {
@@ -231,5 +234,7 @@ float VelodyneMonitor::convertTemperature(int raw)
   return std::sqrt(2.1962e6 + (1.8639 - static_cast<float>(raw) * 5.0 / 4096) / 3.88e-6) - 1481.96;
 }
 
+}  // namespace autoware::velodyne_monitor
+
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(VelodyneMonitor)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::velodyne_monitor::VelodyneMonitor)