4 files changed, 16 insertions, 16 deletions
diff --git a/web-server/opendc/models/experiment.py b/web-server/opendc/models/experiment.py
index 36b5d415..46373b99 100644
--- a/web-server/opendc/models/experiment.py
+++ b/web-server/opendc/models/experiment.py
@@ -12,13 +12,13 @@ class Experiment(Model):
     def check_user_access(self, google_id, edit_access):
         """Raises an error if the user with given [google_id] has insufficient access.
 
-        Checks access on the parent simulation.
+        Checks access on the parent project.
 
         :param google_id: The Google ID of the user.
         :param edit_access: True when edit access should be checked, otherwise view access.
         """
         user = User.from_google_id(google_id)
         authorizations = list(
-            filter(lambda x: str(x['simulationId']) == str(self.obj['simulationId']), user.obj['authorizations']))
+            filter(lambda x: str(x['projectId']) == str(self.obj['projectId']), user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
             raise ClientError(Response(403, 'Forbidden from retrieving/editing experiment.'))
diff --git a/web-server/opendc/models/prefab.py b/web-server/opendc/models/prefab.py
index ca9f0b3a..42c29697 100644
--- a/web-server/opendc/models/prefab.py
+++ b/web-server/opendc/models/prefab.py
@@ -6,7 +6,7 @@ from opendc.util.rest import Response
 
 
 class Prefab(Model):
-    """Model representing a Simulation."""
+    """Model representing a Project."""
 
     collection_name = 'prefabs'
 
@@ -22,7 +22,7 @@ class Prefab(Model):
             raise ClientError(Response(403, "Forbidden from retrieving prefab."))
 
     def get_all_authorizations(self):
-        """Get all user IDs having access to this simulation."""
+        """Get all user IDs having access to this project."""
         return [
             str(user['_id']) for user in DB.fetch_all({'authorizations': {
                 'prefabId': self.obj['_id']
diff --git a/web-server/opendc/models/simulation.py b/web-server/opendc/models/project.py
index 9a2770cf..b57e9f77 100644
--- a/web-server/opendc/models/simulation.py
+++ b/web-server/opendc/models/project.py
@@ -5,10 +5,10 @@ from opendc.util.exceptions import ClientError
 from opendc.util.rest import Response
 
 
-class Simulation(Model):
-    """Model representing a Simulation."""
+class Project(Model):
+    """Model representing a Project."""
 
-    collection_name = 'simulations'
+    collection_name = 'projects'
 
     def check_user_access(self, google_id, edit_access):
         """Raises an error if the user with given [google_id] has insufficient access.
@@ -17,15 +17,15 @@ class Simulation(Model):
         :param edit_access: True when edit access should be checked, otherwise view access.
         """
         user = User.from_google_id(google_id)
-        authorizations = list(filter(lambda x: str(x['simulationId']) == str(self.get_id()),
+        authorizations = list(filter(lambda x: str(x['projectId']) == str(self.get_id()),
                                      user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
-            raise ClientError(Response(403, "Forbidden from retrieving simulation."))
+            raise ClientError(Response(403, "Forbidden from retrieving project."))
 
     def get_all_authorizations(self):
-        """Get all user IDs having access to this simulation."""
+        """Get all user IDs having access to this project."""
         return [
             str(user['_id']) for user in DB.fetch_all({'authorizations': {
-                'simulationId': self.obj['_id']
+                'projectId': self.obj['_id']
             }}, User.collection_name)
         ]
diff --git a/web-server/opendc/models/topology.py b/web-server/opendc/models/topology.py
index 0ceecec5..cb4c4bab 100644
--- a/web-server/opendc/models/topology.py
+++ b/web-server/opendc/models/topology.py
@@ -5,23 +5,23 @@ from opendc.util.rest import Response
 
 
 class Topology(Model):
-    """Model representing a Simulation."""
+    """Model representing a Project."""
 
     collection_name = 'topologies'
 
     def check_user_access(self, google_id, edit_access):
         """Raises an error if the user with given [google_id] has insufficient access.
 
-        Checks access on the parent simulation.
+        Checks access on the parent project.
 
         :param google_id: The Google ID of the user.
         :param edit_access: True when edit access should be checked, otherwise view access.
         """
         user = User.from_google_id(google_id)
-        if 'simulationId' not in self.obj:
-            raise ClientError(Response(400, 'Missing simulationId in topology.'))
+        if 'projectId' not in self.obj:
+            raise ClientError(Response(400, 'Missing projectId in topology.'))
 
         authorizations = list(
-            filter(lambda x: str(x['simulationId']) == str(self.obj['simulationId']), user.obj['authorizations']))
+            filter(lambda x: str(x['projectId']) == str(self.obj['projectId']), user.obj['authorizations']))
         if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
             raise ClientError(Response(403, 'Forbidden from retrieving topology.'))