diff --git a/nav2_costmap_2d/src/costmap_2d_publisher.cpp b/nav2_costmap_2d/src/costmap_2d_publisher.cpp
index 1eeedef3ce7704cf06244ec477ff3ec7b9d2eeeb..32499c8b4afa7f01408dfeaa5c3142e8fd0d698d 100644
--- a/nav2_costmap_2d/src/costmap_2d_publisher.cpp
+++ b/nav2_costmap_2d/src/costmap_2d_publisher.cpp
@@ -227,7 +227,7 @@ Costmap2DPublisher::costmap_service_callback(
   response->map.metadata.size_x = size_x;
   response->map.metadata.size_y = size_y;
   response->map.metadata.resolution = costmap_->getResolution();
-  response->map.metadata.layer = "Master";
+  response->map.metadata.layer = "master";
   response->map.metadata.map_load_time = current_time;
   response->map.metadata.update_time = current_time;
   response->map.metadata.origin.position.x = costmap_->getOriginX();
diff --git a/nav2_util/src/costmap.cpp b/nav2_util/src/costmap.cpp
index 59925e838bf57419c949210a6d4e7d0f01577f7b..beb24ce08655f3b6cd7d9b3824c70a09e3bd0c67 100644
--- a/nav2_util/src/costmap.cpp
+++ b/nav2_util/src/costmap.cpp
@@ -87,7 +87,7 @@ void Costmap::set_test_costmap(const TestCostmap & testCostmapType)
 {
   costmap_properties_.map_load_time = node_->now();
   costmap_properties_.update_time = node_->now();
-  costmap_properties_.layer = "Master";
+  costmap_properties_.layer = "master";
   costmap_properties_.resolution = 1;
   costmap_properties_.size_x = 10;
   costmap_properties_.size_y = 10;