diff --git a/control/autoware_joy_controller/launch/joy_controller.launch.xml b/control/autoware_joy_controller/launch/joy_controller.launch.xml
index 87dfaba6d6573..02220f0026cea 100644
--- a/control/autoware_joy_controller/launch/joy_controller.launch.xml
+++ b/control/autoware_joy_controller/launch/joy_controller.launch.xml
@@ -12,9 +12,9 @@
   <arg name="output_gate_mode" default="/control/gate_mode_cmd"/>
   <arg name="output_vehicle_engage" default="/vehicle/engage"/>
 
-  <arg name="config_file" default="$(find-pkg-share autoware_joy_controller)/config/autoware_joy_controller_ds4.param.yaml"/>
+  <arg name="config_file" default="$(find-pkg-share autoware_joy_controller)/config/joy_controller_ds4.param.yaml"/>
 
-  <node pkg="autoware_joy_controller" exec="autoware_joy_controller" name="autoware_joy_controller" output="screen">
+  <node pkg="autoware_joy_controller" exec="autoware_joy_controller" name="joy_controller" output="screen">
     <remap from="input/joy" to="$(var input_joy)"/>
     <remap from="input/odometry" to="$(var input_odometry)"/>
 
diff --git a/control/autoware_joy_controller/launch/joy_controller_param_selection.launch.xml b/control/autoware_joy_controller/launch/joy_controller_param_selection.launch.xml
index 47692a27c0464..3d0aae9a45c4a 100644
--- a/control/autoware_joy_controller/launch/joy_controller_param_selection.launch.xml
+++ b/control/autoware_joy_controller/launch/joy_controller_param_selection.launch.xml
@@ -1,7 +1,7 @@
 <launch>
   <arg name="joy_type" default="ds4" description="options: ds4, g29, p65, xbox"/>
 
-  <include file="$(find-pkg-share autoware_joy_controller)/launch/autoware_joy_controller.launch.xml">
-    <arg name="config_file" value="$(find-pkg-share autoware_joy_controller)/config/autoware_joy_controller_$(var joy_type).param.yaml"/>
+  <include file="$(find-pkg-share autoware_joy_controller)/launch/joy_controller.launch.xml">
+    <arg name="config_file" value="$(find-pkg-share autoware_joy_controller)/config/joy_controller_$(var joy_type).param.yaml"/>
   </include>
 </launch>