diff --git a/nav2_msgs/CMakeLists.txt b/nav2_msgs/CMakeLists.txt
index f9afb41e09e..37692d660da 100644
--- a/nav2_msgs/CMakeLists.txt
+++ b/nav2_msgs/CMakeLists.txt
@@ -32,8 +32,8 @@ rosidl_generate_interfaces(${PROJECT_NAME}
   "msg/ParticleCloud.msg"
   "msg/MissedWaypoint.msg"
   "srv/GetCosts.srv"
-  "msg/PolygonVO.msg"
-  "msg/CircleVO.msg"
+  "msg/PolygonObject.msg"
+  "msg/CircleObject.msg"
   "srv/GetCostmap.srv"
   "srv/IsPathValid.srv"
   "srv/ClearCostmapExceptRegion.srv"
diff --git a/nav2_util/test/regression/CMakeLists.txt b/nav2_util/test/regression/CMakeLists.txt
index 033741a19c4..c819a3a1d05 100644
--- a/nav2_util/test/regression/CMakeLists.txt
+++ b/nav2_util/test/regression/CMakeLists.txt
@@ -1,2 +1,3 @@
 # Bresenham2D corner cases test
 ament_add_gtest(map_bresenham_2d map_bresenham_2d.cpp)
+target_link_libraries(map_bresenham_2d ${library_name})
\ No newline at end of file