diff --git a/stack/cloud_function_ais_analysis.py b/stack/cloud_function_ais_analysis.py
index ac145f7c..bfdf1529 100644
--- a/stack/cloud_function_ais_analysis.py
+++ b/stack/cloud_function_ais_analysis.py
@@ -10,7 +10,7 @@
 stack = pulumi.get_stack()
 # We will store the source code to the Cloud Function in a Google Cloud Storage bucket.
 bucket = storage.Bucket(
-    construct_name("bucket-cloud-function-ais"),
+    construct_name("bucket-cloud-function-ais-analysis"),
     location="EU",
     labels={"pulumi": "true", "environment": pulumi.get_stack()},
 )
@@ -69,12 +69,12 @@
 
 # Assign access to cloud SQL
 cloud_function_service_account = serviceaccount.Account(
-    construct_name("cloud-function"),
-    account_id=f"{stack}-cloud-function",
+    construct_name("cloud-function-ais-analysis"),
+    account_id=f"{stack}-cloud-function-ais-analysis",
     display_name="Service Account for cloud function.",
 )
 cloud_function_service_account_iam = projects.IAMMember(
-    construct_name("cloud-function-iam"),
+    construct_name("cloud-function-ais-analysis-iam"),
     project=pulumi.Config("gcp").require("project"),
     role="projects/cerulean-338116/roles/cloudfunctionaisanalysisrole",
     member=cloud_function_service_account.email.apply(
diff --git a/stack/cloud_function_scene_relevancy.py b/stack/cloud_function_scene_relevancy.py
index ed37b168..47bb1d0e 100644
--- a/stack/cloud_function_scene_relevancy.py
+++ b/stack/cloud_function_scene_relevancy.py
@@ -11,7 +11,7 @@
 stack = pulumi.get_stack()
 # We will store the source code to the Cloud Function in a Google Cloud Storage bucket.
 bucket = storage.Bucket(
-    construct_name("bucket-cloud-function-relevancy"),
+    construct_name("bucket-cloud-function-scene-relevancy"),
     location="EU",
     labels={"pulumi": "true", "environment": pulumi.get_stack()},
 )
@@ -70,12 +70,12 @@
 
 # Assign access to cloud SQL
 cloud_function_service_account = serviceaccount.Account(
-    construct_name("cloud-function"),
-    account_id=f"{stack}-cloud-function",
+    construct_name("cloud-function-scene-relevancy"),
+    account_id=f"{stack}-cloud-function-scene-relevancy",
     display_name="Service Account for cloud function.",
 )
 cloud_function_service_account_iam = projects.IAMMember(
-    construct_name("cloud-function-iam"),
+    construct_name("cloud-function-scene-relevancy-iam"),
     project=pulumi.Config("gcp").require("project"),
     role="projects/cerulean-338116/roles/cloudfunctionscenerelevancyrole",
     member=cloud_function_service_account.email.apply(