diff --git a/CDB/LOFAR_ConfigDb.json b/CDB/LOFAR_ConfigDb.json
index b5a725a4d01bca692085d019473fac79f1bc2719..4a3849f120d871d1d95f1802d18533c645c5d95d 100644
--- a/CDB/LOFAR_ConfigDb.json
+++ b/CDB/LOFAR_ConfigDb.json
@@ -32,10 +32,10 @@
                 }
             }
         },
-        "Temperature_manager": {
+        "TemperatureManager": {
             "STAT": {
-                "Temperature_manager": {
-                    "STAT/Temperature_manager/1": {}
+                "TemperatureManager": {
+                    "STAT/TemperatureManager/1": {}
                 }
             }
         },
diff --git a/CDB/stations/simulators_ConfigDb.json b/CDB/stations/simulators_ConfigDb.json
index 9806a2ca407bcd41df3e744ef248d95831a28e39..6afb6b21adb00239edf53241dfe4b515cad0f35a 100644
--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -116,10 +116,10 @@
                 }
             }
         },
-        "Temperature_manager": {
+        "TemperatureManager": {
             "STAT": {
-                "Temperature_manager": {
-                    "STAT/Temperature_manager/1": {
+                "TemperatureManager": {
+                    "STAT/TemperatureManager/1": {
                         "properties": {
                         }
                     }
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 9856d384cd77bb09903cbeecfd9c7d11f603755d..27ce2a60a5a917259ab02888331b9ad9cb92e7bc 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
@@ -13,7 +13,7 @@ beamlet = DeviceProxy("STAT/Beamlet/1")
 digitalbeam = DeviceProxy("STAT/DigitalBeam/1")
 antennafield = DeviceProxy("STAT/AntennaField/1")
 docker = DeviceProxy("STAT/Docker/1")
-temperature_manager = DeviceProxy("STAT/Temperature_manager/1")
+Temperaturemanager = DeviceProxy("STAT/TemperatureManager/1")
 
 # Put them in a list in case one wants to iterate
-devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, temperature_manager, docker]
+devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, antennafield, Temperaturemanager, docker]
diff --git a/tangostationcontrol/docs/source/devices/temperature-manager.rst b/tangostationcontrol/docs/source/devices/temperature-manager.rst
index a69b807b7ed9f504964bbba808f5de49430ed4fd..c4f919377d5fbcb79338b0ea28e24c4cbf35c975 100644
--- a/tangostationcontrol/docs/source/devices/temperature-manager.rst
+++ b/tangostationcontrol/docs/source/devices/temperature-manager.rst
@@ -1,4 +1,4 @@
 temperature-manager
 ====================
 
-``temperature_manager == DeviceProxy("STAT/Temperature_manager/1")``
+``temperature_manager == DeviceProxy("STAT/TemperatureManager/1")``
diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg
index 1d52727f782ff41dd2e7e75b2d3137314bfdb82f..765212ad60c4034d0f8ecd0bbe12e58687b23630 100644
--- a/tangostationcontrol/setup.cfg
+++ b/tangostationcontrol/setup.cfg
@@ -51,7 +51,7 @@ console_scripts =
     l2ss-statistics-writer = tangostationcontrol.statistics_writer.statistics_writer:main
     l2ss-unb2 = tangostationcontrol.devices.unb2:main
     l2ss-xst = tangostationcontrol.devices.sdp.xst:main
-    l2ss-temperature-manager = tangostationcontrol.devices.temperature_manager:main
+    l2ss-temperature-manager = tangostationcontrol.devices.TemperatureManager:main
 
 # The following entry points should eventually be removed / replaced
     l2ss-cold-start = tangostationcontrol.toolkit.lts_cold_start:main
diff --git a/tangostationcontrol/tangostationcontrol/devices/boot.py b/tangostationcontrol/tangostationcontrol/devices/boot.py
index 380093d9d82a6716c07c40b48eeefc17b19d42d2..90daa4954b90cd8722e4162f651532db072cb93f 100644
--- a/tangostationcontrol/tangostationcontrol/devices/boot.py
+++ b/tangostationcontrol/tangostationcontrol/devices/boot.py
@@ -244,7 +244,7 @@ class Boot(lofar_device):
                        "STAT/Beamlet/1",
                        "STAT/TileBeam/1",   # Accesses RECV and Beamlet
                        "STAT/DigitalBeam/1",
-                       "STAT/Temperature_manager/1",
+                       "STAT/TemperatureManager/1",
                        "STAT/AntennaField/1",
                       ],
     )
diff --git a/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py b/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
index 8ddbe11e33c0ff7c7e524c8b90c85154dd21d344..c1db80b161524c04be7489e7017ed373ae70c1ff 100644
--- a/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
+++ b/tangostationcontrol/tangostationcontrol/devices/temperature_manager.py
@@ -16,11 +16,11 @@ import logging
 
 logger = logging.getLogger()
 
-__all__ = ["temperature_manager", "main"]
+__all__ = ["TemperatureManager", "main"]
 
 
 @device_logging_to_python()
-class temperature_manager(lofar_device):
+class TemperatureManager(lofar_device):
     # -----------------
     # Device Properties
     # -----------------
@@ -54,4 +54,4 @@ class temperature_manager(lofar_device):
 # ----------
 def main(**kwargs):
     """Main function of the temperature manager module."""
-    return entry(temperature_manager, **kwargs)
+    return entry(TemperatureManager, **kwargs)
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
index 29f13b39ccf926f5f06b256b2dd89e2b22dff2ee..ea884acf1d7557b1e72f64ee71eee756145f083f 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_temperature_manager.py
@@ -9,8 +9,8 @@
 # See LICENSE.txt for more info.
 from .base import AbstractTestBases
 
-class TestDeviceDigitalBeam(AbstractTestBases.TestDeviceBase):
+class TestTemperatureManager(AbstractTestBases.TestDeviceBase):
 
     def setUp(self):
         """Intentionally recreate the device object in each test"""
-        super().setUp("STAT/Temperature_manager/1")
+        super().setUp("STAT/TemperatureManager/1")