diff --git a/docs/source/SKAAlarmHandler.rst b/docs/source/SKAAlarmHandler.rst
index 11bd513e622fdabeb7542fc8c102df8ff5a93166..bb7b198431b9245b68d40df5ab60c675b6700a22 100644
--- a/docs/source/SKAAlarmHandler.rst
+++ b/docs/source/SKAAlarmHandler.rst
@@ -9,5 +9,6 @@ SKA AlarmHandler
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAAlarmHandler.SKAAlarmHandler
-   :members: SKAAlarmHandler
+.. automodule:: SKAAlarmHandler
+.. autoclass:: SKAAlarmHandler
+   :members:
diff --git a/docs/source/SKACapability.rst b/docs/source/SKACapability.rst
index 664fbb724034221e60edf57a637ed5ae94da7b9e..5b08ec17ea47a04221607c7a68d87c633672a4c6 100644
--- a/docs/source/SKACapability.rst
+++ b/docs/source/SKACapability.rst
@@ -9,6 +9,6 @@ SKA Capability
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKACapability.SKACapability
-   :members: SKACapability
-
+.. automodule:: SKACapability
+.. autoclass:: SKACapability
+   :members:
diff --git a/docs/source/SKALogger.rst b/docs/source/SKALogger.rst
index 0a403da01a0cd04e6b2df8f42da686db1d64d8d7..b2ce592f3516b1588058545dc1c862ae4072969f 100644
--- a/docs/source/SKALogger.rst
+++ b/docs/source/SKALogger.rst
@@ -9,6 +9,6 @@ SKA Logger
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKALogger.SKALogger
-   :members: SKALogger
-
+.. automodule:: SKALogger
+.. autoclass:: SKALogger
+   :members:
diff --git a/docs/source/SKAMaster.rst b/docs/source/SKAMaster.rst
index 23c1951fbebe2d5ba4ca1dbfbdcc4dcb19c1bec2..7939c225d2fa20629eb5dca889eae6d0b75f88ee 100644
--- a/docs/source/SKAMaster.rst
+++ b/docs/source/SKAMaster.rst
@@ -9,6 +9,7 @@ SKA Master
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAMaster.SKAMaster
-   :members: SKAMaster
+.. automodule:: SKAMaster
+.. autoclass:: SKAMaster
+   :members:
 
diff --git a/docs/source/SKAObsDevice.rst b/docs/source/SKAObsDevice.rst
index effee65ff8421ff71977321c96a9cb21585bcae8..6a132beb1a858f19814064e656921d9d676237f9 100644
--- a/docs/source/SKAObsDevice.rst
+++ b/docs/source/SKAObsDevice.rst
@@ -9,6 +9,6 @@ SKA ObsDevice
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKAObsDevice.SKAObsDevice
-   :members: SKAObsDevice
-
+.. automodule:: SKAObsDevice
+.. autoclass:: SKAObsDevice
+   :members:
diff --git a/docs/source/SKASubarray.rst b/docs/source/SKASubarray.rst
index ada9fef9a11ebb4df72f57d5da6a1868501b616f..6743aab47881be2abded11d5fd496aa5576cd0d0 100644
--- a/docs/source/SKASubarray.rst
+++ b/docs/source/SKASubarray.rst
@@ -9,6 +9,6 @@ SKA Subarray
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKASubarray.SKASubarray
-   :members: SKASubarray
-
+.. automodule:: SKASubarray
+.. autoclass:: SKASubarray
+   :members:
diff --git a/docs/source/SKATelState.rst b/docs/source/SKATelState.rst
index 7843a841a3d43aa12f7ff365b6fa03081e80688c..0810c85c1c411bae433e0f82355693acd89e34a8 100644
--- a/docs/source/SKATelState.rst
+++ b/docs/source/SKATelState.rst
@@ -9,6 +9,6 @@ SKA TelState
 .. toctree::
    :maxdepth: 2
 
-.. automodule:: SKATelState.SKATelState
-   :members: SKATelState
-
+.. automodule:: SKATelState
+.. autoclass:: SKATelState
+   :members:
diff --git a/skabase/SKABaseDevice/__init__.py b/skabase/SKABaseDevice/__init__.py
index 205296893e52d789afe531061975ca48b9154d46..c08726ce1d444d2d1f3be4d17e64ce9afa26161c 100644
--- a/skabase/SKABaseDevice/__init__.py
+++ b/skabase/SKABaseDevice/__init__.py
@@ -5,8 +5,7 @@
 #
 #
 
-
-"""SKABase
+"""SKABaseDevice
 
 A generic base device for SKA. It exposes the attributes, properties and commands of
 a device that are common for all the SKA devices.