diff --git a/__init__.py b/__init__.py
index 3300119..4253b42 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1 +1,4 @@
-from .re2oapi import Re2oAPI
+from .re2oapi import Re2oAPIClient
+from .re2oapi import exceptions
+
+__all__ = ['Re2oAPIClient', 'exceptions']
diff --git a/re2oapi/__init__.py b/re2oapi/__init__.py
index bf3e0a7..e69de29 100644
--- a/re2oapi/__init__.py
+++ b/re2oapi/__init__.py
@@ -1,2 +0,0 @@
-from .api import Re2oAPI
-from . import exceptions
diff --git a/re2oapi/api.py b/re2oapi/client.py
similarity index 99%
rename from re2oapi/api.py
rename to re2oapi/client.py
index ff1a584..084ddc0 100644
--- a/re2oapi/api.py
+++ b/re2oapi/client.py
@@ -8,7 +8,7 @@ from . import exceptions
 TIME_FOR_RENEW = 60
 
 
-class Re2oAPI:
+class Re2oAPIClient:
 
     def __init__(self, hostname, username, password, use_tls=True):
         self.use_tls = use_tls