diff --git a/src/map_saver.cpp b/src/map_saver.cpp
index d6938675e..ab710a82d 100644
--- a/src/map_saver.cpp
+++ b/src/map_saver.cpp
@@ -60,11 +60,11 @@ bool MapSaver::saveMapCallback(
   if (name != "") {
     RCLCPP_INFO(node_->get_logger(),
       "SlamToolbox: Saving map as %s.", name.c_str());
-    int rc = system(("ros2 run nav2_map_server map_saver -f " + name).c_str());
+    int rc = system(("ros2 run nav2_map_server map_saver_cli -f " + name).c_str());
   } else {
     RCLCPP_INFO(node_->get_logger(),
       "SlamToolbox: Saving map in current directory.");
-    int rc = system("ros2 run nav2_map_server map_saver");
+    int rc = system("ros2 run nav2_map_server map_saver_cli");
   }
 
   rclcpp::sleep_for(std::chrono::seconds(1));