diff --git a/internal/handler/insightsFactsParserFilter_test.go b/internal/handler/insightsFactsParserFilter_test.go
index 67543c2..a4954dc 100644
--- a/internal/handler/insightsFactsParserFilter_test.go
+++ b/internal/handler/insightsFactsParserFilter_test.go
@@ -87,7 +87,7 @@ func Test_processFactsInsightsData(t *testing.T) {
 				v:         string(data),
 				apiClient: apiClient,
 				resource: ResourceDestination{
-					Project: "high-cotton",
+					Project: "organization-cotton",
 					Service: "cli",
 				},
 			},
diff --git a/internal/handler/testassets/directFactsPayload.json b/internal/handler/testassets/directFactsPayload.json
index a4f5583..2862c66 100644
--- a/internal/handler/testassets/directFactsPayload.json
+++ b/internal/handler/testassets/directFactsPayload.json
@@ -1,12 +1,11 @@
 {
-  "projectName": "high-cotton",
+  "projectName": "organization-cotton",
   "environment": 3,
-  "environmentName": "Master",
+  "environmentName": "main",
   "facts": [
     {
-      "projectName": "high-cotton",
-      "environment": 3,
-      "environmentName": "Master",
+      "projectName": "organization-cotton",
+      "environmentName": "main",
       "name": "drupal-core",
       "value": "9.0.1",
       "description": "Drupal CMS version found on environment",
@@ -16,9 +15,8 @@
       "keyFact": true
     },
     {
-      "projectName": "high-cotton",
-      "environment": 3,
-      "environmentName": "Master",
+      "projectName": "organization-cotton",
+      "environmentName": "main",
       "name": "php-version",
       "value": "8.0.3",
       "description": "PHP version found on environment",
diff --git a/internal/handler/testassets/directProblemsPayload.json b/internal/handler/testassets/directProblemsPayload.json
index c1b040f..cb517e2 100644
--- a/internal/handler/testassets/directProblemsPayload.json
+++ b/internal/handler/testassets/directProblemsPayload.json
@@ -1,7 +1,7 @@
 {
-  "projectName": "test6-drupal-example-simple",
-  "environment": 1236,
-  "environmentName": "test1copy",
+  "projectName": "organization-cotton",
+  "environment": 3,
+  "environmentName": "main",
   "problems": [
     {
       "environment": 3,
diff --git a/internal/handler/testassets/directProblemsPayload2.json b/internal/handler/testassets/directProblemsPayload2.json
index 1624347..846425e 100644
--- a/internal/handler/testassets/directProblemsPayload2.json
+++ b/internal/handler/testassets/directProblemsPayload2.json
@@ -1,10 +1,10 @@
 {
-  "environment": 1236,
-  "projectName": "test6-drupal-example-simple",
-  "environmentName": "test1copy",
+  "environment": 3,
+  "projectName": "organization-cotton",
+  "environmentName": "main",
   "problems": [
     {
-      "environment": 1236,
+      "environment": 3,
       "identifier": "1234",
       "version": "1.0.1",
       "fixedVersion": "1.0.2",
diff --git a/internal/handler/testassets/rawFactsInsightsPayload.json b/internal/handler/testassets/rawFactsInsightsPayload.json
index c9a8051..cb032a8 100644
--- a/internal/handler/testassets/rawFactsInsightsPayload.json
+++ b/internal/handler/testassets/rawFactsInsightsPayload.json
@@ -1,8 +1,8 @@
 {
   "payload": [
     {
-      "project": "high-cotton",
-      "environment": "Master",
+      "project": "organization-cotton",
+      "environment": "main",
       "facts": [
         {
           "name": "drupal-core",
@@ -30,8 +30,8 @@
   "binaryPayload": {},
   "annotations": {},
   "labels": {
-    "lagoon.sh/project": "high-cotton",
-    "lagoon.sh/environment": "Master",
+    "lagoon.sh/project": "organization-cotton",
+    "lagoon.sh/environment": "main",
     "lagoon.sh/service": "cli",
     "lagoon.sh/insightsType": "raw",
     "lagoon.sh/insightsOutputFileMIMEType": "application/json",
diff --git a/internal/handler/testassets/testImageInspect.gz.json b/internal/handler/testassets/testImageInspect.gz.json
index 56aa4df..387ee01 100644
--- a/internal/handler/testassets/testImageInspect.gz.json
+++ b/internal/handler/testassets/testImageInspect.gz.json
@@ -5,8 +5,8 @@
   },
   "annotations": {},
   "labels": {
-    "lagoon.sh/project": "high-cotton",
-    "lagoon.sh/environment": "Master",
+    "lagoon.sh/project": "organization-cotton",
+    "lagoon.sh/environment": "main",
     "lagoon.sh/service": "cli",
     "lagoon.sh/insightsType": "image-gz",
     "lagoon.sh/insightsOutputCompressed": "true"
diff --git a/internal/handler/testassets/testImageInspectCompressedOutput.gz.json b/internal/handler/testassets/testImageInspectCompressedOutput.gz.json
index 56aa4df..387ee01 100644
--- a/internal/handler/testassets/testImageInspectCompressedOutput.gz.json
+++ b/internal/handler/testassets/testImageInspectCompressedOutput.gz.json
@@ -5,8 +5,8 @@
   },
   "annotations": {},
   "labels": {
-    "lagoon.sh/project": "high-cotton",
-    "lagoon.sh/environment": "Master",
+    "lagoon.sh/project": "organization-cotton",
+    "lagoon.sh/environment": "main",
     "lagoon.sh/service": "cli",
     "lagoon.sh/insightsType": "image-gz",
     "lagoon.sh/insightsOutputCompressed": "true"
diff --git a/internal/handler/testassets/testRawJson.json b/internal/handler/testassets/testRawJson.json
index 80dd815..ded9048 100644
--- a/internal/handler/testassets/testRawJson.json
+++ b/internal/handler/testassets/testRawJson.json
@@ -5,8 +5,8 @@
   "binaryPayload": {},
   "annotations": {},
   "labels": {
-    "lagoon.sh/project": "high-cotton",
-    "lagoon.sh/environment": "Master",
+    "lagoon.sh/project": "organization-cotton",
+    "lagoon.sh/environment": "main",
     "lagoon.sh/service": "cli",
     "lagoon.sh/insightsType": "raw",
     "lagoon.sh/insightsOutputFileMIMEType": "application/json",
diff --git a/internal/handler/testassets/testSbomCompressedOutput.gz.json b/internal/handler/testassets/testSbomCompressedOutput.gz.json
index 140cbfc..533c017 100644
--- a/internal/handler/testassets/testSbomCompressedOutput.gz.json
+++ b/internal/handler/testassets/testSbomCompressedOutput.gz.json
@@ -5,8 +5,8 @@
   },
   "annotations": {},
   "labels": {
-    "lagoon.sh/project": "high-cotton",
-    "lagoon.sh/environment": "Master",
+    "lagoon.sh/project": "organization-cotton",
+    "lagoon.sh/environment": "main",
     "lagoon.sh/service": "cli",
     "lagoon.sh/insightsType": "sbom-gz",
     "lagoon.sh/insightsOutputCompressed": "true"