diff --git a/setup.py b/setup.py
index 7ebc1a5..0fd6038 100644
--- a/setup.py
+++ b/setup.py
@@ -41,9 +41,9 @@ setup(
 
     entry_points = {
         'sqlalchemy.dialects' : [
-            'sqlbase7 = sqlbase7:base.dialect',
+            'sqlbase7 = sqlbase7_sa:base.dialect',
             ],
         },
 
-    test_suite = 'sqlbase7.tests',
+    test_suite = 'sqlbase7_sa.tests',
     )
diff --git a/sqlbase7_sa/__init__.py b/sqlbase7_sa/__init__.py
index 37937f2..55c35aa 100644
--- a/sqlbase7_sa/__init__.py
+++ b/sqlbase7_sa/__init__.py
@@ -23,10 +23,10 @@
 ################################################################################
 
 
-from sqlbase7 import base
-from sqlbase7 import pyodbc
+from sqlbase7_sa import base
+from sqlbase7_sa import pyodbc
 
-from sqlbase7._version import __version__
+from sqlbase7_sa._version import __version__
 
 
 # default dialect
diff --git a/sqlbase7_sa/pyodbc.py b/sqlbase7_sa/pyodbc.py
index 01bf773..a1f7c2f 100644
--- a/sqlbase7_sa/pyodbc.py
+++ b/sqlbase7_sa/pyodbc.py
@@ -25,7 +25,7 @@
 
 from sqlalchemy.connectors.pyodbc import PyODBCConnector
 
-from sqlbase7.base import SQLBase7Dialect
+from sqlbase7_sa.base import SQLBase7Dialect
 
 
 class SQLBase7_pyodbc(PyODBCConnector, SQLBase7Dialect):