diff --git a/OsmAnd/AndroidManifest-huawei.xml b/OsmAnd/AndroidManifest-huawei.xml
index c557d5fe2a..c71b7a3a93 100644
--- a/OsmAnd/AndroidManifest-huawei.xml
+++ b/OsmAnd/AndroidManifest-huawei.xml
@@ -4,7 +4,7 @@
 
 	<application
 		android:icon="@mipmap/icon_free"
-		android:label="@string/app_name_free"
+		android:label="OsmAnd — Offline Maps &amp; GPS Navigation"
 		tools:replace="android:icon, android:label">
 
 		<meta-data
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 436aa652dc..bf435f606b 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -154,11 +154,11 @@ android {
 }
 
 def replaceNoTranslate(line) {
-	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
+	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_PLUS_NAME")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_PLUS_NAME") + "<")
 	}
-	if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_NAME")) {
-		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
+	if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_FREE_NAME")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_FREE_NAME") + "<")
 	}
 	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")