diff --git a/branding/templates/qtinstaller/installer.pro b/branding/templates/qtinstaller/installer.pro
index 0c05442d59434a20c8dd0012048f3f3969cda7ca..534c43181e7fa23bda90508145d73971122b06b3 100644
--- a/branding/templates/qtinstaller/installer.pro
+++ b/branding/templates/qtinstaller/installer.pro
@@ -1,4 +1,4 @@
-!defined(INSTALLER, var):INSTALLER= "BitmaskVPN-Installer-git"
+!defined(INSTALLER, var):INSTALLER= "Bitmask-Installer-git"
 !defined(TARGET, var):TARGET= "bitmask-vpn"
 TEMPLATE = aux
 CONFIG -= debug_and_release
diff --git a/gui/build.sh b/gui/build.sh
index ce8b6742a2b5b47b8cff077390ac174a0f9498ef..cb5c7c9251dc7b64b55d7df66f5d0c43237ff78e 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -8,7 +8,7 @@ set -e
 XBUILD="${XBUILD:-no}"
 LRELEASE="${LRELEASE:-lrelease}"
 VENDOR_PATH="${VENDOR_PATH:-providers/riseup}"
-APPNAME="${APPNAME:-BitmaskVPN}"
+APPNAME="${APPNAME:-Bitmask}"
 LDFLAGS_VER="-X 0xacab.org/leap/bitmask-vpn/pkg/config/version.appVersion=${VERSION}"
 
 OSX_TARGET=12
@@ -124,7 +124,7 @@ function renameOutput {
 }
 
 function buildDefault {
-    echo "[+] Building BitmaskVPN"
+    echo "[+] Building Bitmask"
     if [ "$LRELEASE" != "no" ]
     then
         $LRELEASE bitmask.pro
diff --git a/gui/main.cpp b/gui/main.cpp
index ab8b340ef6bf47f4ab55e09165600fee1cdd01a7..535b60771739ad7ad48d1ef88c0a05ba3323122e 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -128,7 +128,7 @@ int main(int argc, char **argv) {
     providers->loadJson(providerJsonBytes);
     QJsonValue defaultProvider = providers->json().object().value("default");
     QJsonValue providersInfo = providers->json().object().value("providers");
-    QString appName = getProviderConfig(providersInfo, defaultProvider.toString(), "applicationName", "BitmaskVPN");
+    QString appName = getProviderConfig(providersInfo, defaultProvider.toString(), "applicationName", "Bitmask");
     QString organizationDomain = getProviderConfig(providersInfo, defaultProvider.toString(), "providerURL", "riseup.net");
 
     QApplication::setApplicationName(appName);
@@ -230,7 +230,7 @@ int main(int argc, char **argv) {
         app.setWindowIcon(QIcon(":/vendor/calyx.svg"));
     } else if (appName == "RiseupVPN") {
         app.setWindowIcon(QIcon(":/vendor/riseup.svg"));
-    } else if (appName == "BitmaskVPN") {
+    } else if (appName == "Bitmask") {
         app.setWindowIcon(QIcon(":/vendor/bitmask.svg"));
     }
 
diff --git a/gui/main.qml b/gui/main.qml
index 4b5500cdef3424feb87d9511c0f96892fda4b6fb..5ae78aa7b005438e896ccd8cdc42daed83f2f7c4 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -167,7 +167,7 @@ ApplicationWindow {
             return "qrc:/themes/Riseup.qml"
         } else if (providerFlavor.startsWith("calyx-vpn") || providerFlavor == "CalyxVPN") {
             return "qrc:/themes/Calyx.qml"
-        } else if (providerFlavor.startsWith("bitmask-vpn") || providerFlavor == "BitmaskVPN") {
+        } else if (providerFlavor.startsWith("bitmask-vpn") || providerFlavor == "Bitmask") {
             return "qrc:/themes/Bitmask.qml"
         } else {
             // we should do a Default theme, with a fallback
diff --git a/providers/vendor.conf b/providers/vendor.conf
index 0f9de5a985b3f64e29ea25154a353439bc0c348a..b79f92e81418d11585e41557dbe3071555d17e04 100644
--- a/providers/vendor.conf
+++ b/providers/vendor.conf
@@ -107,7 +107,7 @@ donateURL           =
 [bitmask]
 
 name                = bitmask
-applicationName     = BitmaskVPN
+applicationName     = Bitmask
 binaryName          = bitmask-vpn
 
 providerURL         = https://demo.bitmask.net