diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60f5ef7..c3f205c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   PACKAGES_LIST: tracetools_analysis ros2trace_analysis
-  BASE_IMAGE_ID: registry.gitlab.com/micro-ros/ros_tracing/ci_base
+  BASE_IMAGE_ID: registry.gitlab.com/ros-tracing/ci_base
   DISTRO: foxy
   ROS2TRACING_BRANCH: foxy
 
@@ -23,7 +23,7 @@ stages:
 before_script:
   - . /root/ws/install/local_setup.sh
   - python3 get_branch.py --check
-  - git clone https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing.git --branch $(python3 get_branch.py)
+  - git clone https://gitlab.com/ros-tracing/ros2_tracing.git --branch $(python3 get_branch.py)
 
 build:
   stage: build_test
@@ -52,4 +52,4 @@ trigger_gen_docs:
     refs:
       - master
       - foxy
-  trigger: micro-ROS/ros_tracing/tracetools_analysis-api
+  trigger: ros-tracing/tracetools_analysis-api
diff --git a/README.md b/README.md
index 99b6f31..caa3dfb 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # tracetools_analysis
 
-[![pipeline status](https://gitlab.com/micro-ROS/ros_tracing/tracetools_analysis/badges/master/pipeline.svg)](https://gitlab.com/micro-ROS/ros_tracing/tracetools_analysis/commits/master)
+[![pipeline status](https://gitlab.com/ros-tracing/tracetools_analysis/badges/master/pipeline.svg)](https://gitlab.com/ros-tracing/tracetools_analysis/commits/master)
 
-Analysis tools for [ROS 2 tracing](https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing).
+Analysis tools for [ROS 2 tracing](https://gitlab.com/ros-tracing/ros2_tracing).
 
 ## Trace analysis
 
-After generating a trace (see [`ros2_tracing`](https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing#tracing)), we can analyze it to extract useful execution data.
+After generating a trace (see [`ros2_tracing`](https://gitlab.com/ros-tracing/ros2_tracing#tracing)), we can analyze it to extract useful execution data.
 
 ### Commands
 
@@ -68,7 +68,7 @@ $ pip3 install bokeh
 
 ## Design
 
-See the [`ros2_tracing` design document](https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing/blob/master/doc/design_ros_2.md), especially the [*Goals and requirements*](https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing/blob/master/doc/design_ros_2.md#goals-and-requirements) and [*Analysis*](https://gitlab.com/micro-ROS/ros_tracing/ros2_tracing/blob/master/doc/design_ros_2.md#analysis) sections.
+See the [`ros2_tracing` design document](https://gitlab.com/ros-tracing/ros2_tracing/blob/master/doc/design_ros_2.md), especially the [*Goals and requirements*](https://gitlab.com/ros-tracing/ros2_tracing/blob/master/doc/design_ros_2.md#goals-and-requirements) and [*Analysis*](https://gitlab.com/ros-tracing/ros2_tracing/blob/master/doc/design_ros_2.md#analysis) sections.
 
 ## Packages
 
@@ -80,4 +80,4 @@ Package containing a `ros2cli` extension to perform trace analysis.
 
 Package containing tools for analyzing trace data.
 
-See the [API documentation](https://micro-ros.gitlab.io/ros_tracing/tracetools_analysis-api/).
+See the [API documentation](https://ros-tracing.gitlab.io/tracetools_analysis-api/).
diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py
index f5c034b..670ad2c 100644
--- a/ros2trace_analysis/setup.py
+++ b/ros2trace_analysis/setup.py
@@ -22,7 +22,7 @@ setup(
     ),
     author='Christophe Bedard',
     author_email='christophe.bedard@apex.ai',
-    url='https://gitlab.com/micro-ROS/ros_tracing/tracetools_analysis',
+    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
     description='The trace-analysis command for ROS 2 command line tools.',
     long_description=(
diff --git a/tracetools_analysis/analysis/callback_duration.ipynb b/tracetools_analysis/analysis/callback_duration.ipynb
index bdd6280..432f5c4 100644
--- a/tracetools_analysis/analysis/callback_duration.ipynb
+++ b/tracetools_analysis/analysis/callback_duration.ipynb
@@ -40,9 +40,9 @@
     "import sys\n",
     "# Assuming a workspace with:\n",
     "#   src/tracetools_analysis/\n",
-    "#   src/micro-ROS/ros_tracing/ros2_tracing/tracetools_read/\n",
+    "#   src/ros-tracing/ros2_tracing/tracetools_read/\n",
     "sys.path.insert(0, '../')\n",
-    "sys.path.insert(0, '../../../micro-ROS/ros_tracing/ros2_tracing/tracetools_read/')\n",
+    "sys.path.insert(0, '../../../ros-tracing/ros2_tracing/tracetools_read/')\n",
     "import datetime as dt\n",
     "\n",
     "from bokeh.plotting import figure\n",
diff --git a/tracetools_analysis/analysis/memory_usage.ipynb b/tracetools_analysis/analysis/memory_usage.ipynb
index 0c8c260..1be38b0 100644
--- a/tracetools_analysis/analysis/memory_usage.ipynb
+++ b/tracetools_analysis/analysis/memory_usage.ipynb
@@ -34,9 +34,9 @@
     "import sys\n",
     "# Assuming a workspace with:\n",
     "#   src/tracetools_analysis/\n",
-    "#   src/micro-ROS/ros_tracing/ros2_tracing/tracetools_read/\n",
+    "#   src/ros-tracing/ros2_tracing/tracetools_read/\n",
     "sys.path.insert(0, '../')\n",
-    "sys.path.insert(0, '../../../micro-ROS/ros_tracing/ros2_tracing/tracetools_read/')\n",
+    "sys.path.insert(0, '../../../ros-tracing/ros2_tracing/tracetools_read/')\n",
     "import datetime as dt\n",
     "\n",
     "from bokeh.palettes import viridis\n",
diff --git a/tracetools_analysis/docs/source/about.rst b/tracetools_analysis/docs/source/about.rst
index 0e281d6..31e164e 100644
--- a/tracetools_analysis/docs/source/about.rst
+++ b/tracetools_analysis/docs/source/about.rst
@@ -1,4 +1,4 @@
 About
 =====
 
-Tools for analyzing trace data from ROS 2 systems generated by the `ros2_tracing packages <https://index.ros.org/r/ros2_tracing/gitlab-micro-ROS-ros_tracing-ros2_tracing/>`_.
+Tools for analyzing trace data from ROS 2 systems generated by the `ros2_tracing packages <https://index.ros.org/r/ros2_tracing/>`_.
diff --git a/tracetools_analysis/docs/source/index.rst b/tracetools_analysis/docs/source/index.rst
index 91b16d3..0508bb2 100644
--- a/tracetools_analysis/docs/source/index.rst
+++ b/tracetools_analysis/docs/source/index.rst
@@ -1,7 +1,7 @@
 tracetools_analysis
 ===================
 
-tracetools_analysis provides tools for analyzing trace data from ROS 2 systems generated by the `ros2_tracing packages <https://index.ros.org/r/ros2_tracing/gitlab-micro-ROS-ros_tracing-ros2_tracing/>`_.
+tracetools_analysis provides tools for analyzing trace data from ROS 2 systems generated by the `ros2_tracing packages <https://index.ros.org/r/ros2_tracing/>`_.
 
 .. toctree::
    :maxdepth: 4
diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py
index 7bb93f3..b7fae19 100644
--- a/tracetools_analysis/setup.py
+++ b/tracetools_analysis/setup.py
@@ -32,7 +32,7 @@ setup(
         'fixed-term.christophe.bourquebedard@de.bosch.com, '
         'ingo.luetkebohle@de.bosch.com'
     ),
-    url='https://gitlab.com/micro-ROS/ros_tracing/tracetools_analysis',
+    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
     description='Tools for analysing trace data.',
     long_description=(