diff --git a/DSL/Ruuter.private/GET/docker-file.yml b/DSL/Ruuter.private/GET/internal/docker-file.yml
similarity index 89%
rename from DSL/Ruuter.private/GET/docker-file.yml
rename to DSL/Ruuter.private/GET/internal/docker-file.yml
index bf492a32f..473eb0b87 100644
--- a/DSL/Ruuter.private/GET/docker-file.yml
+++ b/DSL/Ruuter.private/GET/internal/docker-file.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/GET/domain-file.yml b/DSL/Ruuter.private/GET/internal/domain-file.yml
similarity index 89%
rename from DSL/Ruuter.private/GET/domain-file.yml
rename to DSL/Ruuter.private/GET/internal/domain-file.yml
index d18ae5aef..5b75e3f32 100644
--- a/DSL/Ruuter.private/GET/domain-file.yml
+++ b/DSL/Ruuter.private/GET/internal/domain-file.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/GET/return-file-locations.yml b/DSL/Ruuter.private/GET/internal/return-file-locations.yml
similarity index 100%
rename from DSL/Ruuter.private/GET/return-file-locations.yml
rename to DSL/Ruuter.private/GET/internal/return-file-locations.yml
diff --git a/DSL/Ruuter.private/GET/rasa/config.yml b/DSL/Ruuter.private/GET/rasa/config.yml
index 8dae6ff59..7f80240ea 100644
--- a/DSL/Ruuter.private/GET/rasa/config.yml
+++ b/DSL/Ruuter.private/GET/rasa/config.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/GET/rasa/intents/common-intents.yml b/DSL/Ruuter.private/GET/rasa/intents/common.yml
similarity index 96%
rename from DSL/Ruuter.private/GET/rasa/intents/common-intents.yml
rename to DSL/Ruuter.private/GET/rasa/intents/common.yml
index 16a4ea25c..877ea7bfd 100644
--- a/DSL/Ruuter.private/GET/rasa/intents/common-intents.yml
+++ b/DSL/Ruuter.private/GET/rasa/intents/common.yml
@@ -21,7 +21,7 @@ getIntentsData:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: getDomainDataResult
diff --git a/DSL/Ruuter.private/GET/rasa/intents/intents-full.yml b/DSL/Ruuter.private/GET/rasa/intents/full.yml
similarity index 96%
rename from DSL/Ruuter.private/GET/rasa/intents/intents-full.yml
rename to DSL/Ruuter.private/GET/rasa/intents/full.yml
index 8d7f7bbe8..a63cc30ba 100644
--- a/DSL/Ruuter.private/GET/rasa/intents/intents-full.yml
+++ b/DSL/Ruuter.private/GET/rasa/intents/full.yml
@@ -17,7 +17,7 @@ getIntentsData:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: getDomainDataResult
diff --git a/DSL/Ruuter.private/GET/rasa/intents/in-model.yml b/DSL/Ruuter.private/GET/rasa/intents/in-model.yml
index de3165c6f..5a82e404a 100644
--- a/DSL/Ruuter.private/GET/rasa/intents/in-model.yml
+++ b/DSL/Ruuter.private/GET/rasa/intents/in-model.yml
@@ -1,7 +1,7 @@
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
diff --git a/DSL/Ruuter.private/GET/rasa/model/add-new-model.yml b/DSL/Ruuter.private/GET/rasa/model/add-new-model.yml
index ad888094d..4f5b6c833 100644
--- a/DSL/Ruuter.private/GET/rasa/model/add-new-model.yml
+++ b/DSL/Ruuter.private/GET/rasa/model/add-new-model.yml
@@ -1,7 +1,7 @@
 getDockerFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/docker-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/docker-file"
     headers:
       cookie: ${incoming.headers.cookie}  
   result: dockerData
@@ -128,7 +128,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
   result: fileLocations
 
 saveDockerFile:
diff --git a/DSL/Ruuter.private/GET/rasa/services/get-services-not-assigned-to-intent.yml b/DSL/Ruuter.private/GET/rasa/services/unassigned.yml
similarity index 100%
rename from DSL/Ruuter.private/GET/rasa/services/get-services-not-assigned-to-intent.yml
rename to DSL/Ruuter.private/GET/rasa/services/unassigned.yml
diff --git a/DSL/Ruuter.private/GET/rasa/training/results.yml b/DSL/Ruuter.private/GET/rasa/training/results.yml
index 12ded11e4..ed32d5e78 100644
--- a/DSL/Ruuter.private/GET/rasa/training/results.yml
+++ b/DSL/Ruuter.private/GET/rasa/training/results.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/GET/rules-file.yml b/DSL/Ruuter.private/GET/rules-file.yml
index cc3488b11..a565df6bf 100644
--- a/DSL/Ruuter.private/GET/rules-file.yml
+++ b/DSL/Ruuter.private/GET/rules-file.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/GET/stories-file.yml b/DSL/Ruuter.private/GET/stories-file.yml
index 58e87ad55..f0df7ecdd 100644
--- a/DSL/Ruuter.private/GET/stories-file.yml
+++ b/DSL/Ruuter.private/GET/stories-file.yml
@@ -1,7 +1,7 @@
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/extract-token.yml b/DSL/Ruuter.private/POST/extract-token.yml
index 1079cc71e..88530aa48 100644
--- a/DSL/Ruuter.private/POST/extract-token.yml
+++ b/DSL/Ruuter.private/POST/extract-token.yml
@@ -1,7 +1,7 @@
 extractTokenData:
   call: http.post
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/mock-tim-custom-jwt-userinfo"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/mock-tim-custom-jwt-userinfo"
     headers:
       cookie: ${incoming.headers.cookie}
     body:
diff --git a/DSL/Ruuter.private/POST/mock-tim-custom-jwt-userinfo.yml b/DSL/Ruuter.private/POST/internal/mock-tim-custom-jwt-userinfo.yml
similarity index 100%
rename from DSL/Ruuter.private/POST/mock-tim-custom-jwt-userinfo.yml
rename to DSL/Ruuter.private/POST/internal/mock-tim-custom-jwt-userinfo.yml
diff --git a/DSL/Ruuter.private/POST/sync/cron.yml b/DSL/Ruuter.private/POST/internal/sync/cron.yml
similarity index 100%
rename from DSL/Ruuter.private/POST/sync/cron.yml
rename to DSL/Ruuter.private/POST/internal/sync/cron.yml
diff --git a/DSL/Ruuter.private/POST/sync/docker.yml b/DSL/Ruuter.private/POST/internal/sync/docker.yml
similarity index 94%
rename from DSL/Ruuter.private/POST/sync/docker.yml
rename to DSL/Ruuter.private/POST/internal/sync/docker.yml
index 87fddd474..1f7c4dcee 100644
--- a/DSL/Ruuter.private/POST/sync/docker.yml
+++ b/DSL/Ruuter.private/POST/internal/sync/docker.yml
@@ -17,7 +17,7 @@ assignValues:
 getDockerFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/docker-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/docker-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: dockerData
@@ -63,7 +63,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/config/update.yml b/DSL/Ruuter.private/POST/rasa/config/update.yml
index 01e6ec660..3c8781fff 100644
--- a/DSL/Ruuter.private/POST/rasa/config/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/config/update.yml
@@ -6,7 +6,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/entities/add.yml b/DSL/Ruuter.private/POST/rasa/entities/add.yml
index 61bc7d022..4b31862fa 100644
--- a/DSL/Ruuter.private/POST/rasa/entities/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/entities/add.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -43,7 +43,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/entities/delete.yml b/DSL/Ruuter.private/POST/rasa/entities/delete.yml
index d4641ff3f..a33882f50 100644
--- a/DSL/Ruuter.private/POST/rasa/entities/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/entities/delete.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -95,7 +95,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/entities/update.yml b/DSL/Ruuter.private/POST/rasa/entities/update.yml
index 9a510d997..a709c6939 100644
--- a/DSL/Ruuter.private/POST/rasa/entities/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/entities/update.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -44,7 +44,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/forms/add.yml b/DSL/Ruuter.private/POST/rasa/forms/add.yml
index 81208b1df..cfe1f2b7f 100644
--- a/DSL/Ruuter.private/POST/rasa/forms/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/forms/add.yml
@@ -8,7 +8,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -76,7 +76,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/forms/delete.yml b/DSL/Ruuter.private/POST/rasa/forms/delete.yml
index 3c332791e..618ed963a 100644
--- a/DSL/Ruuter.private/POST/rasa/forms/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/forms/delete.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -77,7 +77,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/forms/update.yml b/DSL/Ruuter.private/POST/rasa/forms/update.yml
index c5068b07a..a808971af 100644
--- a/DSL/Ruuter.private/POST/rasa/forms/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/forms/update.yml
@@ -9,7 +9,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -70,7 +70,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/add-remove-from-model.yml b/DSL/Ruuter.private/POST/rasa/intents/add-remove-from-model.yml
index d62d7ec40..cb3a26d0a 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/add-remove-from-model.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/add-remove-from-model.yml
@@ -6,7 +6,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -62,7 +62,7 @@ updateDomainOpenSearch:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/add.yml b/DSL/Ruuter.private/POST/rasa/intents/add.yml
index 2bd8b81a9..656c92c2b 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/add.yml
@@ -27,7 +27,7 @@ validateIntentExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/delete.yml b/DSL/Ruuter.private/POST/rasa/intents/delete.yml
index 00f0e6cd0..1f6b958b8 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/delete.yml
@@ -22,7 +22,7 @@ validateIntentExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
@@ -206,7 +206,7 @@ saveIntentFile:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
diff --git a/DSL/Ruuter.private/POST/rasa/intents/download.yml b/DSL/Ruuter.private/POST/rasa/intents/download.yml
index 1d341551a..6cba47528 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/download.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/download.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/examples/add.yml b/DSL/Ruuter.private/POST/rasa/intents/examples/add.yml
index b75c8f84f..01528206c 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/examples/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/examples/add.yml
@@ -22,7 +22,7 @@ validateLength:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/examples/delete.yml b/DSL/Ruuter.private/POST/rasa/intents/examples/delete.yml
index fccc17361..28aba16d6 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/examples/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/examples/delete.yml
@@ -6,7 +6,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/examples/list.yml b/DSL/Ruuter.private/POST/rasa/intents/examples/list.yml
index 8759a7180..a1ecff9f4 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/examples/list.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/examples/list.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/examples/update.yml b/DSL/Ruuter.private/POST/rasa/intents/examples/update.yml
index 01d631bcd..82aa3cba8 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/examples/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/examples/update.yml
@@ -7,7 +7,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/get-intent-file.yml b/DSL/Ruuter.private/POST/rasa/intents/get-intent-file.yml
index 52c8bca8e..97e7df382 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/get-intent-file.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/get-intent-file.yml
@@ -6,7 +6,7 @@ assignParameters:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/turn-into-service.yml b/DSL/Ruuter.private/POST/rasa/intents/turn-into-service.yml
index b7661fe46..97f758df3 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/turn-into-service.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/turn-into-service.yml
@@ -5,7 +5,7 @@ assign_values:
 extract_token_data:
   call: http.post
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/mock-tim-custom-jwt-userinfo"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/mock-tim-custom-jwt-userinfo"
     headers:
       cookie: ${incoming.headers.cookie}
     body:
@@ -21,7 +21,7 @@ validate_administrator:
 get_domain_file:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -35,7 +35,7 @@ validate_intent_exists:
 get_file_locations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/intents/update.yml b/DSL/Ruuter.private/POST/rasa/intents/update.yml
index 41ca78b1a..907a80dd1 100644
--- a/DSL/Ruuter.private/POST/rasa/intents/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/intents/update.yml
@@ -28,7 +28,7 @@ validateIntentExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
@@ -283,7 +283,7 @@ deleteOldIntentFile:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
diff --git a/DSL/Ruuter.private/POST/rasa/regex/add-example.yml b/DSL/Ruuter.private/POST/rasa/regex/add-example.yml
index 8e6b7ace0..b3e2fcdd3 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/add-example.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/add-example.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/add.yml b/DSL/Ruuter.private/POST/rasa/regex/add.yml
index f1f5f669b..4e282076c 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/add.yml
@@ -21,7 +21,7 @@ validateRegexExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/delete-example.yml b/DSL/Ruuter.private/POST/rasa/regex/delete-example.yml
index 0533a13e1..188ce7c6d 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/delete-example.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/delete-example.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/delete.yml b/DSL/Ruuter.private/POST/rasa/regex/delete.yml
index fafbd09ea..280de01b2 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/delete.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/example.yml b/DSL/Ruuter.private/POST/rasa/regex/example.yml
index 03b2ebc30..ae2ccf6f7 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/example.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/example.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/update-example.yml b/DSL/Ruuter.private/POST/rasa/regex/update-example.yml
index ad3676cac..61aa02232 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/update-example.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/update-example.yml
@@ -5,7 +5,7 @@ assign_values:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/regex/update.yml b/DSL/Ruuter.private/POST/rasa/regex/update.yml
index 7d14bfaa0..3b925b1ac 100644
--- a/DSL/Ruuter.private/POST/rasa/regex/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/regex/update.yml
@@ -19,7 +19,7 @@ validateNewRegexNotExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/responses/add.yml b/DSL/Ruuter.private/POST/rasa/responses/add.yml
index e6f642946..971a7b6db 100644
--- a/DSL/Ruuter.private/POST/rasa/responses/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/responses/add.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -45,7 +45,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/responses/delete.yml b/DSL/Ruuter.private/POST/rasa/responses/delete.yml
index b31f778d5..5c1ca1481 100644
--- a/DSL/Ruuter.private/POST/rasa/responses/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/responses/delete.yml
@@ -6,7 +6,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -78,7 +78,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/responses/update.yml b/DSL/Ruuter.private/POST/rasa/responses/update.yml
index 148518840..d3248a619 100644
--- a/DSL/Ruuter.private/POST/rasa/responses/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/responses/update.yml
@@ -5,7 +5,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -45,7 +45,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/rules/add.yml b/DSL/Ruuter.private/POST/rasa/rules/add.yml
index 946c9e84a..1ebfc314b 100644
--- a/DSL/Ruuter.private/POST/rasa/rules/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/rules/add.yml
@@ -34,7 +34,7 @@ validateRuleName:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/rules/delete.yml b/DSL/Ruuter.private/POST/rasa/rules/delete.yml
index 42f64b762..a7eda28bc 100644
--- a/DSL/Ruuter.private/POST/rasa/rules/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/rules/delete.yml
@@ -21,7 +21,7 @@ validateRules:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/rules/update.yml b/DSL/Ruuter.private/POST/rasa/rules/update.yml
index 3882114f3..4248bde0c 100644
--- a/DSL/Ruuter.private/POST/rasa/rules/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/rules/update.yml
@@ -22,7 +22,7 @@ validateRules:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/slots/add.yml b/DSL/Ruuter.private/POST/rasa/slots/add.yml
index 754ca32ad..5bf3ec919 100644
--- a/DSL/Ruuter.private/POST/rasa/slots/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/slots/add.yml
@@ -6,7 +6,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -44,7 +44,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/slots/delete.yml b/DSL/Ruuter.private/POST/rasa/slots/delete.yml
index a36d08caf..8cb96a4b5 100644
--- a/DSL/Ruuter.private/POST/rasa/slots/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/slots/delete.yml
@@ -6,7 +6,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -94,7 +94,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/slots/update.yml b/DSL/Ruuter.private/POST/rasa/slots/update.yml
index b88924275..677d96545 100644
--- a/DSL/Ruuter.private/POST/rasa/slots/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/slots/update.yml
@@ -9,7 +9,7 @@ assign_values:
 getDomainFile:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/domain-file"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/domain-file"
     headers:
       cookie: ${incoming.headers.cookie}
   result: domainData
@@ -49,7 +49,7 @@ convertJsonToYaml:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/stories/add.yml b/DSL/Ruuter.private/POST/rasa/stories/add.yml
index 9ccd1eaf8..9fbc274e4 100644
--- a/DSL/Ruuter.private/POST/rasa/stories/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/stories/add.yml
@@ -34,7 +34,7 @@ validateStoryName:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/stories/delete.yml b/DSL/Ruuter.private/POST/rasa/stories/delete.yml
index 98cb5f0ad..962a08338 100644
--- a/DSL/Ruuter.private/POST/rasa/stories/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/stories/delete.yml
@@ -21,7 +21,7 @@ validateStories:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/stories/update.yml b/DSL/Ruuter.private/POST/rasa/stories/update.yml
index d4d329a64..5e48bd563 100644
--- a/DSL/Ruuter.private/POST/rasa/stories/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/stories/update.yml
@@ -36,7 +36,7 @@ validateStoryExists:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/test-stories/add.yml b/DSL/Ruuter.private/POST/rasa/test-stories/add.yml
index 9d6fe3986..90c9dcfbc 100644
--- a/DSL/Ruuter.private/POST/rasa/test-stories/add.yml
+++ b/DSL/Ruuter.private/POST/rasa/test-stories/add.yml
@@ -22,7 +22,7 @@ validateTestStories:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/test-stories/delete.yml b/DSL/Ruuter.private/POST/rasa/test-stories/delete.yml
index f90779a22..b8a8de12c 100644
--- a/DSL/Ruuter.private/POST/rasa/test-stories/delete.yml
+++ b/DSL/Ruuter.private/POST/rasa/test-stories/delete.yml
@@ -22,7 +22,7 @@ validateTestStories:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/test-stories/update.yml b/DSL/Ruuter.private/POST/rasa/test-stories/update.yml
index f3fc970a6..578b35add 100644
--- a/DSL/Ruuter.private/POST/rasa/test-stories/update.yml
+++ b/DSL/Ruuter.private/POST/rasa/test-stories/update.yml
@@ -22,7 +22,7 @@ validateTestStories:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/training/results.yml b/DSL/Ruuter.private/POST/rasa/training/results.yml
index 9fd7d8afb..506b1b8e1 100644
--- a/DSL/Ruuter.private/POST/rasa/training/results.yml
+++ b/DSL/Ruuter.private/POST/rasa/training/results.yml
@@ -6,7 +6,7 @@ extractRequestData:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/training/results/files.yml b/DSL/Ruuter.private/POST/rasa/training/results/files.yml
index 848f34184..05e895b26 100644
--- a/DSL/Ruuter.private/POST/rasa/training/results/files.yml
+++ b/DSL/Ruuter.private/POST/rasa/training/results/files.yml
@@ -6,7 +6,7 @@ extractRequestData:
 getFileLocations:
   call: http.get
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/return-file-locations"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/return-file-locations"
     headers:
       cookie: ${incoming.headers.cookie}
   result: fileLocations
diff --git a/DSL/Ruuter.private/POST/rasa/training/settings.yml b/DSL/Ruuter.private/POST/rasa/training/settings.yml
index d53ef0d7f..31e4ae107 100644
--- a/DSL/Ruuter.private/POST/rasa/training/settings.yml
+++ b/DSL/Ruuter.private/POST/rasa/training/settings.yml
@@ -23,7 +23,7 @@ updateInDatabase:
 syncDockerCompose:
   call: http.post
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/sync/docker"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/sync/docker"
     headers:
       cookie: ${incoming.headers.cookie}
   result: updatedDocker
@@ -31,7 +31,7 @@ syncDockerCompose:
 syncCronTask:
   call: http.post
   args:
-    url: "[#TRAINING_PUBLIC_RUUTER]/sync/cron"
+    url: "[#TRAINING_PUBLIC_RUUTER]/internal/sync/cron"
     headers:
       cookie: ${incoming.headers.cookie}
   result: updatedCron
@@ -39,4 +39,4 @@ syncCronTask:
 returnSuccess:
   return: 'Updated Successfully.'
   wrapper: false
-  next: end
\ No newline at end of file
+  next: end
diff --git a/GUI/src/main.tsx b/GUI/src/main.tsx
index c050a4cbe..1d654984a 100644
--- a/GUI/src/main.tsx
+++ b/GUI/src/main.tsx
@@ -96,7 +96,7 @@ const defaultQueryFn: QueryFunction | undefined = async ({ queryKey }) => {
   const { data } = await apiInstance.get(queryKey[0] as string);
   if (
     queryKey.includes('entities')
-    || queryKey.includes('services/get-services-not-assigned-to-intent')
+    || queryKey.includes('services/unassigned')
     || queryKey.includes('services/connection-requests')
   ) {
     return data.response;
diff --git a/GUI/src/pages/ConnectServiceToIntentModal/index.tsx b/GUI/src/pages/ConnectServiceToIntentModal/index.tsx
index 05492c41e..2abc86ad5 100644
--- a/GUI/src/pages/ConnectServiceToIntentModal/index.tsx
+++ b/GUI/src/pages/ConnectServiceToIntentModal/index.tsx
@@ -29,7 +29,7 @@ const ConnectServiceToIntentModal: FC<ConnectServiceToIntentModalProps> = ({
   const [showConfirmationModal, setShowConfirmationModal] = useState(false);
 
   const { data: services, isError } = useQuery<Service[]>({
-    queryKey: ['services/get-services-not-assigned-to-intent'],
+    queryKey: ['services/unassigned'],
   });
 
   const connectRequest = useMutation({
diff --git a/GUI/src/pages/Training/Intents/CommonIntents.tsx b/GUI/src/pages/Training/Intents/CommonIntents.tsx
index 329e22473..5fa9252c6 100644
--- a/GUI/src/pages/Training/Intents/CommonIntents.tsx
+++ b/GUI/src/pages/Training/Intents/CommonIntents.tsx
@@ -50,7 +50,7 @@ const CommonIntents: FC = () => {
   const [refreshing, setRefreshing] = useState(false);
 
   const { data: intentsFullResponse, isLoading } = useQuery({
-    queryKey: ['intents/common-intents'],
+    queryKey: ['intents/common'],
   });
 
   const { data: entities } = useQuery<Entity[]>({
@@ -107,7 +107,7 @@ const CommonIntents: FC = () => {
   const queryRefresh = useCallback(
     function queryRefresh(selectIntent: string | null) {
       setSelectedIntent(null);
-      queryClient.fetchQuery(['intents/intents-full']).then(() => {
+      queryClient.fetchQuery(['intents/full']).then(() => {
         setRefreshing(false);
         if (commonIntents.length > 0) {
           setSelectedIntent(() => {
@@ -132,8 +132,8 @@ const CommonIntents: FC = () => {
       setRefreshing(true);
     },
     onSuccess: async () => {
-      await queryClient.invalidateQueries(['intents/intents-full']);
-      await queryClient.refetchQueries(['intents/intents-full']);
+      await queryClient.invalidateQueries(['intents/full']);
+      await queryClient.refetchQueries(['intents/full']);
       getExampleArrayForIntentId(selectedIntent as Intent).push('');
       setRefreshing(false);
       if (selectedIntent) {
diff --git a/GUI/src/pages/Training/Intents/IntentExamplesTable.tsx b/GUI/src/pages/Training/Intents/IntentExamplesTable.tsx
index cb3f87d1a..71c612f49 100644
--- a/GUI/src/pages/Training/Intents/IntentExamplesTable.tsx
+++ b/GUI/src/pages/Training/Intents/IntentExamplesTable.tsx
@@ -127,7 +127,7 @@ const IntentExamplesTable: FC<IntentExamplesTableProps> = ({
       newExample: string}) => editExample(addExamplesData),
     onMutate: async () => {
       setRefreshing(true)
-      await queryClient.invalidateQueries(['intents/intents-full']);
+      await queryClient.invalidateQueries(['intents/full']);
     },
     onSuccess: () => {
       toast.open({
diff --git a/GUI/src/pages/Training/Intents/index.tsx b/GUI/src/pages/Training/Intents/index.tsx
index a7bb56481..2bf947402 100644
--- a/GUI/src/pages/Training/Intents/index.tsx
+++ b/GUI/src/pages/Training/Intents/index.tsx
@@ -55,7 +55,7 @@ const Intents: FC = () => {
     isLoading,
     refetch,
   } = useQuery({
-    queryKey: ['intents/intents-full'],
+    queryKey: ['intents/full'],
   });
 
   const { data: entities } = useQuery<Entity[]>({
@@ -94,7 +94,7 @@ const Intents: FC = () => {
   const queryRefresh = useCallback(
     function queryRefresh(selectIntent: string | null) {
       setSelectedIntent(null);
-      queryClient.fetchQuery(['intents/intents-full']).then(() => {
+      queryClient.fetchQuery(['intents/full']).then(() => {
         setRefreshing(false);
         if (intents.length > 0) {
           setSelectedIntent(() => {
@@ -141,8 +141,8 @@ const Intents: FC = () => {
       setRefreshing(true);
     },
     onSuccess: async () => {
-      await queryClient.invalidateQueries(['intents/intents-full']);
-      await queryClient.refetchQueries(['intents/intents-full']);
+      await queryClient.invalidateQueries(['intents/full']);
+      await queryClient.refetchQueries(['intents/full']);
       getExampleArrayForIntentId(selectedIntent as Intent).push('');
       setRefreshing(false);
       if (selectedIntent) {