diff --git a/docs/source/Control_Model.rst b/docs/source/Control_Model.rst
index 194db835741791a4aa675462382dabe25573e2a4..945631028ad6ac2f9da4d25ca5909fc36d330da4 100644
--- a/docs/source/Control_Model.rst
+++ b/docs/source/Control_Model.rst
@@ -9,7 +9,7 @@ SKA Control Model
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: control_model
+.. automodule:: ska.base.control_model
     :members:
     :undoc-members:
 
diff --git a/docs/source/SKAAlarmHandler.rst b/docs/source/SKAAlarmHandler.rst
index ecf3845d19b13e207df81cfc3ca7dff7d026a4e7..9b0297fb4c35dd7a49b9bac3cf216e01c7fc048e 100644
--- a/docs/source/SKAAlarmHandler.rst
+++ b/docs/source/SKAAlarmHandler.rst
@@ -9,7 +9,7 @@ SKA AlarmHandler
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAAlarmHandler
-.. autoclass:: SKAAlarmHandler
+.. automodule:: ska.base.alarm_handler_device
+.. autoclass:: ska.base.SKAAlarmHandler
    :members:
    :undoc-members:
diff --git a/docs/source/SKABaseDevice.rst b/docs/source/SKABaseDevice.rst
index 3bcc419bdcc27addda0d8391f8b6e7bdd5b69cca..9d41032725d5449356f3100f4035213ed5a81c07 100644
--- a/docs/source/SKABaseDevice.rst
+++ b/docs/source/SKABaseDevice.rst
@@ -9,7 +9,7 @@ SKA BaseDevice
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKABaseDevice
-.. autoclass:: SKABaseDevice
+.. automodule:: ska.base.base_device
+.. autoclass:: ska.base.SKABaseDevice
    :members:
    :undoc-members:
diff --git a/docs/source/SKACapability.rst b/docs/source/SKACapability.rst
index c63c6019bde331ad25bbb64a3cfc45018d75a34b..f749103fdbc75885130c2acf6fcb3423be7e994d 100644
--- a/docs/source/SKACapability.rst
+++ b/docs/source/SKACapability.rst
@@ -9,7 +9,7 @@ SKA Capability
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKACapability
-.. autoclass:: SKACapability
+.. automodule:: ska.base.capability_device
+.. autoclass:: ska.base.SKACapability
    :members:
    :undoc-members:
diff --git a/docs/source/SKALogger.rst b/docs/source/SKALogger.rst
index 0a333cc8f83f8c94384227008d82fd86c6724c84..98415a3276b51c11f24ccb440a7edf517cf6d36a 100644
--- a/docs/source/SKALogger.rst
+++ b/docs/source/SKALogger.rst
@@ -9,7 +9,7 @@ SKA Logger
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKALogger
-.. autoclass:: SKALogger
+.. automodule:: ska.base.logger_device
+.. autoclass:: ska.base.SKALogger
    :members:
    :undoc-members:
diff --git a/docs/source/SKAMaster.rst b/docs/source/SKAMaster.rst
index 345f70fbb8e2ddf9d2768fd9ec10041f3f44bbf5..3788821bf0e871c886c86a62d651d35313fba59b 100644
--- a/docs/source/SKAMaster.rst
+++ b/docs/source/SKAMaster.rst
@@ -9,7 +9,7 @@ SKA Master
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAMaster
-.. autoclass:: SKAMaster
+.. automodule:: ska.base.master_device
+.. autoclass:: ska.base.SKAMaster
    :members:
    :undoc-members:
diff --git a/docs/source/SKAObsDevice.rst b/docs/source/SKAObsDevice.rst
index 18197923049f059310f17fc6401a3efa1940a50f..013c6af966345185240fc655373d3868af13567e 100644
--- a/docs/source/SKAObsDevice.rst
+++ b/docs/source/SKAObsDevice.rst
@@ -9,7 +9,7 @@ SKA ObsDevice
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAObsDevice
-.. autoclass:: SKAObsDevice
+.. automodule:: ska.base.obs_device
+.. autoclass:: ska.base.SKAObsDevice
    :members:
    :undoc-members:
diff --git a/docs/source/SKASubarray.rst b/docs/source/SKASubarray.rst
index 1a6fd122405721d757f9e91190a9fbde2d1c43f6..4db79893338aa3fbdf320ff54c852e1896d79b03 100644
--- a/docs/source/SKASubarray.rst
+++ b/docs/source/SKASubarray.rst
@@ -9,7 +9,7 @@ SKA Subarray
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKASubarray
-.. autoclass:: SKASubarray
+.. automodule:: ska.base.subarray_device
+.. autoclass:: ska.base.SKASubarray
    :members:
    :undoc-members:
diff --git a/docs/source/SKATelState.rst b/docs/source/SKATelState.rst
index aa091637a896138027f4fea3600edbc1e6318b9a..acd145f96a09b127fdb21b266768a125d6482104 100644
--- a/docs/source/SKATelState.rst
+++ b/docs/source/SKATelState.rst
@@ -9,7 +9,7 @@ SKA TelState
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKATelState
-.. autoclass:: SKATelState
+.. automodule:: ska.base.tel_state_device
+.. autoclass:: ska.base.SKATelState
    :members:
    :undoc-members:
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 0a5669a6cefa2c8067f5eae3308e74f67620e2d6..7623d2adfe6b0d536cad355d6444be4dc4b29a97 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -46,9 +46,8 @@ sys.modules.update((mod_name, Mock()) for mod_name in MOCK_MODULES)
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('../../'))
-sys.path.append(os.path.abspath('../../skabase'))
-from skabase import release
+sys.path.insert(0, os.path.abspath('../../src'))
+from ska.base import release
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.