diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b6977a9..fdde2ed 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,10 +18,10 @@ jobs:
         awk -F '\/' '{ print tolower($2) }' |
         tr '_' '-'
         )
-    - name: Set up Python 3.6
+    - name: Set up Python 3.7
       uses: actions/setup-python@v1
       with:
-        python-version: 3.6
+        python-version: 3.7
     - name: Versions
       run: |
         python3 --version
diff --git a/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py b/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py
index a3890c6..7473552 100644
--- a/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py
+++ b/adafruit_ble_berrymed_pulse_oximeter/adafruit_ble_transparent_uart.py
@@ -21,8 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`nordic`
-====================================================
+`adafruit_ble_berrymed_pulse_oximeter.adafruit_ble_transparent_uart`
+=============================================================================
 
 This module provides Services used by MicroChip
 
diff --git a/docs/api.rst b/docs/api.rst
index e5a5b44..4e801a0 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -1,3 +1,5 @@
+:py:mod:`~adafruit_ble_berrymed_pulse_oximeter`
+===============================================
 
 .. If you created a package, create one automodule per module in the package.
 
@@ -6,3 +8,6 @@
 
 .. automodule:: adafruit_ble_berrymed_pulse_oximeter
    :members:
+
+.. automodule:: adafruit_ble_berrymed_pulse_oximeter.adafruit_ble_transparent_uart
+   :members:
diff --git a/docs/conf.py b/docs/conf.py
index 7d48f4d..1af8150 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
-# autodoc_mock_imports = ["digitalio", "busio"]
+autodoc_mock_imports = ["bleak"]
 
 
 intersphinx_mapping = {
diff --git a/setup.py b/setup.py
index 35d1013..ea7d2a5 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
     long_description = f.read()
 
 setup(
-    name="adafruit-circuitpython-ble-pulse-oximeter",
+    name="adafruit-circuitpython-ble-berrymed-pulse-oximeter",
     use_scm_version=True,
     setup_requires=["setuptools_scm"],
     description="BLE Support for BerryMed Pulse Oximeter Service",
@@ -44,10 +44,10 @@
         "Programming Language :: Python :: 3.5",
     ],
     # What does your project relate to?
-    keywords="adafruit blinka circuitpython micropython ble_contec_pulse_oximeter ble pulse oximeter berrymed spo2",
+    keywords="adafruit blinka circuitpython micropython ble_berrymed_pulse_oximeter ble pulse oximeter berrymed spo2",
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
     # TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
     #       CHANGE `py_modules=['...']` TO `packages=['...']`
-    py_modules=["adafruit_ble_contec_pulse_oximeter"],
+    packages=["adafruit_ble_berrymed_pulse_oximeter"],
 )