Index: packagerEdge.py
diff --git a/packagerEdge.py b/packagerEdge.py
index cdd720c7adcf2a0cf2ce085e7979c0fb09fc4859..802c88c8cc7d1fe8ab149d063b6b689f243f7903 100644
--- a/packagerEdge.py
+++ b/packagerEdge.py
@@ -164,7 +164,7 @@ def createBuild(baseDir, type='edge', outFile=None,  # noqa: preserve API.
     # product name is tranlated into Azerbajani.
     data = json.loads(files['_locales/{}/messages.json'.format(defaultLocale)])
     files['manifest.json'] = re.sub(
-        r'__MSG_(name(?:_devbuild)?)__',
+        r'__MSG_(name(?:_devbuild|_releasebuild)?)__',
         lambda m: data[m.group(1)]['message'],
         packagerChrome.createManifest(params, files),
     )
Index: templates/manifest.json.tmpl
diff --git a/templates/manifest.json.tmpl b/templates/manifest.json.tmpl
index 084f30d1b58082875d984493a570f79961720989..0b9d21fc3b113e9c1f68e439de0f9cc6cb29112e 100644
--- a/templates/manifest.json.tmpl
+++ b/templates/manifest.json.tmpl
@@ -5,7 +5,7 @@
 {
   "manifest_version": 2,
   {%- if releaseBuild %}
-  "name": "__MSG_name__",
+  "name": "__MSG_name_releasebuild__",
   {%- else %}
   "name": "__MSG_name_devbuild__",
   {%- endif %}
Index: tests/expecteddata/AppxManifest_edge_release_build.xml
diff --git a/tests/expecteddata/AppxManifest_edge_release_build.xml b/tests/expecteddata/AppxManifest_edge_release_build.xml
index fa577e53ffe198043bd069bda19b8091bbf9c549..c55aede6bd312fd906819f6ec4bf7f1e91971908 100644
--- a/tests/expecteddata/AppxManifest_edge_release_build.xml
+++ b/tests/expecteddata/AppxManifest_edge_release_build.xml
@@ -3,7 +3,7 @@
 	<Identity Name="EyeoGmbH.AdblockPlus" Publisher="CN=4F066043-8AFE-41C9-B762-6C15E77E3F88" Version="1.2.3.0" />
 
 	<Properties> 
-		<DisplayName>Adblock Plus</DisplayName> 
+		<DisplayName>Adblock Plus - free ad blocker</DisplayName>
 		<PublisherDisplayName>eyeo GmbH</PublisherDisplayName> 
 		<Logo>Assets/logo_50.png</Logo> 
 	</Properties> 
@@ -19,11 +19,11 @@
 
 	<Applications> 
 		<Application Id="App">
-			<uap:VisualElements AppListEntry="none" BackgroundColor="transparent" Description="ms-resource:Description" DisplayName="Adblock Plus" Square150x150Logo="Assets/logo_150.png" Square44x44Logo="Assets/logo_44.png">
+			<uap:VisualElements AppListEntry="none" BackgroundColor="transparent" Description="ms-resource:Description" DisplayName="Adblock Plus - free ad blocker" Square150x150Logo="Assets/logo_150.png" Square44x44Logo="Assets/logo_44.png">
 			</uap:VisualElements>
 			<Extensions>
 				<uap3:Extension Category="windows.appExtension">
-					<uap3:AppExtension DisplayName="Adblock Plus" Id="EdgeExtension" Name="com.microsoft.edge.extension" PublicFolder="Extension">
+					<uap3:AppExtension DisplayName="Adblock Plus - free ad blocker" Id="EdgeExtension" Name="com.microsoft.edge.extension" PublicFolder="Extension">
 						<uap3:Properties>
 							<Capabilities>
 								<Capability Name="websiteInfo" />
Index: tests/expecteddata/manifest_chrome_devenv.json
diff --git a/tests/expecteddata/manifest_chrome_devenv.json b/tests/expecteddata/manifest_chrome_devenv.json
index 4d5c7bab3897f4f26a0cecc6965de3bc49a6099d..f47b2ccb42f3ff69b7b007ce82ef7f3ffaa9e160 100644
--- a/tests/expecteddata/manifest_chrome_devenv.json
+++ b/tests/expecteddata/manifest_chrome_devenv.json
@@ -51,7 +51,7 @@
   "manifest_version": 2,
   "minimum_chrome_version": "49.0",
   "minimum_opera_version": "36.0",
-  "name": "__MSG_name__",
+  "name": "__MSG_name_releasebuild__",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/expecteddata/manifest_chrome_release_build.json
diff --git a/tests/expecteddata/manifest_chrome_release_build.json b/tests/expecteddata/manifest_chrome_release_build.json
index a6f384c3917241613a3111fba9b4b36b5dfe0279..ed5590ce21d2ffd3370daf3e0e42064cd1351b63 100644
--- a/tests/expecteddata/manifest_chrome_release_build.json
+++ b/tests/expecteddata/manifest_chrome_release_build.json
@@ -50,7 +50,7 @@
   "manifest_version": 2,
   "minimum_chrome_version": "49.0",
   "minimum_opera_version": "36.0",
-  "name": "__MSG_name__",
+  "name": "__MSG_name_releasebuild__",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/expecteddata/manifest_edge_devenv.json
diff --git a/tests/expecteddata/manifest_edge_devenv.json b/tests/expecteddata/manifest_edge_devenv.json
index d7b04d8f7d6f3e71650a2821fb09acef9020ba79..97894970cb8d5c0c4e78ede7a70089ed3200c083 100644
--- a/tests/expecteddata/manifest_edge_devenv.json
+++ b/tests/expecteddata/manifest_edge_devenv.json
@@ -52,7 +52,7 @@
   "minimum_chrome_version": "49.0",
   "minimum_edge_version": "37.14332.1000.0",
   "minimum_opera_version": "36.0",
-  "name": "Adblock Plus",
+  "name": "Adblock Plus - free ad blocker",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/expecteddata/manifest_edge_release_build.json
diff --git a/tests/expecteddata/manifest_edge_release_build.json b/tests/expecteddata/manifest_edge_release_build.json
index e0d071702ddcbb9b2043f9a46bf10915f75f2279..78865f9b089cf6c9b38553b8d88550a28152a9bc 100644
--- a/tests/expecteddata/manifest_edge_release_build.json
+++ b/tests/expecteddata/manifest_edge_release_build.json
@@ -51,7 +51,7 @@
   "minimum_chrome_version": "49.0",
   "minimum_edge_version": "37.14332.1000.0",
   "minimum_opera_version": "36.0",
-  "name": "Adblock Plus",
+  "name": "Adblock Plus - free ad blocker",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/expecteddata/manifest_gecko_devenv.json
diff --git a/tests/expecteddata/manifest_gecko_devenv.json b/tests/expecteddata/manifest_gecko_devenv.json
index cacb7d97c0004d9ae006b51753b93c3fa79469d8..2167f83b2233e1c558f1ea810c1329e874bd26a8 100644
--- a/tests/expecteddata/manifest_gecko_devenv.json
+++ b/tests/expecteddata/manifest_gecko_devenv.json
@@ -57,7 +57,7 @@
   "manifest_version": 2,
   "minimum_chrome_version": "49.0",
   "minimum_opera_version": "36.0",
-  "name": "__MSG_name__",
+  "name": "__MSG_name_releasebuild__",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/expecteddata/manifest_gecko_release_build.json
diff --git a/tests/expecteddata/manifest_gecko_release_build.json b/tests/expecteddata/manifest_gecko_release_build.json
index 7f6a0ade3ebba5dbcf2392dfefe8a0ede94a52bb..b4f50aae1205aa5965d6e8f7e40cb7808bb26a86 100644
--- a/tests/expecteddata/manifest_gecko_release_build.json
+++ b/tests/expecteddata/manifest_gecko_release_build.json
@@ -56,7 +56,7 @@
   "manifest_version": 2,
   "minimum_chrome_version": "49.0",
   "minimum_opera_version": "36.0",
-  "name": "__MSG_name__",
+  "name": "__MSG_name_releasebuild__",
   "optional_permissions": [
     "webRequest"
   ],
Index: tests/test_packagerWebExt.py
diff --git a/tests/test_packagerWebExt.py b/tests/test_packagerWebExt.py
index b370932cce903ca4b65b3fefaa491eedcc408faf..9b3d0422c46496468b2a1d7bfc636370c9f4eb2f 100644
--- a/tests/test_packagerWebExt.py
+++ b/tests/test_packagerWebExt.py
@@ -32,6 +32,7 @@ ALL_LANGUAGES = ['en_US', 'de', 'it']
 
 MESSAGES_EN_US = json.dumps({
     'name': {'message': 'Adblock Plus'},
+    'name_releasebuild': {'message': 'Adblock Plus - free ad blocker'},
     'name_devbuild': {'message': 'Adblock Plus development build'},
     'description': {
         'message': 'Adblock Plus is the most popular ad blocker ever, '