diff --git a/README.md b/README.md
index 7f7da56..fa41bdd 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ as you like.
 ## Modules
 
 
-### batterychecker
+### battery
 
 
 This class uses the /proc/acpi/battery interface to check for the
diff --git a/i3pystatus/__init__.py b/i3pystatus/__init__.py
index 4ecb2df..41b4a90 100644
--- a/i3pystatus/__init__.py
+++ b/i3pystatus/__init__.py
@@ -15,7 +15,6 @@ __all__ = [
     "ConfigError", "ConfigKeyError", "ConfigMissingError", "ConfigAmbigiousClassesError", "ConfigInvalidModuleError",
     "Module", "AsyncModule", "IntervalModule",
     "i3pystatus", "I3statusHandler",
-    "get_path" # We need that for mkdocs
 ]
 
 class ConfigError(Exception):
@@ -42,9 +41,6 @@ class ConfigInvalidModuleError(ConfigError):
     def format(self):
         return "no class found"
 
-def get_path():
-    return __path__
-
 class KeyConstraintDict(collections.UserDict):
     class MissingKeys(Exception):
         def __init__(self, keys):
diff --git a/i3pystatus/mail/notmuchmail.py b/i3pystatus/mail/notmuchmail.py
index b60b5b4..131771b 100644
--- a/i3pystatus/mail/notmuchmail.py
+++ b/i3pystatus/mail/notmuchmail.py
@@ -8,7 +8,7 @@ import json
 
 from i3pystatus.mail import Backend
 
-class NotmuchMailChecker(Backend):
+class Notmuch(Backend):
     """
     This class uses the notmuch python bindings to check for the
     number of messages in the notmuch database with the tags "inbox"