diff --git a/compatibility_lib/compatibility_lib/compatibility_store.py b/compatibility_lib/compatibility_lib/compatibility_store.py
index c94f1afc..27a7a861 100644
--- a/compatibility_lib/compatibility_lib/compatibility_store.py
+++ b/compatibility_lib/compatibility_lib/compatibility_store.py
@@ -168,7 +168,7 @@ def connect(self):
                 port=self.mysql_port,
                 user=self.mysql_user,
                 password=self.mysql_password,
-                db=_DATABASE_NAME,
+                db=self.mysql_db,
                 charset='utf8mb4')
         return conn
 
diff --git a/compatibility_lib/compatibility_lib/configs.py b/compatibility_lib/compatibility_lib/configs.py
index 2e832bd4..ea185bff 100644
--- a/compatibility_lib/compatibility_lib/configs.py
+++ b/compatibility_lib/compatibility_lib/configs.py
@@ -102,7 +102,7 @@ def _format_url(repo_name, setuppy_path=''):
         'google-cloud-iot',
     _format_url('googleapis/google-cloud-python', 'kms'):
         'google-cloud-kms',
-    _format_url('googleapis/google-cloud-python', 'ndb'):
+    _format_url('googleapis/python-ndb', ''):
         'google-cloud-ndb',
     # This is not released yet
     _format_url('googleapis/google-cloud-python', 'oslogin'):
diff --git a/compatibility_server/configs.py b/compatibility_server/configs.py
index 2e832bd4..ea185bff 100644
--- a/compatibility_server/configs.py
+++ b/compatibility_server/configs.py
@@ -102,7 +102,7 @@ def _format_url(repo_name, setuppy_path=''):
         'google-cloud-iot',
     _format_url('googleapis/google-cloud-python', 'kms'):
         'google-cloud-kms',
-    _format_url('googleapis/google-cloud-python', 'ndb'):
+    _format_url('googleapis/python-ndb', ''):
         'google-cloud-ndb',
     # This is not released yet
     _format_url('googleapis/google-cloud-python', 'oslogin'):