diff --git a/recipes-ros/geometry-experimental/geometry-experimental.inc b/recipes-ros/geometry-experimental/geometry-experimental.inc
deleted file mode 100644
index bb90da6f95107a164ea8c971e68b1f0c4af0aa14..0000000000000000000000000000000000000000
--- a/recipes-ros/geometry-experimental/geometry-experimental.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "c2d1473770d47d5f3354e183b3defb6a"
-SRC_URI[sha256sum] = "430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3"
-
-S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
-
-inherit catkin
-
-ROS_SPN = "geometry_experimental"
diff --git a/recipes-ros/geometry2/geometry2.inc b/recipes-ros/geometry2/geometry2.inc
new file mode 100644
index 0000000000000000000000000000000000000000..9054ab86b1563a2a4c58734737209672dea1570b
--- /dev/null
+++ b/recipes-ros/geometry2/geometry2.inc
@@ -0,0 +1,9 @@
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "063484906d1c2f1a4ee961680e43b559"
+SRC_URI[sha256sum] = "011b77bc33afea927bab2707ddda585df8de5f1fc6e387081f6bf1ea12d2323b"
+
+S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
+
+inherit catkin
+
+ROS_SPN = "geometry2"
diff --git a/recipes-ros/geometry-experimental/tf2-geometry-msgs_0.5.12.bb b/recipes-ros/geometry2/tf2-geometry-msgs_0.5.12.bb
similarity index 87%
rename from recipes-ros/geometry-experimental/tf2-geometry-msgs_0.5.12.bb
rename to recipes-ros/geometry2/tf2-geometry-msgs_0.5.12.bb
index 70b1ee02f484f609f6f0f6e0c1480b7b370f0fe3..f683c6c16efdf4285ff9c5d1b8744ba0c5d54a6d 100644
--- a/recipes-ros/geometry-experimental/tf2-geometry-msgs_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-geometry-msgs_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 
 DEPENDS = "actionlib-msgs geometry-msgs tf2-ros tf2 orocos-kdl"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-kdl_0.5.12.bb b/recipes-ros/geometry2/tf2-kdl_0.5.12.bb
similarity index 86%
rename from recipes-ros/geometry-experimental/tf2-kdl_0.5.12.bb
rename to recipes-ros/geometry2/tf2-kdl_0.5.12.bb
index c4f242365b74663c8223a4bffb0b8923ef6e0bc1..f96fa524d0ce3de0c8ecf7a82ea42e0e618cbcec 100644
--- a/recipes-ros/geometry-experimental/tf2-kdl_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-kdl_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 
 DEPENDS = "libeigen orocos-kdl tf2 tf2-ros"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-msgs_0.5.12.bb b/recipes-ros/geometry2/tf2-msgs_0.5.12.bb
similarity index 85%
rename from recipes-ros/geometry-experimental/tf2-msgs_0.5.12.bb
rename to recipes-ros/geometry2/tf2-msgs_0.5.12.bb
index 61eef2d1722b6269fde2389d13d0575e174b23c7..b26d764a6e07a6fd7c5399f7ad1d36cb85b88e84 100644
--- a/recipes-ros/geometry-experimental/tf2-msgs_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-msgs_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de
 
 DEPENDS = "actionlib-msgs geometry-msgs"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-py_0.5.12.bb b/recipes-ros/geometry2/tf2-py_0.5.12.bb
similarity index 87%
rename from recipes-ros/geometry-experimental/tf2-py_0.5.12.bb
rename to recipes-ros/geometry2/tf2-py_0.5.12.bb
index 75b6f2fb7a1940776b007d4639d2f7744f1a70a6..1b7ec2ab4800543de1890a12317500f8cc75bc6f 100644
--- a/recipes-ros/geometry-experimental/tf2-py_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-py_0.5.12.bb
@@ -9,4 +9,4 @@ EXTRA_OECMAKE += "\
     -DCMAKE_SKIP_RPATH=ON \
     "
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-ros_0.5.12.bb b/recipes-ros/geometry2/tf2-ros_0.5.12.bb
similarity index 89%
rename from recipes-ros/geometry-experimental/tf2-ros_0.5.12.bb
rename to recipes-ros/geometry2/tf2-ros_0.5.12.bb
index 00cc1c08ef6e61a07b988af672e3ad86888d3bb5..6468cf3aabbed2190b240c1fab62441c17b8ea5e 100644
--- a/recipes-ros/geometry-experimental/tf2-ros_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-ros_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de
 
 DEPENDS = "actionlib message-filters rosgraph tf2 tf2-py"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-sensor-msgs_0.5.12.bb b/recipes-ros/geometry2/tf2-sensor-msgs_0.5.12.bb
similarity index 88%
rename from recipes-ros/geometry-experimental/tf2-sensor-msgs_0.5.12.bb
rename to recipes-ros/geometry2/tf2-sensor-msgs_0.5.12.bb
index 5ee6907da5a16ab317d021e4d82d09e816120785..1f5559636d95eee78f91c452847fe854b8f894b3 100644
--- a/recipes-ros/geometry-experimental/tf2-sensor-msgs_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-sensor-msgs_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 
 DEPENDS = "cmake-modules libeigen sensor-msgs tf2-ros tf2"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2-tools_0.5.12.bb b/recipes-ros/geometry2/tf2-tools_0.5.12.bb
similarity index 85%
rename from recipes-ros/geometry-experimental/tf2-tools_0.5.12.bb
rename to recipes-ros/geometry2/tf2-tools_0.5.12.bb
index 109d0bf660653eb1f67d219f25b63659a344cc01..afff54be46ddf4ac64f1d8a6eeeb156f65e6919b 100644
--- a/recipes-ros/geometry-experimental/tf2-tools_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2-tools_0.5.12.bb
@@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc
 
 DEPENDS = "tf2-msgs tf2 tf2-ros"
 
-require geometry-experimental.inc
+require geometry2.inc
diff --git a/recipes-ros/geometry-experimental/tf2_0.5.12.bb b/recipes-ros/geometry2/tf2_0.5.12.bb
similarity index 90%
rename from recipes-ros/geometry-experimental/tf2_0.5.12.bb
rename to recipes-ros/geometry2/tf2_0.5.12.bb
index b025036d559ffcea194e49f2d5aa22382907e08f..bd9b4ed8a81c266bea2c4c82f7d8c9907fe1482f 100644
--- a/recipes-ros/geometry-experimental/tf2_0.5.12.bb
+++ b/recipes-ros/geometry2/tf2_0.5.12.bb
@@ -6,4 +6,4 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9de
 
 DEPENDS = "tf2-msgs geometry-msgs console-bridge rospy"
 
-require geometry-experimental.inc
+require geometry2.inc