diff --git a/bitbots_misc/bitbots_containers/hlvs/Dockerfile b/bitbots_misc/bitbots_containers/hlvs/Dockerfile
index 8bb75c89a..206b10d1e 100644
--- a/bitbots_misc/bitbots_containers/hlvs/Dockerfile
+++ b/bitbots_misc/bitbots_containers/hlvs/Dockerfile
@@ -75,7 +75,7 @@ RUN . /opt/ros/iron/setup.sh && colcon build --cmake-args -DBUILD_TESTING=OFF
 
 # TODO execute tests
 
-RUN cp src/bitbots_main/bitbots_robot/wolfgang_robocup_api/scripts/start.sh .local/bin/start
+RUN cp src/bitbots_main/bitbots_robot/bitbots_robocup_api/scripts/start.sh .local/bin/start
 
 # Volume for logs
 VOLUME /robocup-logs
diff --git a/bitbots_simulation/wolfgang_robocup_api/.gitignore b/bitbots_simulation/bitbots_robocup_api/.gitignore
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/.gitignore
rename to bitbots_simulation/bitbots_robocup_api/.gitignore
diff --git a/bitbots_simulation/wolfgang_robocup_api/README.md b/bitbots_simulation/bitbots_robocup_api/README.md
similarity index 67%
rename from bitbots_simulation/wolfgang_robocup_api/README.md
rename to bitbots_simulation/bitbots_robocup_api/README.md
index bcad66f6f..1021d8b1f 100644
--- a/bitbots_simulation/wolfgang_robocup_api/README.md
+++ b/bitbots_simulation/bitbots_robocup_api/README.md
@@ -1 +1 @@
-This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics for the Wolfgang Robot.
+This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics.
diff --git a/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json b/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
new file mode 100644
index 000000000..ce9a44088
--- /dev/null
+++ b/bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
@@ -0,0 +1,62 @@
+{
+  "name": "Bit-Bots",
+  "players": {
+    "1": {
+      "proto": "Wolfgang",
+      "dockerTag": "latest",
+      "dockerCmd": "roslaunch bitbots_robocup_api robocup_walk.launch",
+      "halfTimeStartingPose": {
+        "translation": [
+          -3.6,
+          -3.20,
+          0.43
+        ],
+        "rotation": [
+          0.13,
+          -0.13,
+          -0.98,
+          -1.57
+        ]
+      },
+      "reentryStartingPose": {
+        "translation": [
+          -3.6,
+          -3.20,
+          0.43
+        ],
+        "rotation": [
+          0.0,
+          -0.0,
+          -1.0,
+          -1.57
+        ]
+      },
+      "shootoutStartingPose": {
+        "translation": [
+          2.6,
+          0,
+          0.43
+        ],
+        "rotation": [
+          0,
+          0.98,
+          0.13,
+          0.26
+        ]
+      },
+      "goalKeeperStartingPose": {
+        "translation": [
+          -4.47,
+          0,
+          0.43
+        ],
+        "rotation": [
+          -0.13,
+          0,
+          0.98,
+          3.14
+        ]
+      }
+    }
+  }
+}
diff --git a/bitbots_simulation/wolfgang_robocup_api/config/devices.json b/bitbots_simulation/bitbots_robocup_api/config/devices.json
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/config/devices.json
rename to bitbots_simulation/bitbots_robocup_api/config/devices.json
diff --git a/bitbots_simulation/wolfgang_robocup_api/config/team.json b/bitbots_simulation/bitbots_robocup_api/config/team.json
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/config/team.json
rename to bitbots_simulation/bitbots_robocup_api/config/team.json
diff --git a/bitbots_simulation/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch b/bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
similarity index 78%
rename from bitbots_simulation/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
index eb6350905..d2e1a81f7 100644
--- a/bitbots_simulation/wolfgang_robocup_api/launch/wolfgang_robocup_api_bridge.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/bitbots_robocup_api_bridge.launch
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <launch>
     <node pkg="hlvs_player" exec="hlvs_player" output="screen">
-        <param name="devices_file" value="$(find-pkg-share wolfgang_robocup_api)/config/devices.json"/>
+        <param name="devices_file" value="$(find-pkg-share bitbots_robocup_api)/config/devices.json"/>
         <remap from="camera/image_raw" to="camera/image_proc"/>
         <remap from="imu/data" to="imu/data_raw"/>
     </node>
     <!-- The hlvs_player expects the joint command positions as a 'JointState' message.
     We therfore need to convert the messages from our custom 'JointCommand' message to the
     more common 'JointState' layout. -->
-    <node pkg="wolfgang_robocup_api" exec="command_proxy" output="screen">
+    <node pkg="bitbots_robocup_api" exec="command_proxy" output="screen">
         <remap from="input" to="DynamixelController/command"/>
         <remap from="output" to="joint_command"/>
     </node>
diff --git a/bitbots_simulation/wolfgang_robocup_api/launch/robocup_teamplayer.launch b/bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
similarity index 89%
rename from bitbots_simulation/wolfgang_robocup_api/launch/robocup_teamplayer.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
index 8b4fb2534..7c145e37a 100644
--- a/bitbots_simulation/wolfgang_robocup_api/launch/robocup_teamplayer.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/robocup_teamplayer.launch
@@ -10,7 +10,7 @@
     </group>
 
     <!-- load the robocup api -->
-    <include file="$(find-pkg-share wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
+    <include file="$(find-pkg-share bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />
 
     <!-- launch the team player -->
     <include file="$(find-pkg-share bitbots_bringup)/launch/teamplayer.launch">
diff --git a/bitbots_simulation/wolfgang_robocup_api/launch/robocup_walk.launch b/bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
similarity index 79%
rename from bitbots_simulation/wolfgang_robocup_api/launch/robocup_walk.launch
rename to bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
index 9fb758d90..ec8b05e69 100644
--- a/bitbots_simulation/wolfgang_robocup_api/launch/robocup_walk.launch
+++ b/bitbots_simulation/bitbots_robocup_api/launch/robocup_walk.launch
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <launch>
-    <include file="$(find wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
+    <include file="$(find bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />
 
     <include file="$(find bitbots_bringup)/launch/motion_standalone.launch">
         <arg name="sim" value="true" />
diff --git a/bitbots_simulation/wolfgang_robocup_api/package.xml b/bitbots_simulation/bitbots_robocup_api/package.xml
similarity index 97%
rename from bitbots_simulation/wolfgang_robocup_api/package.xml
rename to bitbots_simulation/bitbots_robocup_api/package.xml
index cdc392e07..8060e2d20 100644
--- a/bitbots_simulation/wolfgang_robocup_api/package.xml
+++ b/bitbots_simulation/bitbots_robocup_api/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>wolfgang_robocup_api</name>
+  <name>bitbots_robocup_api</name>
   <version>0.0.0</version>
   <description>Bridge between the official Humanoid League RoboCup Proto3 API
     and our ROS topics for the Wolfgang Robot
diff --git a/bitbots_simulation/wolfgang_robocup_api/resource/wolfgang_robocup_api b/bitbots_simulation/bitbots_robocup_api/resource/bitbots_robocup_api
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/resource/wolfgang_robocup_api
rename to bitbots_simulation/bitbots_robocup_api/resource/bitbots_robocup_api
diff --git a/bitbots_simulation/wolfgang_robocup_api/scripts/start.sh b/bitbots_simulation/bitbots_robocup_api/scripts/start.sh
similarity index 97%
rename from bitbots_simulation/wolfgang_robocup_api/scripts/start.sh
rename to bitbots_simulation/bitbots_robocup_api/scripts/start.sh
index 5793d5586..ec5cbe0a3 100755
--- a/bitbots_simulation/wolfgang_robocup_api/scripts/start.sh
+++ b/bitbots_simulation/bitbots_robocup_api/scripts/start.sh
@@ -138,4 +138,4 @@ sed -i "/^    target_ip:/s/^.*$/    target_ip: $ROBOCUP_MIRROR_SERVER_IP/" $TEAM
 # Start ROS #
 #############
 
-exec ros2 launch wolfgang_robocup_api robocup_teamplayer.launch record:=$RECORD
+exec ros2 launch bitbots_robocup_api robocup_teamplayer.launch record:=$RECORD
diff --git a/bitbots_simulation/bitbots_robocup_api/setup.cfg b/bitbots_simulation/bitbots_robocup_api/setup.cfg
new file mode 100644
index 000000000..dddd43c45
--- /dev/null
+++ b/bitbots_simulation/bitbots_robocup_api/setup.cfg
@@ -0,0 +1,4 @@
+[develop]
+script_dir=$base/lib/bitbots_robocup_api
+[install]
+install_scripts=$base/lib/bitbots_robocup_api
diff --git a/bitbots_simulation/wolfgang_robocup_api/setup.py b/bitbots_simulation/bitbots_robocup_api/setup.py
similarity index 95%
rename from bitbots_simulation/wolfgang_robocup_api/setup.py
rename to bitbots_simulation/bitbots_robocup_api/setup.py
index 702ab9448..94fdf23af 100644
--- a/bitbots_simulation/wolfgang_robocup_api/setup.py
+++ b/bitbots_simulation/bitbots_robocup_api/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import find_packages, setup
 
-package_name = "wolfgang_robocup_api"
+package_name = "bitbots_robocup_api"
 
 setup(
     name=package_name,
diff --git a/bitbots_simulation/wolfgang_robocup_api/wolfgang_robocup_api/__init__.py b/bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/__init__.py
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/wolfgang_robocup_api/__init__.py
rename to bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/__init__.py
diff --git a/bitbots_simulation/wolfgang_robocup_api/wolfgang_robocup_api/command_proxy.py b/bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/command_proxy.py
similarity index 100%
rename from bitbots_simulation/wolfgang_robocup_api/wolfgang_robocup_api/command_proxy.py
rename to bitbots_simulation/bitbots_robocup_api/wolfgang_robocup_api/command_proxy.py
diff --git a/bitbots_simulation/wolfgang_robocup_api/config/bitbots_walk.json b/bitbots_simulation/wolfgang_robocup_api/config/bitbots_walk.json
deleted file mode 100644
index 6a25ee9db..000000000
--- a/bitbots_simulation/wolfgang_robocup_api/config/bitbots_walk.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "Bit-Bots",
-  "players": {
-    "1": {
-      "proto": "Wolfgang",
-      "dockerTag": "latest",
-      "dockerCmd": "roslaunch wolfgang_robocup_api robocup_walk.launch",
-      "halfTimeStartingPose": {
-        "translation": [-3.6, -3.20, 0.43],
-        "rotation": [0.13, -0.13, -0.98, -1.57]
-      },
-      "reentryStartingPose": {
-        "translation": [-3.6, -3.20, 0.43],
-        "rotation": [0.0, -0.0, -1.0, -1.57]
-      },
-      "shootoutStartingPose": {
-        "translation": [2.6, 0, 0.43],
-        "rotation": [0, 0.98, 0.13, 0.26]
-      },
-      "goalKeeperStartingPose": {
-        "translation": [-4.47, 0, 0.43],
-        "rotation": [-0.13, 0, 0.98, 3.14]
-      }
-    }
-  }
-}
diff --git a/bitbots_simulation/wolfgang_robocup_api/setup.cfg b/bitbots_simulation/wolfgang_robocup_api/setup.cfg
deleted file mode 100644
index fe694faa0..000000000
--- a/bitbots_simulation/wolfgang_robocup_api/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[develop]
-script_dir=$base/lib/wolfgang_robocup_api
-[install]
-install_scripts=$base/lib/wolfgang_robocup_api