diff --git a/CN_PROD/slo/VCIS_VPS_VehicleProfileResource.tf b/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information.tf
similarity index 75%
rename from CN_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
rename to CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information.tf
index ae5d19e..1b4bcd7 100644
--- a/CN_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
+++ b/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information.tf
@@ -1,16 +1,16 @@
-module VCIS_VPS_VehicleProfileResource {
+module VCIS_VPS_VehicleProfileResource_-_information {
 
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource - information"
 
-  description                 = "VehicleProfileResource"
+  description                 = "VehicleProfileResource - information"
 
 
 
   #entity selector object
-  filter                      = "type(\"SERVICE\"),entityName(\"VehicleProfileResource - vcis-information - prod\"),tag(\"Environment:PROD\")"
+  filter                      = "type(\"SERVICE\"),entityName(\"VehicleProfileResource - information\"),tag(\"Environment:PROD\")"
 
 
   #metric expression of the calculation as done in data explorer ui
diff --git a/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf b/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information_Requests.tf
similarity index 87%
rename from CN_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
rename to CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information_Requests.tf
index 9f86a36..57d617a 100644
--- a/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
+++ b/CN_PROD/slo/VCIS_VPS_VehicleProfileResource_-_information_Requests.tf
@@ -1,16 +1,16 @@
-module VCIS_VPS_VehicleProfileResource_Requests {
+module VCIS_VPS_VehicleProfileResource_-_information_Requests {
 
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource - information - Requests"
 
   description                 = "Success rate of VehicleProfileResource"
 
 
 
   #entity selector object
-  filter                      = "type(\"SERVICE\"),entityName(\"VehicleProfileResource - vcis-information - prod\"),tag(\"Environment:PROD\")"
+  filter                      = "type(\"SERVICE\"),entityName(\"VehicleProfileResource - information\"),tag(\"Environment:PROD\")"
 
 
   #metric expression of the calculation as done in data explorer ui
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf b/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
index 9db5c50..e26dbc6 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailAccountResourceV2 {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailAccountResourceV2"
+  name                        = "VCIS-EML - EmailAccountResourceV2"
 
   description                 = "EmailAccountResourceV2"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf b/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
index d264ff7..1001d99 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailAccountResourceV2_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailAccountResourceV2"
+  name                        = "VCIS-EML - EmailAccountResourceV2 - Requests"
 
   description                 = "Success rate of EmailAccountResourceV2"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource.tf b/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
index 613a0f3..59c84bf 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailProvidersResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailProvidersResource"
+  name                        = "VCIS-EML - EmailProvidersResource"
 
   description                 = "EmailProvidersResource"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf b/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
index 93269f9..d504421 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailProvidersResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailProvidersResource"
+  name                        = "VCIS-EML - EmailProvidersResource - Requests"
 
   description                 = "Success rate of EmailProvidersResource"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailResource.tf b/EMEA_PROD/slo/VCIS_EML_EmailResource.tf
index 37e8309..78643f7 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailResource.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailResource.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailResource"
+  name                        = "VCIS-EML - EmailResource"
 
   description                 = "EmailResource"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailResource_Requests.tf b/EMEA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
index a23f14d..d94ab45 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailResource"
+  name                        = "VCIS-EML - EmailResource - Requests"
 
   description                 = "Success rate of EmailResource"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource.tf b/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource.tf
index aa2ce59..f0e6708 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource.tf
@@ -10,7 +10,7 @@ module VCIS_EML_EmailTemplateResource {
 
 
   #entity selector object
-  filter                      = "type(\"SERVICE\"),entityName(\"EmailResource - vcis-information - prod\"),tag(\"Environment:PROD\")"
+  filter                      = "type(\"SERVICE\"),entityName(\"EmailTemplateResource - vcis-information - prod\"),tag(\"Environment:PROD\")"
 
 
   #metric expression of the calculation as done in data explorer ui
diff --git a/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource_Requests.tf b/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource_Requests.tf
index ae5b2b4..be083f7 100644
--- a/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_EmailTemplateResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailTemplateResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailTemplateResource"
+  name                        = "VCIS-EML - EmailTemplateResource - Requests"
 
   description                 = "Success rate of EmailTemplateResource"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1.tf b/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1.tf
index 751b3b3..8b11edd 100644
--- a/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1.tf
+++ b/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1.tf
@@ -3,7 +3,7 @@ module VCIS_EML_OfficeServiceV1 {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - OfficeServiceV1"
+  name                        = "VCIS-EML - OfficeServiceV1"
 
   description                 = "OfficeServiceV1"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1_Requests.tf b/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1_Requests.tf
index 31a4f75..df40037 100644
--- a/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_OfficeServiceV1_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_OfficeServiceV1_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - OfficeServiceV1"
+  name                        = "VCIS-EML - OfficeServiceV1 - Requests"
 
   description                 = "Success rate of OfficeServiceV1"
 
diff --git a/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource .tf b/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource .tf
index 1bf2158..ac009d5 100644
--- a/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource .tf	
+++ b/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource .tf	
@@ -3,7 +3,7 @@ module VCIS_EML_PrivacyEmailAccountResource  {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - PrivacyEmailAccountResource "
+  name                        = "VCIS-EML - PrivacyEmailAccountResource "
 
   description                 = "PrivacyEmailAccountResource "
 
diff --git a/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource_Requests.tf b/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource_Requests.tf
index e26ff38..72a319f 100644
--- a/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_EML_PrivacyEmailAccountResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_OfficeServiceV1_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - PrivacyEmailAccountResource"
+  name                        = "VCIS-EML - PrivacyEmailAccountResource - Requests"
 
   description                 = "Success rate of PrivacyEmailAccountResource"
 
diff --git a/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf b/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
index ae5d19e..89c14c6 100644
--- a/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
+++ b/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
@@ -3,7 +3,7 @@ module VCIS_VPS_VehicleProfileResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource"
 
   description                 = "VehicleProfileResource"
 
diff --git a/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf b/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
index 9f86a36..6da3131 100644
--- a/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
+++ b/EMEA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_VPS_VehicleProfileResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource - Requests"
 
   description                 = "Success rate of VehicleProfileResource"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf b/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
index 9db5c50..e26dbc6 100644
--- a/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailAccountResourceV2 {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailAccountResourceV2"
+  name                        = "VCIS-EML - EmailAccountResourceV2"
 
   description                 = "EmailAccountResourceV2"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf b/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
index c72c5b1..02f3295 100644
--- a/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailAccountResourceV2_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailAccountResourceV2_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailAccountResourceV2"
+  name                        = "VCIS-EML - EmailAccountResourceV2 - Requests"
 
   description                 = "Success rate of EmailAccountResourceV2"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailProvidersResource.tf b/NA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
index 613a0f3..59c84bf 100644
--- a/NA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailProvidersResource.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailProvidersResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailProvidersResource"
+  name                        = "VCIS-EML - EmailProvidersResource"
 
   description                 = "EmailProvidersResource"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf b/NA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
index d1d55b7..2e09cd5 100644
--- a/NA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailProvidersResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailProvidersResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailProvidersResource"
+  name                        = "VCIS-EML - EmailProvidersResource - Requests"
 
   description                 = "Success rate of EmailProvidersResource"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailResource.tf b/NA_PROD/slo/VCIS_EML_EmailResource.tf
index 37e8309..78643f7 100644
--- a/NA_PROD/slo/VCIS_EML_EmailResource.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailResource.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailResource"
+  name                        = "VCIS-EML - EmailResource"
 
   description                 = "EmailResource"
 
diff --git a/NA_PROD/slo/VCIS_EML_EmailResource_Requests.tf b/NA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
index 34da3b2..5382f7b 100644
--- a/NA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
+++ b/NA_PROD/slo/VCIS_EML_EmailResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_EML_EmailResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - EmailResource"
+  name                        = "VCIS-EML - EmailResource - Requests"
 
   description                 = "Success rate of EmailResource"
 
diff --git a/NA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf b/NA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
index ae5d19e..89c14c6 100644
--- a/NA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
+++ b/NA_PROD/slo/VCIS_VPS_VehicleProfileResource.tf
@@ -3,7 +3,7 @@ module VCIS_VPS_VehicleProfileResource {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource"
 
   description                 = "VehicleProfileResource"
 
diff --git a/NA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf b/NA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
index 9f86a36..6da3131 100644
--- a/NA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
+++ b/NA_PROD/slo/VCIS_VPS_VehicleProfileResource_Requests.tf
@@ -3,7 +3,7 @@ module VCIS_VPS_VehicleProfileResource_Requests {
   source = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
 
 
-  name                        = "VCIS - VehicleProfileResource"
+  name                        = "VCIS-VPS - VehicleProfileResource - Requests"
 
   description                 = "Success rate of VehicleProfileResource"