diff --git a/tangostationcontrol/tangostationcontrol/devices/observation_control.py b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
index f8cf14fabb6d19135000598e35e879552008fdf3..c4d6e64ace208180f93b2a0831d02be00471e7da 100644
--- a/tangostationcontrol/tangostationcontrol/devices/observation_control.py
+++ b/tangostationcontrol/tangostationcontrol/devices/observation_control.py
@@ -28,7 +28,7 @@ logger = logging.getLogger()
 __all__ = ["ObservationControl", "main"]
 
 
-class obs(object):
+class observation_wrapper(object):
     """ This class provides a pythonic interface to the ObservationControl and Observation devices on a station. """
 
     def __init__(self, specification: str, host: str = "localhost:10000"):
diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
index b3546fe148947d3cbcdd6e7780b67b3701fb19d5..1f3f8208557dbd5cfa7a7611e65ae0424cf14102 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_observation.py
@@ -3,7 +3,7 @@
 
 from tangostationcontrol.test.devices.test_observation_base import TestObservationBase
 from tangostationcontrol.integration_test import base
-from tangostationcontrol.devices.observation_control import obs
+from tangostationcontrol.devices.observation_control import observation_wrapper
 from tangostationcontrol.integration_test.device_proxy import TestDeviceProxy
 import numpy
 
@@ -102,12 +102,12 @@ class TestObservation(base.IntegrationTestCase):
         return tilebeam_proxy
 
 
-    def test_observation(self):
-        """Test of the obs class basic functionality"""
+    def test_observation_wrapper(self):
+        """Test of the observation_wrapper class basic functionality"""
 
         host = ApiUtil.get_env_var("TANGO_HOST")
 
-        observation = obs(specification=TestObservationBase.VALID_JSON, host=host)
+        observation = observation_wrapper(specification=TestObservationBase.VALID_JSON, host=host)
 
         # Assert the observation is running after starting it
         observation.start()