diff --git a/TchapX/SupportingFiles/target-development.yml b/TchapX/SupportingFiles/target-development.yml
index ad7f2f5b52..400cbbb9d8 100644
--- a/TchapX/SupportingFiles/target-development.yml
+++ b/TchapX/SupportingFiles/target-development.yml
@@ -117,17 +117,17 @@ targets:
         BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.dev
         BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.dev
         APP_NAME: TchapX-Development
-        APP_DISPLAY_NAME: TchapX Development
-        ASSETCATALOG_COMPILER_APPICON_NAME: TchapX-icon
-
+        APP_DISPLAY_NAME: TchapX Development # The name used in the application.
+        
         PRODUCT_NAME: $(APP_NAME)
         PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER)
+        ASSETCATALOG_COMPILER_APPICON_NAME: TchapX-icon
         CODE_SIGN_ENTITLEMENTS: TchapX/development/SupportingFiles/tchapx.entitlements
         SWIFT_OBJC_BRIDGING_HEADER: ElementX/SupportingFiles/ElementX-Bridging-Header.h
         SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h
         PILLS_UT_TYPE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).pills
         OTHER_SWIFT_FLAGS:
-        - "-DIS_MAIN_APP -DIS_ENVIRONMENT_DEVELOPMENT"
+        - "-DIS_MAIN_APP -DIS_TCHAP_DEVELOPMENT"
 
 
     preBuildScripts:
diff --git a/TchapX/SupportingFiles/target-production.yml b/TchapX/SupportingFiles/target-production.yml
index a197b1aacf..9d446f9d52 100644
--- a/TchapX/SupportingFiles/target-production.yml
+++ b/TchapX/SupportingFiles/target-production.yml
@@ -117,7 +117,7 @@ targets:
         BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx
         BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx
         APP_NAME: TchapX-Production
-        APP_DISPLAY_NAME: TchapX Production
+        APP_DISPLAY_NAME: TchapX # The name used in the application.
 
         PRODUCT_NAME: $(APP_NAME)
         PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER)
@@ -127,7 +127,7 @@ targets:
         SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h
         PILLS_UT_TYPE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).pills
         OTHER_SWIFT_FLAGS:
-        - "-DIS_MAIN_APP -DIS_ENVIRONMENT_PRODUCTION"
+        - "-DIS_MAIN_APP -DIS_TCHAP_PRODUCTION"
   
     preBuildScripts:
     - name: 🛠 SwiftGen
diff --git a/TchapX/SupportingFiles/target-staging.yml b/TchapX/SupportingFiles/target-staging.yml
index dcabddabcc..df831b736d 100644
--- a/TchapX/SupportingFiles/target-staging.yml
+++ b/TchapX/SupportingFiles/target-staging.yml
@@ -117,7 +117,7 @@ targets:
         BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx.staging
         BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx.staging
         APP_NAME: TchapX-Staging
-        APP_DISPLAY_NAME: TchapX Staging
+        APP_DISPLAY_NAME: TchapX Staging # The name used in the application.
 
         PRODUCT_NAME: $(APP_NAME)
         PRODUCT_BUNDLE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER)
@@ -127,7 +127,7 @@ targets:
         SWIFT_OBJC_INTERFACE_HEADER_NAME: GeneratedInterface-Swift.h
         PILLS_UT_TYPE_IDENTIFIER: $(BASE_BUNDLE_IDENTIFIER).pills
         OTHER_SWIFT_FLAGS:
-        - "-DIS_MAIN_APP -DIS_ENVIRONMENT_STAGING"
+        - "-DIS_MAIN_APP -DIS_TCHAP_STAGING"
   
     preBuildScripts:
     - name: 🛠 SwiftGen
diff --git a/TchapX/production/SupportingFiles/NSE/target.yml b/TchapX/production/SupportingFiles/NSE/target.yml
index 0782e46aa4..b5accca4e8 100644
--- a/TchapX/production/SupportingFiles/NSE/target.yml
+++ b/TchapX/production/SupportingFiles/NSE/target.yml
@@ -62,7 +62,7 @@ targets:
         BASE_APP_GROUP_IDENTIFIER: fr.gouv.tchapx
         BASE_BUNDLE_IDENTIFIER: fr.gouv.tchapx
         APP_NAME: TchapX-NSE-Production
-        APP_DISPLAY_NAME: TchapX-NSE Production
+        APP_DISPLAY_NAME: TchapX-NSE
 
         PRODUCT_NAME: TchapX-NSE-Production
         PRODUCT_DISPLAY_NAME: $(APP_DISPLAY_NAME)