diff --git a/alembic/versions/a6837632686c_change_workspace_and_project_tables.py b/alembic/versions/a6837632686c_change_workspace_and_project_tables.py
new file mode 100644
index 00000000..be2712f9
--- /dev/null
+++ b/alembic/versions/a6837632686c_change_workspace_and_project_tables.py
@@ -0,0 +1,28 @@
+"""change workspace and project tables
+
+Revision ID: a6837632686c
+Revises: acd0c11be93a
+Create Date: 2019-01-11 10:36:55.030308
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'a6837632686c'
+down_revision = 'acd0c11be93a'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.rename_table("workspaces", "portfolios")
+    op.rename_table("projects", "applications")
+    op.rename_table("workspace_roles", "portfolio_roles")
+
+
+def downgrade():
+    op.rename_table("portfolios", "workspaces")
+    op.rename_table("applications", "projects")
+    op.rename_table("portfolio_roles", "workspace_roles")
diff --git a/atst/models/application.py b/atst/models/application.py
index bc2c5ad7..02c7185a 100644
--- a/atst/models/application.py
+++ b/atst/models/application.py
@@ -7,13 +7,13 @@ from atst.models import mixins
 
 
 class Application(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
-    __tablename__ = "projects"
+    __tablename__ = "applications"
 
     id = Id()
     name = Column(String, nullable=False)
     description = Column(String, nullable=False)
 
-    portfolio_id = Column(ForeignKey("workspaces.id"), nullable=False)
+    portfolio_id = Column(ForeignKey("portfolios.id"), nullable=False)
     portfolio = relationship("Portfolio")
     environments = relationship("Environment", back_populates="application")
 
diff --git a/atst/models/audit_event.py b/atst/models/audit_event.py
index 2f101784..c705ab1d 100644
--- a/atst/models/audit_event.py
+++ b/atst/models/audit_event.py
@@ -14,7 +14,7 @@ class AuditEvent(Base, TimestampsMixin):
     user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"), index=True)
     user = relationship("User", backref="audit_events")
 
-    portfolio_id = Column(UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True)
+    portfolio_id = Column(UUID(as_uuid=True), ForeignKey("portfolios.id"), index=True)
     portfolio = relationship("Portfolio", backref="audit_events")
 
     request_id = Column(UUID(as_uuid=True), ForeignKey("requests.id"), index=True)
diff --git a/atst/models/environment.py b/atst/models/environment.py
index 249220da..a520e787 100644
--- a/atst/models/environment.py
+++ b/atst/models/environment.py
@@ -12,7 +12,7 @@ class Environment(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     id = Id()
     name = Column(String, nullable=False)
 
-    application_id = Column(ForeignKey("projects.id"), nullable=False)
+    application_id = Column(ForeignKey("applications.id"), nullable=False)
     application = relationship("Application")
 
     cloud_id = Column(String)
diff --git a/atst/models/invitation.py b/atst/models/invitation.py
index 9241ee15..fb92c178 100644
--- a/atst/models/invitation.py
+++ b/atst/models/invitation.py
@@ -28,7 +28,7 @@ class Invitation(Base, TimestampsMixin, AuditableMixin):
     user = relationship("User", backref="invitations", foreign_keys=[user_id])
 
     portfolio_role_id = Column(
-        UUID(as_uuid=True), ForeignKey("workspace_roles.id"), index=True
+        UUID(as_uuid=True), ForeignKey("portfolio_roles.id"), index=True
     )
     portfolio_role = relationship(
         "PortfolioRole",
diff --git a/atst/models/portfolio.py b/atst/models/portfolio.py
index a40d9e95..da7e8301 100644
--- a/atst/models/portfolio.py
+++ b/atst/models/portfolio.py
@@ -9,7 +9,7 @@ from atst.database import db
 
 
 class Portfolio(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
-    __tablename__ = "workspaces"
+    __tablename__ = "portfolios"
 
     id = types.Id()
     name = Column(String)
diff --git a/atst/models/portfolio_role.py b/atst/models/portfolio_role.py
index 895e555d..b41ae322 100644
--- a/atst/models/portfolio_role.py
+++ b/atst/models/portfolio_role.py
@@ -31,11 +31,11 @@ class Status(Enum):
 
 
 class PortfolioRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
-    __tablename__ = "workspace_roles"
+    __tablename__ = "portfolio_roles"
 
     id = Id()
     portfolio_id = Column(
-        UUID(as_uuid=True), ForeignKey("workspaces.id"), index=True, nullable=False
+        UUID(as_uuid=True), ForeignKey("portfolios.id"), index=True, nullable=False
     )
     portfolio = relationship("Portfolio", back_populates="roles")
 
diff --git a/atst/models/task_order.py b/atst/models/task_order.py
index 14c00375..86e67443 100644
--- a/atst/models/task_order.py
+++ b/atst/models/task_order.py
@@ -24,7 +24,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
 
     id = types.Id()
 
-    portfolio_id = Column(ForeignKey("workspaces.id"))
+    portfolio_id = Column(ForeignKey("portfolios.id"))
     portfolio = relationship("Portfolio")
 
     user_id = Column(ForeignKey("users.id"))