diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 494d3290ea..3b7a78298d 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -222,6 +222,8 @@ class ViewerManifest(LLManifest):
         return self.args['channel']
     def channel_unique(self):
         return self.channel().replace("Firestorm", "").strip()
+    def channel_legacy_oneword(self):
+        return "".join(self.channel().split())
     def channel_oneword(self):
         return "".join(self.channel_unique().split())
     def channel_lowerword(self):
@@ -724,7 +726,7 @@ class WindowsManifest(ViewerManifest):
         if (os.path.exists("%s/firestorm-symbols-windows.tar.bz2" % self.args['configuration'].lower())):
             # Rename to add version numbers
             sName = "%s/Phoenix_%s_%s_%s_symbols-windows.tar.bz2" % (self.args['configuration'].lower(),
-                                                                     substitution_strings['channel_oneword'],
+                                                                     self.channel_legacy_oneword(),
                                                                      substitution_strings['version_dashes'],
                                                                      self.args['viewer_flavor'])
 
@@ -737,7 +739,7 @@ class WindowsManifest(ViewerManifest):
         # Using tat+xz gives far superior compression than zip (~half the size of the zip archive).
         # Python3 natively supports tar+xz via mode 'w:xz'. But we're stuck with Python2 for nowo.
         symbolTar = tarfile.TarFile("%s/Phoenix-%s_%s_%s_pdbsymbols-windows.tar" % (self.args['configuration'].lower(),
-                                                                                    substitution_strings['channel_oneword'],
+                                                                                    self.channel_legacy_oneword(),
                                                                                     substitution_strings['version_dashes'],
                                                                                     self.args['viewer_flavor']),
                                                                                     'w')
@@ -1103,7 +1105,7 @@ class DarwinManifest(ViewerManifest):
             # Rename to add version numbers
             os.rename("%s/firestorm-symbols-darwin.tar.bz2" % self.args['configuration'].lower(),
                       "%s/Phoenix_%s_%s_%s_symbols-darwin.tar.bz2" % (self.args['configuration'].lower(),
-                                                                      substitution_strings['channel_oneword'],
+                                                                      self.channel_legacy_oneword(),
                                                                       substitution_strings['version_dashes'],
                                                                       self.args['viewer_flavor']))
 
@@ -1248,7 +1250,7 @@ class LinuxManifest(ViewerManifest):
             # Rename to add version numbers
             os.rename("%s/firestorm-symbols-linux.tar.bz2" % self.args['configuration'].lower(),
                       "%s/Phoenix_%s_%s_%s_symbols-linux.tar.bz2" % (self.args['configuration'].lower(),
-                                                                     self.channel_oneword(),
+                                                                     self.channel_legacy_oneword(),
                                                                      '-'.join( self.args['version'] ),
                                                                      self.args['viewer_flavor'] ) )