diff --git a/perception/detected_object_feature_remover/CMakeLists.txt b/perception/detected_object_feature_remover/CMakeLists.txt
index b3dd3c35e19d5..e0ff35d75e64a 100644
--- a/perception/detected_object_feature_remover/CMakeLists.txt
+++ b/perception/detected_object_feature_remover/CMakeLists.txt
@@ -4,13 +4,13 @@ project(detected_object_feature_remover)
find_package(autoware_cmake REQUIRED)
autoware_package()
-ament_auto_add_library(detected_object_feature_remover_node SHARED
- src/detected_object_feature_remover.cpp
+ament_auto_add_library(${PROJECT_NAME} SHARED
+ src/detected_object_feature_remover_node.cpp
)
-rclcpp_components_register_node(detected_object_feature_remover_node
- PLUGIN "detected_object_feature_remover::DetectedObjectFeatureRemover"
- EXECUTABLE detected_object_feature_remover
+rclcpp_components_register_node(${PROJECT_NAME}
+ PLUGIN "autoware::detected_object_feature_remover::DetectedObjectFeatureRemover"
+ EXECUTABLE detected_object_feature_remover_node
)
ament_auto_package(
diff --git a/perception/detected_object_feature_remover/launch/detected_object_feature_remover.launch.xml b/perception/detected_object_feature_remover/launch/detected_object_feature_remover.launch.xml
index 2e7fa4605d656..d86d75ce297be 100644
--- a/perception/detected_object_feature_remover/launch/detected_object_feature_remover.launch.xml
+++ b/perception/detected_object_feature_remover/launch/detected_object_feature_remover.launch.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/perception/detected_object_feature_remover/src/detected_object_feature_remover.cpp b/perception/detected_object_feature_remover/src/detected_object_feature_remover_node.cpp
similarity index 86%
rename from perception/detected_object_feature_remover/src/detected_object_feature_remover.cpp
rename to perception/detected_object_feature_remover/src/detected_object_feature_remover_node.cpp
index 3fe9e6fde8683..47fe67de9d9aa 100644
--- a/perception/detected_object_feature_remover/src/detected_object_feature_remover.cpp
+++ b/perception/detected_object_feature_remover/src/detected_object_feature_remover_node.cpp
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include
+#include "detected_object_feature_remover_node.hpp"
-namespace detected_object_feature_remover
+namespace autoware::detected_object_feature_remover
{
DetectedObjectFeatureRemover::DetectedObjectFeatureRemover(const rclcpp::NodeOptions & node_options)
: Node("detected_object_feature_remover", node_options)
@@ -45,7 +45,8 @@ void DetectedObjectFeatureRemover::convert(
}
}
-} // namespace detected_object_feature_remover
+} // namespace autoware::detected_object_feature_remover
#include
-RCLCPP_COMPONENTS_REGISTER_NODE(detected_object_feature_remover::DetectedObjectFeatureRemover)
+RCLCPP_COMPONENTS_REGISTER_NODE(
+ autoware::detected_object_feature_remover::DetectedObjectFeatureRemover)
diff --git a/perception/detected_object_feature_remover/include/detected_object_feature_remover/detected_object_feature_remover.hpp b/perception/detected_object_feature_remover/src/detected_object_feature_remover_node.hpp
similarity index 71%
rename from perception/detected_object_feature_remover/include/detected_object_feature_remover/detected_object_feature_remover.hpp
rename to perception/detected_object_feature_remover/src/detected_object_feature_remover_node.hpp
index 02e4c9c3ca29a..2877d38259f83 100644
--- a/perception/detected_object_feature_remover/include/detected_object_feature_remover/detected_object_feature_remover.hpp
+++ b/perception/detected_object_feature_remover/src/detected_object_feature_remover_node.hpp
@@ -12,18 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#ifndef DETECTED_OBJECT_FEATURE_REMOVER__DETECTED_OBJECT_FEATURE_REMOVER_HPP_
-#define DETECTED_OBJECT_FEATURE_REMOVER__DETECTED_OBJECT_FEATURE_REMOVER_HPP_
+#ifndef DETECTED_OBJECT_FEATURE_REMOVER_NODE_HPP_
+#define DETECTED_OBJECT_FEATURE_REMOVER_NODE_HPP_
+
+#include "autoware/universe_utils/ros/published_time_publisher.hpp"
-#include
#include
-#include
-#include
+#include "autoware_perception_msgs/msg/detected_objects.hpp"
+#include "tier4_perception_msgs/msg/detected_objects_with_feature.hpp"
#include
-namespace detected_object_feature_remover
+namespace autoware::detected_object_feature_remover
{
using autoware_perception_msgs::msg::DetectedObjects;
using tier4_perception_msgs::msg::DetectedObjectsWithFeature;
@@ -41,6 +42,6 @@ class DetectedObjectFeatureRemover : public rclcpp::Node
void convert(const DetectedObjectsWithFeature & objs_with_feature, DetectedObjects & objs);
};
-} // namespace detected_object_feature_remover
+} // namespace autoware::detected_object_feature_remover
-#endif // DETECTED_OBJECT_FEATURE_REMOVER__DETECTED_OBJECT_FEATURE_REMOVER_HPP_
+#endif // DETECTED_OBJECT_FEATURE_REMOVER_NODE_HPP_