diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 83a0d3e9c..1ee865b53 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -112,7 +112,7 @@ jobs:
 
   doc:
     # https://devblogs.microsoft.com/cppblog/clear-functional-c-documentation-with-sphinx-breathe-doxygen-cmake
-    if: github.repository_owner == 'ros-planning'
+    if: github.repository_owner == 'moveit'
     runs-on: ubuntu-latest
     needs: ici
     container:
@@ -150,7 +150,7 @@ jobs:
 
   # Deployment job
   deploy:
-    if: github.repository_owner == 'ros-planning' && github.ref == 'refs/heads/master'
+    if: github.repository_owner == 'moveit' && github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     needs: doc
     environment:
diff --git a/README.md b/README.md
index 7063027ef..39cda41bd 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ This repository provides the following branches:
 
 ## Tutorial
 
-We provide a tutorial for a pick-and-place pipeline without bells & whistles [as part of the MoveIt tutorials](https://ros-planning.github.io/moveit_tutorials/doc/moveit_task_constructor/moveit_task_constructor_tutorial.html).
+We provide a tutorial for a pick-and-place pipeline without bells & whistles [as part of the MoveIt tutorials](https://moveit.github.io/moveit_tutorials/doc/moveit_task_constructor/moveit_task_constructor_tutorial.html).
 
 ## Roadmap
 
diff --git a/core/package.xml b/core/package.xml
index dae50cb97..20c9fd8ae 100644
--- a/core/package.xml
+++ b/core/package.xml
@@ -3,9 +3,9 @@
 	<version>0.1.3</version>
 	<description>MoveIt Task Pipeline</description>
 
-	<url type="website">https://github.com/ros-planning/moveit_task_constructor</url>
-	<url type="repository">https://github.com/ros-planning/moveit_task_constructor</url>
-	<url type="bugtracker">https://github.com/ros-planning/moveit_task_constructor/issues</url>
+	<url type="website">https://github.com/moveit/moveit_task_constructor</url>
+	<url type="repository">https://github.com/moveit/moveit_task_constructor</url>
+	<url type="bugtracker">https://github.com/moveit/moveit_task_constructor/issues</url>
 
 	<license>BSD</license>
 	<maintainer email="me@v4hn.de">Michael Goerner</maintainer>
diff --git a/core/src/container.cpp b/core/src/container.cpp
index f0feeaf91..b4840d491 100644
--- a/core/src/container.cpp
+++ b/core/src/container.cpp
@@ -211,7 +211,7 @@ void ContainerBasePrivate::setStatus(const Stage* creator, const InterfaceState*
 	// we mark the first state with ARMED and all other states down the tree with PRUNED.
 	// This allows us to re-enable the ARMED state, but not the PRUNED states,
 	// when new states arrive in a Connecting stage.
-	// For details, https://github.com/ros-planning/moveit_task_constructor/pull/309#issuecomment-974636202
+	// For details, https://github.com/moveit/moveit_task_constructor/pull/309#issuecomment-974636202
 	if (status == InterfaceState::Status::ARMED)
 		status = InterfaceState::Status::PRUNED;  // only the first state is marked as ARMED
 
diff --git a/core/src/stage.cpp b/core/src/stage.cpp
index 5eec3e7fc..97c99826b 100644
--- a/core/src/stage.cpp
+++ b/core/src/stage.cpp
@@ -809,7 +809,7 @@ void ConnectingPrivate::newState(Interface::iterator it, Interface::UpdateFlags
 				continue;
 
 			// re-enable the opposing state oit (and its associated solution branch) if its status is ARMED
-			// https://github.com/ros-planning/moveit_task_constructor/pull/309#issuecomment-974636202
+			// https://github.com/moveit/moveit_task_constructor/pull/309#issuecomment-974636202
 			if (oit->priority().status() == InterfaceState::Status::ARMED) {
 				oit_to_enable.push_back(oit);
 				have_enabled_opposites = true;
diff --git a/core/test/test_serial.cpp b/core/test/test_serial.cpp
index aefcba94a..ded84eb95 100644
--- a/core/test/test_serial.cpp
+++ b/core/test/test_serial.cpp
@@ -46,7 +46,7 @@ struct TestBase : public TaskTestBase
 };
 
 using ConnectConnect = TestBase;
-// https://github.com/ros-planning/moveit_task_constructor/issues/182
+// https://github.com/moveit/moveit_task_constructor/issues/182
 TEST_F(ConnectConnect, SuccSucc) {
 	add(t, new GeneratorMockup({ 1.0, 2.0, 3.0 }));
 	add(t, new Connect());
@@ -58,7 +58,7 @@ TEST_F(ConnectConnect, SuccSucc) {
 	EXPECT_COSTS(t.solutions(), ::testing::ElementsAre(11, 12, 13, 21, 22, 23));
 }
 
-// https://github.com/ros-planning/moveit_task_constructor/issues/218
+// https://github.com/moveit/moveit_task_constructor/issues/218
 TEST_F(ConnectConnect, FailSucc) {
 	add(t, new GeneratorMockup());
 	add(t, new Connect({ INF }, true));
@@ -70,7 +70,7 @@ TEST_F(ConnectConnect, FailSucc) {
 	EXPECT_FALSE(t.plan());
 }
 
-// https://github.com/ros-planning/moveit_task_constructor/issues/485#issuecomment-1760606116
+// https://github.com/moveit/moveit_task_constructor/issues/485#issuecomment-1760606116
 TEST_F(ConnectConnect, UniqueEnumeration) {
 	add(t, new GeneratorMockup({ 1.0, 2.0, 3.0 }));
 	auto con1 = add(t, new ConnectMockup());