diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index 3ef551007758ef6713c33c666adb0c6152e12fc9..70c85e9bd31a97e84758a08bebae82106b702a87 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -41,10 +41,10 @@
                 }
             }
         },
-        "PDU": {
+        "PSOC": {
             "STAT": {
-                "PDU": {
-                    "STAT/PDU/1": {
+                "PSOC": {
+                    "STAT/PSOC/1": {
                         "properties": {
                             "SNMP_host": ["10.87.2.145"],
                             "SNMP_community": ["public"],
diff --git a/docker-compose/device-psoc.yml b/docker-compose/device-psoc.yml
index c1c2af57f2c385c41b241322fb84366ab7e06c88..b7b9738b0c4d6d40f2d4ff6c2f9f0698b0957a17 100644
--- a/docker-compose/device-psoc.yml
+++ b/docker-compose/device-psoc.yml
@@ -8,8 +8,8 @@ volumes:
   iers-data: {}
 
 services:
-  device-pdu:
-    image: device-pdu
+  device-psoc:
+    image: device-psoc
     # build explicitly, as docker-compose does not understand a local image
     # being shared among services.
     build:
@@ -17,7 +17,7 @@ services:
         dockerfile: docker-compose/lofar-device-base/Dockerfile
         args:
             SOURCE_IMAGE: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}-tango-itango:${TANGO_ITANGO_VERSION}
-    container_name: ${CONTAINER_NAME_PREFIX}device-pdu
+    container_name: ${CONTAINER_NAME_PREFIX}device-psoc
     logging:
       driver: "json-file"
       options:
@@ -38,5 +38,5 @@ services:
       - bin/start-ds.sh
       # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
       # can't know about our Docker port forwarding
-      - l2ss-pdu PDU STAT -v -ORBendPoint giop:tcp:device-pdu:5714 -ORBendPointPublish giop:tcp:${HOSTNAME}:5714
+      - l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5714 -ORBendPointPublish giop:tcp:${HOSTNAME}:5714
     restart: unless-stopped
diff --git a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
index 26bd47d70b9a6175a45c7a2c2bbebbe19a8326b6..af329f05b03ae4bdc3b10542e96949c2f5e2b604 100644
--- a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
+++ b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py
@@ -9,7 +9,7 @@ xst = DeviceProxy("STAT/XST/1")
 unb2 = DeviceProxy("STAT/UNB2/1")
 boot = DeviceProxy("STAT/Boot/1")
 tilebeam = DeviceProxy("STAT/TileBeam/1")
-pdu = DeviceProxy("STAT/PDU/1")
+psoc = DeviceProxy("STAT/PSOC/1")
 beamlet = DeviceProxy("STAT/Beamlet/1")
 digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
 antennafield = DeviceProxy("STAT/AntennaField/1")
diff --git a/docker-compose/tango-prometheus-exporter/lofar2-policy.json b/docker-compose/tango-prometheus-exporter/lofar2-policy.json
index dfa82dbdc1837afcaeb696ae0021e8f015ad6658..5c7d49b01a2fdb2bf79a1b5d4559e8d9dc5e530b 100644
--- a/docker-compose/tango-prometheus-exporter/lofar2-policy.json
+++ b/docker-compose/tango-prometheus-exporter/lofar2-policy.json
@@ -29,7 +29,7 @@
         },
         "STAT/Docker/1": {
         },
-        "STAT/PDU/1": {
+        "STAT/PSOC/1": {
         },
         "STAT/RECV/1": {
             "include": [
diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh
index 691ba0b54209bedd8c536bd406efc00b16911b59..007d86d3e5f1e59d2e1b597c48cb03cda912adaa 100755
--- a/sbin/run_integration_test.sh
+++ b/sbin/run_integration_test.sh
@@ -69,7 +69,7 @@ sleep 1 # dsconfig container must be up and running...
 # shellcheck disable=SC2016
 echo '/usr/local/bin/wait-for-it.sh ${TANGO_HOST} --strict --timeout=300 -- true' | make run dsconfig bash -
 
-DEVICES="device-boot device-apsct device-apspu device-sdp device-recv device-bst device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam device-pdu device-antennafield device-temperature-manager device-observation"
+DEVICES="device-boot device-apsct device-apspu device-sdp device-recv device-bst device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam device-psoc device-antennafield device-temperature-manager device-observation"
 SIMULATORS="sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim"
 
 # Build only the required images, please do not build everything that makes CI
diff --git a/tangostationcontrol/docs/source/devices/psoc.rst b/tangostationcontrol/docs/source/devices/psoc.rst
index ca78ad3c5b890bb53e422f11df17ff1530ec5376..bccb7b0d487aec270be78393625da2d00c1d1b24 100644
--- a/tangostationcontrol/docs/source/devices/psoc.rst
+++ b/tangostationcontrol/docs/source/devices/psoc.rst
@@ -1,7 +1,7 @@
-.. _pdu:
+.. _psoc:
 
-PDU
+PSOC
 ====================
 
-The ``pdu == DeviceProxy("STAT/PDU/1")`` device controls the Power Distribution
-Unit (PDU)
+The ``psoc == DeviceProxy("STAT/PSOC/1")`` device controls the Power Distribution
+Unit (PSOC)
diff --git a/tangostationcontrol/docs/source/index.rst b/tangostationcontrol/docs/source/index.rst
index ac967bdf1fc84700900ddd604ac5b7a4fe9f051a..b3b686818cc758f1ed662f07bff5d4f0095b1920 100644
--- a/tangostationcontrol/docs/source/index.rst
+++ b/tangostationcontrol/docs/source/index.rst
@@ -25,7 +25,7 @@ Even without having access to any LOFAR2.0 hardware, you can install the full st
    devices/antennafield
    devices/boot
    devices/docker
-   devices/pdu
+   devices/psoc
    devices/recv
    devices/sdp
    devices/bst-sst-xst