diff --git a/github3/__init__.py b/github3/__init__.py
index 8cc2548..02ad01e 100644
--- a/github3/__init__.py
+++ b/github3/__init__.py
@@ -36,4 +36,4 @@ __version__ = '0.0.1'
 
 # Module namespace.
 
-from .core import from_pass
\ No newline at end of file
+from .core import login
\ No newline at end of file
diff --git a/github3/api.py b/github3/api.py
index c35a4ca..9c1361f 100644
--- a/github3/api.py
+++ b/github3/api.py
@@ -7,8 +7,9 @@ heroku.api
 This module provides the basic API interface for Heroku.
 """
 
+import json
+
 import requests
-from .compat import json
 from .helpers import is_collection
 from .structures import KeyedListResource
 from .models import *
diff --git a/github3/core.py b/github3/core.py
index ec95aa6..071dea2 100644
--- a/github3/core.py
+++ b/github3/core.py
@@ -9,7 +9,7 @@ This module provides the base entrypoint for github3.
 
 from .api import Github
 
-def from_key(username, password):
+def login(username, password):
     """Returns an authenticated Github instance, via API Key."""
 
     gh = Github()