diff --git a/recipes-ros/message-generation/message-generation_0.2.9.bb b/recipes-ros/message-generation/message-generation_0.2.9.bb
index 853b131391894836a109b517e054281f8c7d52c1..17aefcbd3fc6cc0b4be6aeb0f9da4c50d0887880 100644
--- a/recipes-ros/message-generation/message-generation_0.2.9.bb
+++ b/recipes-ros/message-generation/message-generation_0.2.9.bb
@@ -9,6 +9,6 @@ SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilena
 SRC_URI[md5sum] = "b3086fbe24cc103f412cb30d83362e36"
 SRC_URI[sha256sum] = "9ce9c5b4e995933c575f2a5cb5c4b042b39913637bca06554092a52c3bb24c12"
 
-S = "${WORKDIR}/${ROS_BPN}-${PV}"
+S = "${WORKDIR}/${ROS_BP}"
 
 inherit catkin
diff --git a/recipes-ros/message-runtime/message-runtime_0.4.11.bb b/recipes-ros/message-runtime/message-runtime_0.4.11.bb
index 1cadd8c652d94bf12a97b953bf934f0182fbef5d..9b030d87b03d34f2a282066902a6f8c32aa14509 100644
--- a/recipes-ros/message-runtime/message-runtime_0.4.11.bb
+++ b/recipes-ros/message-runtime/message-runtime_0.4.11.bb
@@ -9,6 +9,6 @@ SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilena
 SRC_URI[md5sum] = "10a516326a3bf18f5b5b4523c6e53940"
 SRC_URI[sha256sum] = "87f6b56679ea6b90512e2f2d299dd129d361b4a5d167237a9d28ac56ce6f2a36"
 
-S = "${WORKDIR}/${ROS_BPN}-${PV}"
+S = "${WORKDIR}/${ROS_BP}"
 
 inherit catkin
diff --git a/recipes-ros/std-msgs/std-msgs_0.5.7.bb b/recipes-ros/std-msgs/std-msgs_0.5.7.bb
index e636d242b467318559fb6614e12acbe2f6d95fd0..5e3fc1689d609ef57ed57e8c50448e5b2b346d8e 100644
--- a/recipes-ros/std-msgs/std-msgs_0.5.7.bb
+++ b/recipes-ros/std-msgs/std-msgs_0.5.7.bb
@@ -10,6 +10,6 @@ SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilena
 SRC_URI[md5sum] = "ea40e6dd8ea19fe54a2b476358c0ceea"
 SRC_URI[sha256sum] = "acc3d6aed8ede795e4bc6676c1849924699a418769b3d29016a9a2ac08319a56"
 
-S = "${WORKDIR}/${ROS_BPN}-${PV}"
+S = "${WORKDIR}/${ROS_BP}"
 
 inherit catkin