diff --git a/aip_x1_launch/package.xml b/aip_x1_launch/package.xml
index 83d15cbe..fd4803a0 100644
--- a/aip_x1_launch/package.xml
+++ b/aip_x1_launch/package.xml
@@ -17,13 +17,13 @@
   <exec_depend>autoware_imu_corrector</exec_depend>
   <exec_depend>autoware_occupancy_grid_map_outlier_filter</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
+  <exec_depend>autoware_topic_state_monitor</exec_depend>
   <exec_depend>autoware_vehicle_velocity_converter</exec_depend>
   <exec_depend>common_sensor_launch</exec_depend>
   <exec_depend>individual_params</exec_depend>
   <exec_depend>rclcpp_components</exec_depend>
   <exec_depend>ros2_socketcan</exec_depend>
   <exec_depend>tamagawa_imu_driver</exec_depend>
-  <exec_depend>topic_state_monitor</exec_depend>
 
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>
diff --git a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py
index 0eafa9e0..276068d1 100644
--- a/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py
+++ b/aip_x2_gen2_launch/launch/topic_state_monitor.launch.py
@@ -20,7 +20,7 @@
 def generate_launch_description():
     # GNSS topic monitor
     gnss_topic_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_gnss_pose",
         parameters=[
@@ -40,7 +40,7 @@ def generate_launch_description():
 
     # IMU topic monitor
     imu_topic_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_imu_data",
         parameters=[
@@ -60,7 +60,7 @@ def generate_launch_description():
 
     # Radar topic monitors
     radar_front_center_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_front_center",
         parameters=[
@@ -79,7 +79,7 @@ def generate_launch_description():
     )
 
     radar_front_left_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_front_left",
         parameters=[
@@ -98,7 +98,7 @@ def generate_launch_description():
     )
 
     radar_front_right_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_front_right",
         parameters=[
@@ -117,7 +117,7 @@ def generate_launch_description():
     )
 
     radar_rear_center_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_rear_center",
         parameters=[
@@ -136,7 +136,7 @@ def generate_launch_description():
     )
 
     radar_rear_left_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_rear_left",
         parameters=[
@@ -155,7 +155,7 @@ def generate_launch_description():
     )
 
     radar_rear_right_monitor = ComposableNode(
-        package="topic_state_monitor",
+        package="autoware_topic_state_monitor",
         plugin="topic_state_monitor::TopicStateMonitorNode",
         name="topic_state_monitor_radar_rear_right",
         parameters=[