diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e460e90059..349b8b75d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, GplayAgentWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidAgentWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, GplayAgentWithoutvoipWithpinning, FdroidPreprodWithoutvoipWithoutpinning, FdroidAgentWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index ea7e898c4b..50b07ef1c3 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index edee8b32aa..ba202ef5b9 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
+        target: [ GplayPreprodWithoutvoipWithoutpinning, FdroidPreprodWithoutvoipWithoutpinning ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml
index c97fa27d4c..a5a0da835a 100644
--- a/.github/workflows/sanity_test.yml
+++ b/.github/workflows/sanity_test.yml
@@ -68,7 +68,7 @@ jobs:
             touch emulator.log
             chmod 777 emulator.log
             adb logcat >> emulator.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayPreprodWithoutvoipWithoutpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
       - name: Upload Failing Test Report Log
         uses: actions/upload-artifact@v2
         if: failure()
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3e10ca58c8..93c4cc04a5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Run unit tests
-        run: ./gradlew clean TestGplayBtchapWithoutvoipWithpinningDebugUnitTest $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
+        run: ./gradlew clean TestGplayPreprodWithoutvoipWithoutpinningDebugUnitTest $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false --stacktrace
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
         if: always() &&
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7d6ee67a05..3ac32c34b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -91,8 +91,8 @@ For ktlint to fix some detected errors for you (you still have to check and comm
 #### lint
 
 <pre>
-./gradlew lintGplayBtchapWithoutvoipWithpinningRelease
-./gradlew lintFdroidBtchapWithoutvoipWithoutpinningRelease
+./gradlew lintGplayPreprodWithoutvoipWithoutpinningRelease
+./gradlew lintFdroidPreprodWithoutvoipWithoutpinningRelease
 </pre>
 
 ### Unit tests
@@ -100,7 +100,7 @@ For ktlint to fix some detected errors for you (you still have to check and comm
 Make sure the following commands execute without any error:
 
 <pre>
-./gradlew testGplayBtchapWithoutvoipWithpinningReleaseUnitTest
+./gradlew testGplayPreprodWithoutvoipWithoutpinningReleaseUnitTest
 </pre>
 
 ### Tests
diff --git a/docs/ui-tests.md b/docs/ui-tests.md
index 40afcdd709..035bbda773 100644
--- a/docs/ui-tests.md
+++ b/docs/ui-tests.md
@@ -60,7 +60,7 @@ Click on the green arrow in front of each test. Clicking on the arrow in front o
 ### From command line
 
 ````shell script
-./gradlew vector:connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest
+./gradlew vector:connectedGplayPreprodWithoutvoipWithoutpinningDebugAndroidTest
 ````
 
 To run all the tests from the `vector` module.
diff --git a/vector/build.gradle b/vector/build.gradle
index d42230326d..4f13ceba1d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -311,7 +311,7 @@ android {
             dimension "pinning"
         }
 
-        btchap {
+        preprod {
             dimension "target"
 
             resValue "string", "app_name", "Btchap"
diff --git a/vector/src/btchap/AndroidManifest.xml b/vector/src/preprod/AndroidManifest.xml
similarity index 100%
rename from vector/src/btchap/AndroidManifest.xml
rename to vector/src/preprod/AndroidManifest.xml
diff --git a/vector/src/btchap/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/vector/src/preprod/res/drawable-anydpi-v26/ic_launcher_foreground.xml
similarity index 100%
rename from vector/src/btchap/res/drawable-anydpi-v26/ic_launcher_foreground.xml
rename to vector/src/preprod/res/drawable-anydpi-v26/ic_launcher_foreground.xml
diff --git a/vector/src/btchap/res/drawable-xxhdpi/logo_tchap_big.png b/vector/src/preprod/res/drawable-xxhdpi/logo_tchap_big.png
similarity index 100%
rename from vector/src/btchap/res/drawable-xxhdpi/logo_tchap_big.png
rename to vector/src/preprod/res/drawable-xxhdpi/logo_tchap_big.png
diff --git a/vector/src/btchap/res/drawable/ic_launcher_background.xml b/vector/src/preprod/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from vector/src/btchap/res/drawable/ic_launcher_background.xml
rename to vector/src/preprod/res/drawable/ic_launcher_background.xml
diff --git a/vector/src/btchap/res/drawable/ic_tchap_splashscreen_logo.xml b/vector/src/preprod/res/drawable/ic_tchap_splashscreen_logo.xml
similarity index 100%
rename from vector/src/btchap/res/drawable/ic_tchap_splashscreen_logo.xml
rename to vector/src/preprod/res/drawable/ic_tchap_splashscreen_logo.xml
diff --git a/vector/src/btchap/res/mipmap-hdpi/ic_launcher.png b/vector/src/preprod/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-hdpi/ic_launcher.png
rename to vector/src/preprod/res/mipmap-hdpi/ic_launcher.png
diff --git a/vector/src/btchap/res/mipmap-hdpi/ic_launcher_round.png b/vector/src/preprod/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-hdpi/ic_launcher_round.png
rename to vector/src/preprod/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/vector/src/btchap/res/mipmap-mdpi/ic_launcher.png b/vector/src/preprod/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-mdpi/ic_launcher.png
rename to vector/src/preprod/res/mipmap-mdpi/ic_launcher.png
diff --git a/vector/src/btchap/res/mipmap-mdpi/ic_launcher_round.png b/vector/src/preprod/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-mdpi/ic_launcher_round.png
rename to vector/src/preprod/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/vector/src/btchap/res/mipmap-xhdpi/ic_launcher.png b/vector/src/preprod/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xhdpi/ic_launcher.png
rename to vector/src/preprod/res/mipmap-xhdpi/ic_launcher.png
diff --git a/vector/src/btchap/res/mipmap-xhdpi/ic_launcher_round.png b/vector/src/preprod/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xhdpi/ic_launcher_round.png
rename to vector/src/preprod/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/vector/src/btchap/res/mipmap-xxhdpi/ic_launcher.png b/vector/src/preprod/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xxhdpi/ic_launcher.png
rename to vector/src/preprod/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/vector/src/btchap/res/mipmap-xxhdpi/ic_launcher_round.png b/vector/src/preprod/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xxhdpi/ic_launcher_round.png
rename to vector/src/preprod/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/vector/src/btchap/res/mipmap-xxxhdpi/ic_launcher.png b/vector/src/preprod/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xxxhdpi/ic_launcher.png
rename to vector/src/preprod/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/vector/src/btchap/res/mipmap-xxxhdpi/ic_launcher_round.png b/vector/src/preprod/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from vector/src/btchap/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to vector/src/preprod/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/vector/src/btchap/res/values/config.xml b/vector/src/preprod/res/values/config.xml
similarity index 100%
rename from vector/src/btchap/res/values/config.xml
rename to vector/src/preprod/res/values/config.xml