diff --git a/recipes-ros2/common-interfaces/ros2-actionlib-msgs_git.bb b/v1-recipes-ros2/common-interfaces/actionlib-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-actionlib-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/actionlib-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/common-interfaces.inc b/v1-recipes-ros2/common-interfaces/common-interfaces.inc
similarity index 100%
rename from recipes-ros2/common-interfaces/common-interfaces.inc
rename to v1-recipes-ros2/common-interfaces/common-interfaces.inc
diff --git a/recipes-ros2/common-interfaces/ros2-diagnostic-msgs_git.bb b/v1-recipes-ros2/common-interfaces/diagnostic-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-diagnostic-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/diagnostic-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-geometry-msgs_git.bb b/v1-recipes-ros2/common-interfaces/geometry-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-geometry-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/geometry-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-nav-msgs_git.bb b/v1-recipes-ros2/common-interfaces/nav-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-nav-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/nav-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-sensor-msgs_git.bb b/v1-recipes-ros2/common-interfaces/sensor-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-sensor-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/sensor-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-shape-msgs_git.bb b/v1-recipes-ros2/common-interfaces/shape-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-shape-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/shape-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-std-msgs_git.bb b/v1-recipes-ros2/common-interfaces/std-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-std-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/std-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-std-srvs_git.bb b/v1-recipes-ros2/common-interfaces/std-srvs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-std-srvs_git.bb
rename to v1-recipes-ros2/common-interfaces/std-srvs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-stereo-msgs_git.bb b/v1-recipes-ros2/common-interfaces/stereo-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-stereo-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/stereo-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-trajectory-msgs_git.bb b/v1-recipes-ros2/common-interfaces/trajectory-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-trajectory-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/trajectory-msgs_git.bb
diff --git a/recipes-ros2/common-interfaces/ros2-visualization-msgs_git.bb b/v1-recipes-ros2/common-interfaces/visualization-msgs_git.bb
similarity index 100%
rename from recipes-ros2/common-interfaces/ros2-visualization-msgs_git.bb
rename to v1-recipes-ros2/common-interfaces/visualization-msgs_git.bb