diff --git a/database/models.py b/database/models.py
index 0049c88e329d63de6a0939c635f3d62c95d7eeef..bbebc479b0befc67d92c0b4c2b15933156d3ef48 100644
--- a/database/models.py
+++ b/database/models.py
@@ -6,36 +6,36 @@ from sqlalchemy import Boolean, DateTime, Column, Integer, \
                        String, ForeignKey
 
 class RolesUsers(Base):
-    __tablename__ = 'roles_users'
+    __tablename__ = 'oas_roles_users'
     id = Column(Integer(), primary_key=True)
-    user_id = Column('user_id', Integer(), ForeignKey('user.id'))
-    role_id = Column('role_id', Integer(), ForeignKey('role.id'))
+    user_id = Column('user_id', Integer(), ForeignKey('oas_user.id'))
+    role_id = Column('role_id', Integer(), ForeignKey('oas_role.id'))
 
 class ApplicationsUsers(Base):
-    __tablename__ = 'applications_users'
+    __tablename__ = 'oas_applications_users'
     id = Column(Integer(), primary_key=True)
-    user_id = Column('user_id', Integer(), ForeignKey('user.id'))
-    application_id = Column('application_id', Integer(), ForeignKey('application.id'))
+    user_id = Column('user_id', Integer(), ForeignKey('oas_user.id'))
+    application_id = Column('application_id', Integer(), ForeignKey('oas_application.id'))
 
 class Role(Base, RoleMixin):
-    __tablename__ = 'role'
+    __tablename__ = 'oas_role'
     id = Column(Integer(), primary_key=True)
     name = Column(String(80), unique=True)
     description = Column(String(255))
 
 class Application(Base):
-    __tablename__ = 'application'
+    __tablename__ = 'oas_application'
     id = Column(Integer, primary_key=True)
     name = Column(String(80), unique=True)
 
 class User(Base, UserMixin):
-    __tablename__ = 'user'
+    __tablename__ = 'oas_user'
     id = Column(Integer, primary_key=True)
     email = Column(String(255), unique=True)
     username = Column(String(255))
     password = Column(String(255))
     active = Column(Boolean())
-    roles = relationship('Role', secondary='roles_users',
+    roles = relationship('Role', secondary='oas_roles_users',
                          backref=backref('users', lazy='dynamic'))
-    applications = relationship('Application', secondary='applications_users',
+    applications = relationship('Application', secondary='oas_applications_users',
                                 backref=backref('users', lazy='dynamic'))
diff --git a/test/test_database.py b/test/test_database.py
index e76092a326c987e8564a5f6f005e999070ffdc29..381f421d0350df403542726617c795b6327ff077 100644
--- a/test/test_database.py
+++ b/test/test_database.py
@@ -23,9 +23,9 @@ class DatabaseSetupTest(unittest.TestCase):
         pass
 
     def test_table_availability(self):
-        self.assertTrue(self.engine.has_table('user'))
-        self.assertTrue(self.engine.has_table('application'))
-        self.assertTrue(self.engine.has_table('role'))
+        self.assertTrue(self.engine.has_table('oas_user'))
+        self.assertTrue(self.engine.has_table('oas_application'))
+        self.assertTrue(self.engine.has_table('oas_role'))
 
     def test_connect_to_database_with_provided_config(self):
         db_user = environ["DATABASE_USER"]