diff --git a/nav2_bringup/launch/nav2_bringup_launch.py b/nav2_bringup/launch/nav2_bringup_launch.py
index 079f665f77763107baccc278d1710d563769f147..9ea91bc0802be4fa6e171a672fb5b9479a6d3830 100644
--- a/nav2_bringup/launch/nav2_bringup_launch.py
+++ b/nav2_bringup/launch/nav2_bringup_launch.py
@@ -91,7 +91,7 @@ def generate_launch_description():
                     {'autostart': autostart},
                     {'node_names': ['map_server',
                                     'amcl',
-                                    'dwb_controller',
+                                    'controller_server',
                                     'planner_server',
                                     'bt_navigator']}])
 
diff --git a/nav2_system_tests/src/updown/nav2_params.yaml b/nav2_system_tests/src/updown/nav2_params.yaml
index 8f4f880b19dec32093631d54f3267e3a8c21e172..2cebab8065f327c111adb09cfef2c49e733bdd0c 100644
--- a/nav2_system_tests/src/updown/nav2_params.yaml
+++ b/nav2_system_tests/src/updown/nav2_params.yaml
@@ -92,7 +92,7 @@ nav2_controller:
     GoalDist.scale: 24.0
     RotateToGoal.scale: 32.0
 
-dwb_controller_rclcpp_node:
+nav2_controller_rclcpp_node:
   ros__parameters:
     use_sim_time: True