diff --git a/i18n/en.json b/i18n/en.json
index 23fc645c..3703d935 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -144,7 +144,7 @@
   "renderer.components.extraBar.back": "Back",
   "renderer.components.input.required": "This field is required",
   "renderer.components.mainPage.contextMenu.ariaLabel": "Context menu",
-  "renderer.components.mainPage.titleBar": "Mattermost",
+  "renderer.components.mainPage.titleBar": "{appName}",
   "renderer.components.newServerModal.error.nameRequired": "Name is required.",
   "renderer.components.newServerModal.error.serverUrlExists": "A server with the same URL already exists.",
   "renderer.components.newServerModal.error.urlIncorrectFormatting": "URL is not formatted correctly.",
@@ -185,13 +185,13 @@
   "renderer.components.settingsPage.downloadLocation": "Download Location",
   "renderer.components.settingsPage.downloadLocation.description": "Specify the folder where files will download.",
   "renderer.components.settingsPage.enableHardwareAcceleration": "Use GPU hardware acceleration",
-  "renderer.components.settingsPage.enableHardwareAcceleration.description": "If enabled, Mattermost UI is rendered more efficiently but can lead to decreased stability for some systems.",
+  "renderer.components.settingsPage.enableHardwareAcceleration.description": "If enabled, {appName} UI is rendered more efficiently but can lead to decreased stability for some systems.",
   "renderer.components.settingsPage.flashWindow": "Flash taskbar icon when a new message is received",
   "renderer.components.settingsPage.flashWindow.description": "If enabled, the taskbar icon will flash for a few seconds when a new message is received.",
   "renderer.components.settingsPage.flashWindow.description.linuxFunctionality": "This functionality may not work with all Linux window managers.",
   "renderer.components.settingsPage.flashWindow.description.note": "NOTE: ",
   "renderer.components.settingsPage.fullscreen": "Open app in fullscreen",
-  "renderer.components.settingsPage.fullscreen.description": "If enabled, the Mattermost application will always open in full screen",
+  "renderer.components.settingsPage.fullscreen.description": "If enabled, the {appName} application will always open in full screen",
   "renderer.components.settingsPage.header": "Settings",
   "renderer.components.settingsPage.launchAppMinimized": "Launch app minimized",
   "renderer.components.settingsPage.launchAppMinimized.description": "If enabled, the app will start in system tray, and will not show the window on launch.",
@@ -243,9 +243,9 @@
   "renderer.downloadsDropdown.ClearAll": "Clear All",
   "renderer.downloadsDropdown.Downloads": "Downloads",
   "renderer.downloadsDropdown.remaining": "remaining",
-  "renderer.downloadsDropdown.Update.ANewVersionIsAvailableToInstall": "A new version of the Mattermost Desktop App (version {version}) is available to install.",
+  "renderer.downloadsDropdown.Update.ANewVersionIsAvailableToInstall": "A new version of the {appName} Desktop App (version {version}) is available to install.",
   "renderer.downloadsDropdown.Update.DownloadUpdate": "Download Update",
-  "renderer.downloadsDropdown.Update.MattermostVersionX": "Mattermost version {version}",
+  "renderer.downloadsDropdown.Update.MattermostVersionX": "{appName} version {version}",
   "renderer.downloadsDropdown.Update.NewDesktopVersionAvailable": "New Desktop version available",
   "renderer.downloadsDropdown.Update.RestartAndUpdate": "Restart & update",
   "renderer.downloadsDropdownMenu.CancelDownload": "Cancel Download",
diff --git a/src/renderer/components/DownloadsDropdown/DownloadsDropdownItemFile.tsx b/src/renderer/components/DownloadsDropdown/DownloadsDropdownItemFile.tsx
index 8b99e6ec..aeeeef44 100644
--- a/src/renderer/components/DownloadsDropdown/DownloadsDropdownItemFile.tsx
+++ b/src/renderer/components/DownloadsDropdown/DownloadsDropdownItemFile.tsx
@@ -7,6 +7,8 @@ import classNames from 'classnames';
 
 import {useIntl} from 'react-intl';
 
+import {app} from 'electron';
+
 import FileSizeAndStatus from './FileSizeAndStatus';
 import ProgressBar from './ProgressBar';
 import ThreeDotButton from './ThreeDotButton';
@@ -28,7 +30,7 @@ const DownloadsDropdownItemFile = ({item, activeItem}: OwnProps) => {
     };
 
     const itemFilename = item.type === 'update' ?
-        translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `Mattermost version ${item.filename}`}, {version: item.filename}) :
+        translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name}) :
         item.filename;
 
     return (
diff --git a/src/renderer/components/DownloadsDropdown/Update/UpdateAvailable.tsx b/src/renderer/components/DownloadsDropdown/Update/UpdateAvailable.tsx
index f4ac1356..febf14ed 100644
--- a/src/renderer/components/DownloadsDropdown/Update/UpdateAvailable.tsx
+++ b/src/renderer/components/DownloadsDropdown/Update/UpdateAvailable.tsx
@@ -8,6 +8,8 @@ import {FormattedMessage} from 'react-intl';
 
 import {Button} from 'react-bootstrap';
 
+import {app} from 'electron';
+
 import Thumbnail from '../Thumbnail';
 
 type OwnProps = {
@@ -33,8 +35,11 @@ const UpdateAvailable = ({item}: OwnProps) => {
                 <div className='DownloadsDropdown__Update__Details__Description'>
                     <FormattedMessage
                         id='renderer.downloadsDropdown.Update.ANewVersionIsAvailableToInstall'
-                        defaultMessage={`A new version of the Mattermost Desktop App (version ${item.filename}) is available to install.`}
-                        values={{version: item.filename}}
+                        defaultMessage={`A new version of the {appName} Desktop App (version ${item.filename}) is available to install.`}
+                        values={{
+                            version: item.filename,
+                            appName: app.name,
+                        }}
                     />
                 </div>
                 <Button
diff --git a/src/renderer/components/DownloadsDropdown/Update/UpdateDownloaded.tsx b/src/renderer/components/DownloadsDropdown/Update/UpdateDownloaded.tsx
index dae36d7d..3efd99a4 100644
--- a/src/renderer/components/DownloadsDropdown/Update/UpdateDownloaded.tsx
+++ b/src/renderer/components/DownloadsDropdown/Update/UpdateDownloaded.tsx
@@ -10,6 +10,8 @@ import {Button} from 'react-bootstrap';
 
 import classNames from 'classnames';
 
+import {app} from 'electron';
+
 import Thumbnail from '../Thumbnail';
 import FileSizeAndStatus from '../FileSizeAndStatus';
 
@@ -31,7 +33,7 @@ const UpdateAvailable = ({item}: OwnProps) => {
                 <Thumbnail item={item}/>
                 <div className='DownloadsDropdown__File__Body__Details'>
                     <div className='DownloadsDropdown__File__Body__Details__Filename'>
-                        {translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `Mattermost version ${item.filename}`}, {version: item.filename})}
+                        {translate.formatMessage({id: 'renderer.downloadsDropdown.Update.MattermostVersionX', defaultMessage: `{appName} version ${item.filename}`}, {version: item.filename, appName: app.name})}
                     </div>
                     <div
                         className={classNames('DownloadsDropdown__File__Body__Details__FileSizeAndStatus', {
diff --git a/src/renderer/components/MainPage.tsx b/src/renderer/components/MainPage.tsx
index 98a7b22d..d607ff9d 100644
--- a/src/renderer/components/MainPage.tsx
+++ b/src/renderer/components/MainPage.tsx
@@ -519,7 +519,7 @@ class MainPage extends React.PureComponent<Props, State> {
                 >
                     {window.process.platform !== 'linux' && this.state.servers.length === 0 && (
                         <div className='app-title'>
-                            {intl.formatMessage({id: 'renderer.components.mainPage.titleBar', defaultMessage: 'Mattermost'})}
+                            {intl.formatMessage({id: 'renderer.components.mainPage.titleBar', defaultMessage: '{appName}'}, {appName: this.props.appName})}
                         </div>
                     )}
                     <button
diff --git a/src/renderer/components/SettingsPage.tsx b/src/renderer/components/SettingsPage.tsx
index e999c028..17324236 100644
--- a/src/renderer/components/SettingsPage.tsx
+++ b/src/renderer/components/SettingsPage.tsx
@@ -946,7 +946,10 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 <FormText>
                     <FormattedMessage
                         id='renderer.components.settingsPage.enableHardwareAcceleration.description'
-                        defaultMessage='If enabled, Mattermost UI is rendered more efficiently but can lead to decreased stability for some systems.'
+                        defaultMessage='If enabled, {appName} UI is rendered more efficiently but can lead to decreased stability for some systems.'
+                        values={{
+                            appName: this.state.appName,
+                        }}
                     />
                     {' '}
                     <FormattedMessage
@@ -975,7 +978,10 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 <FormText>
                     <FormattedMessage
                         id='renderer.components.settingsPage.fullscreen.description'
-                        defaultMessage='If enabled, the Mattermost application will always open in full screen'
+                        defaultMessage='If enabled, the {appName} application will always open in full screen'
+                        values={{
+                            appName: this.state.appName,
+                        }}
                     />
                 </FormText>
             </FormCheck>,