diff --git a/common/autoware_component_interface_tools/CMakeLists.txt b/common/autoware_component_interface_tools/CMakeLists.txt
index e51db41ca0ea2..ce4af924f4c28 100644
--- a/common/autoware_component_interface_tools/CMakeLists.txt
+++ b/common/autoware_component_interface_tools/CMakeLists.txt
@@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "ServiceLogChecker"
+  PLUGIN "autoware::component_interface_tools::ServiceLogChecker"
   EXECUTABLE service_log_checker_node
 )
 
diff --git a/common/autoware_component_interface_tools/src/service_log_checker.cpp b/common/autoware_component_interface_tools/src/service_log_checker.cpp
index 18f90af5737d2..ce413da5c1987 100644
--- a/common/autoware_component_interface_tools/src/service_log_checker.cpp
+++ b/common/autoware_component_interface_tools/src/service_log_checker.cpp
@@ -22,6 +22,8 @@
 #define FMT_HEADER_ONLY
 #include <fmt/format.h>
 
+namespace autoware::component_interface_tools
+{
 ServiceLogChecker::ServiceLogChecker(const rclcpp::NodeOptions & options)
 : Node("service_log_checker", options), diagnostics_(this)
 {
@@ -98,6 +100,6 @@ void ServiceLogChecker::update_diagnostics(diagnostic_updater::DiagnosticStatusW
     stat.summary(DiagnosticStatus::ERROR, "ERROR");
   }
 }
-
+}  // namespace autoware::component_interface_tools
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(ServiceLogChecker)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::component_interface_tools::ServiceLogChecker)
diff --git a/common/autoware_component_interface_tools/src/service_log_checker.hpp b/common/autoware_component_interface_tools/src/service_log_checker.hpp
index 9579753dfd900..f6077d238e2e1 100644
--- a/common/autoware_component_interface_tools/src/service_log_checker.hpp
+++ b/common/autoware_component_interface_tools/src/service_log_checker.hpp
@@ -23,6 +23,8 @@
 #include <string>
 #include <unordered_map>
 
+namespace autoware::component_interface_tools
+{
 class ServiceLogChecker : public rclcpp::Node
 {
 public:
@@ -38,5 +40,5 @@ class ServiceLogChecker : public rclcpp::Node
   void update_diagnostics(diagnostic_updater::DiagnosticStatusWrapper & stat);
   std::unordered_map<std::string, std::string> errors_;
 };
-
+}  // namespace autoware::component_interface_tools
 #endif  // SERVICE_LOG_CHECKER_HPP_
diff --git a/common/autoware_traffic_light_recognition_marker_publisher/CMakeLists.txt b/common/autoware_traffic_light_recognition_marker_publisher/CMakeLists.txt
index 281a6fc7dc802..1babe2e464fec 100644
--- a/common/autoware_traffic_light_recognition_marker_publisher/CMakeLists.txt
+++ b/common/autoware_traffic_light_recognition_marker_publisher/CMakeLists.txt
@@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "TrafficLightRecognitionMarkerPublisher"
+  PLUGIN "autoware::traffic_light_recognition_marker_publisher::TrafficLightRecognitionMarkerPublisher"
   EXECUTABLE ${PROJECT_NAME}_node
 )
 
diff --git a/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.cpp b/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.cpp
index 5d887a2296137..e9189a6c84c2b 100644
--- a/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.cpp
+++ b/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.cpp
@@ -20,6 +20,8 @@
 #include <utility>
 #include <vector>
 
+namespace autoware::traffic_light_recognition_marker_publisher
+{
 TrafficLightRecognitionMarkerPublisher::TrafficLightRecognitionMarkerPublisher(
   const rclcpp::NodeOptions & options)
 : Node("traffic_light_recognition_marker_publisher", options)
@@ -159,6 +161,8 @@ std_msgs::msg::ColorRGBA TrafficLightRecognitionMarkerPublisher::getTrafficLight
 
   return c;  // white
 }
+}  // namespace autoware::traffic_light_recognition_marker_publisher
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(TrafficLightRecognitionMarkerPublisher)
+RCLCPP_COMPONENTS_REGISTER_NODE(
+  autoware::traffic_light_recognition_marker_publisher::TrafficLightRecognitionMarkerPublisher)
diff --git a/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp b/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp
index 14bb0e39628f9..b4fa388fe0167 100644
--- a/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp
+++ b/common/autoware_traffic_light_recognition_marker_publisher/src/traffic_light_recognition_marker_publisher.hpp
@@ -29,6 +29,8 @@
 #include <map>
 #include <string>
 
+namespace autoware::traffic_light_recognition_marker_publisher
+{
 class TrafficLightRecognitionMarkerPublisher : public rclcpp::Node
 {
 public:
@@ -58,5 +60,6 @@ class TrafficLightRecognitionMarkerPublisher : public rclcpp::Node
   bool is_map_ready_ = false;
   int32_t marker_id = 0;
 };
+}  // namespace autoware::traffic_light_recognition_marker_publisher
 
 #endif  // TRAFFIC_LIGHT_RECOGNITION_MARKER_PUBLISHER_HPP_