diff --git a/recipes-ros/ros-mavlink/ros-mavlink/0001-do-not-require-python2.patch b/recipes-ros/mavlink/mavlink/0001-do-not-require-python2.patch
similarity index 100%
rename from recipes-ros/ros-mavlink/ros-mavlink/0001-do-not-require-python2.patch
rename to recipes-ros/mavlink/mavlink/0001-do-not-require-python2.patch
diff --git a/recipes-ros/ros-mavlink/ros-mavlink/0002-provide-path-to-find-mavgen_c.patch b/recipes-ros/mavlink/mavlink/0002-provide-path-to-find-mavgen_c.patch
similarity index 100%
rename from recipes-ros/ros-mavlink/ros-mavlink/0002-provide-path-to-find-mavgen_c.patch
rename to recipes-ros/mavlink/mavlink/0002-provide-path-to-find-mavgen_c.patch
diff --git a/recipes-ros/ros-mavlink/ros-mavlink_git.bb b/recipes-ros/mavlink/mavlink_git.bb
similarity index 100%
rename from recipes-ros/ros-mavlink/ros-mavlink_git.bb
rename to recipes-ros/mavlink/mavlink_git.bb
diff --git a/recipes-ros/mavros/libmavconn_0.18.7.bb b/recipes-ros/mavros/libmavconn_0.18.7.bb
index f4a6c27..dfb5659 100644
--- a/recipes-ros/mavros/libmavconn_0.18.7.bb
+++ b/recipes-ros/mavros/libmavconn_0.18.7.bb
@@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=17;md5=9b511d4c606b1
 
 DEPENDS = " \
     boost \
-    ros-mavlink \
+    mavlink \
     console-bridge \
 "
 
 RDEPENDS_${PN} = " \
     boost \
-    ros-mavlink \
+    mavlink \
     console-bridge \
 "
 
diff --git a/recipes-ros/mavros/mavros_0.18.7.bb b/recipes-ros/mavros/mavros_0.18.7.bb
index 74ad7d3..e941aaa 100644
--- a/recipes-ros/mavros/mavros_0.18.7.bb
+++ b/recipes-ros/mavros/mavros_0.18.7.bb
@@ -8,12 +8,12 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=14;md5=9b511d4c606b1
 DEPENDS = " \
     boost \
     libeigen \
-    ros-mavlink \
+    mavlink \
 "
 
 RDEPENDS_${PN} = " \
     boost \
-    ros-mavlink \
+    mavlink \
 "
 
 # ROS packages dependencies
diff --git a/recipes-ros/packagegroups/packagegroup-ros-world.bb b/recipes-ros/packagegroups/packagegroup-ros-world.bb
index 4b55c36..02831ec 100644
--- a/recipes-ros/packagegroups/packagegroup-ros-world.bb
+++ b/recipes-ros/packagegroups/packagegroup-ros-world.bb
@@ -187,7 +187,7 @@ RDEPENDS_${PN} = "\
     libmavconn \
     mavros \
     mavros-extras \
-    ros-mavlink \
+    mavlink \
 "
 
 # urdfdom-headers is an empty deploy package.