3 files changed, 16 insertions, 9 deletions

diff --git a/src/mailman_pgp/model/address.py b/src/mailman_pgp/model/address.py
index 3ef95b4..60c6e2f 100644
--- a/src/mailman_pgp/model/address.py
+++ b/src/mailman_pgp/model/address.py
@@ -28,8 +28,8 @@ from mailman_pgp.config import config
 from mailman_pgp.model.base import Base
 
 
-class EncryptedAddress(Base):
-    __tablename__ = 'encrypted_addresses'
+class PGPAddress(Base):
+    __tablename__ = 'pgp_addresses'
 
     id = Column(Integer, primary_key=True)
     email = Column(SAUnicode, index=True)
diff --git a/src/mailman_pgp/model/base.py b/src/mailman_pgp/model/base.py
index 0a87a53..2ccc7e5 100644
--- a/src/mailman_pgp/model/base.py
+++ b/src/mailman_pgp/model/base.py
@@ -18,11 +18,18 @@
 """"""
 
 from public import public
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.declarative import as_declarative
 
+from mailman_pgp.database import query
 
-Base = declarative_base()
-public(Base=Base)
 
-from mailman_pgp.model.address import EncryptedAddress # noqa
-from mailman_pgp.model.list import EncryptedMailingList # noqa
+@public
+@as_declarative()
+class Base:
+
+    def query(self):
+        return query(self.__class__)
+
+
+from mailman_pgp.model.address import PGPAddress # noqa
+from mailman_pgp.model.list import PGPMailingList # noqa
diff --git a/src/mailman_pgp/model/list.py b/src/mailman_pgp/model/list.py
index 4a25f0a..84dd1a8 100644
--- a/src/mailman_pgp/model/list.py
+++ b/src/mailman_pgp/model/list.py
@@ -34,8 +34,8 @@ from mailman_pgp.pgp.keygen import ListKeyGenerator
 
 
 @public
-class EncryptedMailingList(Base):
-    __tablename__ = 'encrypted_lists'
+class PGPMailingList(Base):
+    __tablename__ = 'pgp_lists'
 
     id = Column(Integer, primary_key=True)
     list_id = Column(SAUnicode, index=True)