diff --git a/README.md b/README.md
index 863274dd..ba2dbe31 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Basic principals:
 
 ## to use
 
-    $> python -m multiuser_notebook
+    $> python -m multiuser
 
 visit `http://localhost:8000`, and login (any username, password=`password`).
 
diff --git a/multiuser_notebook/__init__.py b/multiuser/__init__.py
similarity index 100%
rename from multiuser_notebook/__init__.py
rename to multiuser/__init__.py
diff --git a/multiuser_notebook/__main__.py b/multiuser/__main__.py
similarity index 100%
rename from multiuser_notebook/__main__.py
rename to multiuser/__main__.py
diff --git a/multiuser_notebook/headers.py b/multiuser/headers.py
similarity index 100%
rename from multiuser_notebook/headers.py
rename to multiuser/headers.py
diff --git a/multiuser_notebook/js/configproxy.js b/multiuser/js/configproxy.js
similarity index 100%
rename from multiuser_notebook/js/configproxy.js
rename to multiuser/js/configproxy.js
diff --git a/multiuser_notebook/js/main.js b/multiuser/js/main.js
similarity index 100%
rename from multiuser_notebook/js/main.js
rename to multiuser/js/main.js
diff --git a/multiuser_notebook/multiuser.py b/multiuser/multiuser.py
similarity index 98%
rename from multiuser_notebook/multiuser.py
rename to multiuser/multiuser.py
index dae35fea..62ae97ad 100644
--- a/multiuser_notebook/multiuser.py
+++ b/multiuser/multiuser.py
@@ -40,6 +40,7 @@ auth_header_pat = re.compile(r'^token\s+([^\s]+)$')
 here = os.path.dirname(__file__)
 
 def token_authorized(method):
+    """decorator for a method authorized by the Authorization header"""
     def check_token(self, *args, **kwargs):
         auth_header = self.request.headers.get('Authorization', '')
         match = auth_header_pat.match(auth_header)
@@ -52,6 +53,8 @@ def token_authorized(method):
             raise web.HTTPError(403)
         self.request_session = session
         return method(self, *args, **kwargs)
+    check_token.__name__ = method.__name__
+    check_token.__doc__ = method.__doc__
     return check_token
 
 
@@ -98,7 +101,7 @@ class UserSession(HasTraits):
     
     def start(self):
         assert self.process is None or self.process.poll() is not None
-        cmd = [sys.executable, '-m', 'multiuser_notebook.singleuser',
+        cmd = [sys.executable, '-m', 'multiuser.singleuser',
             '--user=%s' % self.user, '--port=%i' % self.port,
             '--cookie-name=%s' % self.cookie_name,
             '--multiuser-prefix=%s' % self.multiuser_prefix,
diff --git a/multiuser_notebook/singleuser.py b/multiuser/singleuser.py
similarity index 100%
rename from multiuser_notebook/singleuser.py
rename to multiuser/singleuser.py
diff --git a/multiuser_notebook/templates/login.html b/multiuser/templates/login.html
similarity index 100%
rename from multiuser_notebook/templates/login.html
rename to multiuser/templates/login.html
diff --git a/multiuser_notebook/templates/singleuser.html b/multiuser/templates/singleuser.html
similarity index 100%
rename from multiuser_notebook/templates/singleuser.html
rename to multiuser/templates/singleuser.html