diff --git a/ale/drivers/lro_drivers.py b/ale/drivers/lro_drivers.py
index 0f412f9148f8607d84dcbf6b363e25e4c6dee33e..cd2eaeb46ea04566e14327f845880d74310c8465 100644
--- a/ale/drivers/lro_drivers.py
+++ b/ale/drivers/lro_drivers.py
@@ -153,6 +153,8 @@ class LroLrocPds3LabelNaifSpiceDriver(LineScanner, NaifSpice, Pds3Label, Driver)
         The starting ephemeris time for LRO is computed by taking the
         LRO:SPACECRAFT_CLOCK_PREROLL_COUNT, as defined in the label, and
         adding offsets that were taken from an IAK.
+
+        Returns
         -------
         : double
           Starting ephemeris time of the image
@@ -374,6 +376,8 @@ class LroLrocIsisLabelNaifSpiceDriver(LineScanner, NaifSpice, IsisLabel, Driver)
         The starting ephemeris time for LRO is computed by taking the
         LRO:SPACECRAFT_CLOCK_PREROLL_COUNT, as defined in the label, and
         adding offsets that were taken from an IAK.
+
+        Returns
         -------
         : double
           Starting ephemeris time of the image
@@ -525,7 +529,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
     @property
     def wavelength(self):
         """
-        Returns the wavelength in meters used for image acquistion. 
+        Returns the wavelength in meters used for image acquistion.
 
         Returns
         -------
@@ -548,7 +552,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
         : double
           scaled pixel width
         """
-        return self.label['IsisCube']['Instrument']['ScaledPixelHeight']; 
+        return self.label['IsisCube']['Instrument']['ScaledPixelHeight'];
 
 
     # Default line_exposure_duration assumes that time is given in milliseconds and coverts
@@ -556,7 +560,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
     @property
     def line_exposure_duration(self):
         """
-        Line exposure duration in seconds. The sum of the burst and the delay for the return. 
+        Line exposure duration in seconds. The sum of the burst and the delay for the return.
 
         Returns
         -------
@@ -579,7 +583,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
         range_coefficients_orig = self.label['IsisCube']['Instrument']['RangeCoefficientSet']
 
         # The first elt of each list is time, which we handle separately in range_conversion_time
-        range_coefficients = [elt[1:] for elt in range_coefficients_orig] 
+        range_coefficients = [elt[1:] for elt in range_coefficients_orig]
         return range_coefficients
 
     @property
@@ -600,7 +604,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
     @property
     def ephemeris_start_time(self):
         """
-        Returns the start and stop ephemeris times for the image. 
+        Returns the start and stop ephemeris times for the image.
 
         Returns
         -------
@@ -612,7 +616,7 @@ class LroMiniRfIsisLabelNaifSpiceDriver(Radar, NaifSpice, IsisLabel, Driver):
     @property
     def ephemeris_stop_time(self):
         """
-        Returns the stop ephemeris times for the image. 
+        Returns the stop ephemeris times for the image.
 
         Returns
         -------
diff --git a/docs/source/library/python/base.rst b/docs/source/library/python/base.rst
index d40200f4cb8c491f4db753def20e7141196e910b..c921b7b0d3a521102ad694a8a575e316b08632da 100644
--- a/docs/source/library/python/base.rst
+++ b/docs/source/library/python/base.rst
@@ -5,7 +5,7 @@ The :mod:`ale.drivers.base` module
 
 .. versionadded:: 0.1.0
 
-.. automodule:: ale.drivers.base
+.. automodule:: ale.base.base
   :synopsis:
   :members:
   :show-inheritance:
diff --git a/docs/source/library/python/cassini_driver.rst b/docs/source/library/python/cassini_driver.rst
index 635a1f93de2e3ade80560d64f20d5ea8f3db7966..6f6825071dfd46f860bca2c0015586df0e857274 100644
--- a/docs/source/library/python/cassini_driver.rst
+++ b/docs/source/library/python/cassini_driver.rst
@@ -1,11 +1,11 @@
 :mod:`cassini_driver` --- Cassini Driver Classes
 ================================================
 
-The :mod:`ale.drivers.cassini_driver` module
+The :mod:`ale.drivers.co_drivers` module
 
 .. versionadded:: 0.1.0
 
-.. automodule:: ale.drivers.cassini_driver
+.. automodule:: ale.drivers.co_drivers
    :synopsis:
    :members:
    :show-inheritance:
diff --git a/docs/source/library/python/lro_driver.rst b/docs/source/library/python/lro_driver.rst
index 506d7afe4380b3a72e7ae45474c820269c045a41..6657b0223eb73dc93c6c765fe22a34525b456391 100644
--- a/docs/source/library/python/lro_driver.rst
+++ b/docs/source/library/python/lro_driver.rst
@@ -5,7 +5,7 @@ The :mod:`ale.drivers.lro_driver` module
 
 .. versionadded:: 0.1.0
 
-.. automodule:: ale.drivers.lro_driver
+.. automodule:: ale.drivers.lro_drivers
    :synopsis:
    :members:
    :show-inheritance:
diff --git a/docs/source/library/python/mdis_driver.rst b/docs/source/library/python/mdis_driver.rst
index 12a96a1de0ad0936ecb82a3623768055fcfd6f8d..f6c0a967c66656c98b43c977898c92b4a89608b4 100644
--- a/docs/source/library/python/mdis_driver.rst
+++ b/docs/source/library/python/mdis_driver.rst
@@ -1,11 +1,11 @@
 :mod:`mdis_driver` --- MDIS Driver Classes
 ============================================
 
-The :mod:`ale.drivers.mdis_driver` module
+The :mod:`ale.drivers.mess_drivers` module
 
 .. versionadded:: 0.1.0
 
-.. automodule:: ale.drivers.mdis_driver
+.. automodule:: ale.drivers.mess_drivers
    :synopsis:
    :members:
    :show-inheritance:
diff --git a/docs/source/library/python/mro_driver.rst b/docs/source/library/python/mro_driver.rst
index 5a0165c23e480b4cdd11a7e023956a59753eaaff..e29fab580789d9cd6956509a6f9f2e44278eddc4 100644
--- a/docs/source/library/python/mro_driver.rst
+++ b/docs/source/library/python/mro_driver.rst
@@ -1,11 +1,11 @@
 :mod:`mro_driver` --- MRO Driver Classes
 ============================================
 
-The :mod:`ale.drivers.mro_driver` module
+The :mod:`ale.drivers.mro_drivers` module
 
 .. versionadded:: 0.1.0
 
-.. automodule:: ale.drivers.mro_driver
+.. automodule:: ale.drivers.mro_drivers
    :synopsis:
    :members:
    :show-inheritance:
diff --git a/docs/source/library/python/util.rst b/docs/source/library/python/util.rst
index 375ceb2da4349911634814a790af2d190b19f1d6..64cdd027e76a7d31d53a3f4de04f73e5539661ae 100644
--- a/docs/source/library/python/util.rst
+++ b/docs/source/library/python/util.rst
@@ -1,7 +1,7 @@
 :mod:`util` --- General Utilities
 ============================================
 
-The :mod:`ale.drivers` module
+The :mod:`ale.util` module
 
 .. versionadded:: 0.1.0