diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 7768f05bd..ebb477c97 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -172,7 +172,7 @@ class ViewerManifest(LLManifest):
 
 class WindowsManifest(ViewerManifest):
     def final_exe(self):
-        return 'SingularityViewer.exe'
+        return self.channel_oneword() + 'Viewer.exe'
 
 
     def construct(self):
@@ -399,17 +399,17 @@ class WindowsManifest(ViewerManifest):
         !define VERSION_LONG "%(version)s"
         !define VERSION_DASHES "%(version_dashes)s"
         """ % substitution_strings
-        installer_file = "Singularity_%(version_short)s_Setup.exe"
+        installer_file = "%(channel_oneword)s_%(version_dashes)s_Setup.exe"
         grid_vars_template = """
         OutFile "%(installer_file)s"
-        !define VIEWERNAME "Singularity Viewer"
+        !define VIEWERNAME "%(channel)s"
         !define INSTFLAGS "%(flags)s"
-        !define INSTNAME   "SingularityViewer"
-        !define SHORTCUT   "Singularity Viewer"
+        !define INSTNAME   "%(channel_oneword)s"
+        !define SHORTCUT   "%(channel)s"
         !define URLNAME   "secondlife"
         !define INSTALL_ICON "install_icon_singularity.ico"
         !define UNINSTALL_ICON "install_icon_singularity.ico"
-        Caption "Singularity Viewer ${VERSION}"
+        Caption "${VIEWERNAME} ${VERSION_LONG}"
         """
         if 'installer_name' in self.args:
             installer_file = self.args['installer_name']