diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index fe711d5917..7f864deb9c 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -296,7 +296,7 @@
             name="Phoenix"
             value="settings_phoenix.xml" />
            <combo_box.item
-            label="Viewer 4"
+            label="Viewer 5"
             name="V3"
             value="settings_v3.xml" />
            <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index 03be8c1267..6e9ea20de7 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -316,7 +316,7 @@
         name="Phoenix"
         value="settings_phoenix.xml" />
       <combo_box.item
-        label="Viewer 4"
+        label="Viewer 5"
         name="V3"
         value="settings_v3.xml" />
       <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 04f74ae9c1..49da87d7c6 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3043,7 +3043,7 @@ Try enclosing path to the editor with double quotes.
   <string name="mode_unknown">Unknown Mode</string>
   <string name="mode_settings_firestorm.xml">Firestorm</string>
   <string name="mode_settings_phoenix.xml">Phoenix</string>
-  <string name="mode_settings_v3.xml">Viewer 4</string>
+  <string name="mode_settings_v3.xml">Viewer 5</string>
   <string name="mode_settings_hybrid.xml">Hybrid</string>
   <string name="mode_settings_latency.xml">Latency</string>
   <string name="mode_settings_text.xml">Text</string>
diff --git a/indra/newview/skins/default/xui/es/panel_fs_login.xml b/indra/newview/skins/default/xui/es/panel_fs_login.xml
index 6000a597b7..acbadb6c17 100644
--- a/indra/newview/skins/default/xui/es/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_fs_login.xml
@@ -49,7 +49,7 @@
 			<combo_box name="mode_combo" tool_tip="Selecciona con qué estilo de visor estás más familiarizado para establecer tus opciones por defecto apropiadamente.">
 				<combo_box.item label="Firestorm" name="Firestorm"/>
 				<combo_box.item label="Phoenix" name="Phoenix"/>
-				<combo_box.item label="Viewer 4" name="V3"/>
+				<combo_box.item label="Viewer 5" name="V3"/>
 				<combo_box.item label="Híbrido" name="Hybrid"/>
 			</combo_box>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_fs_login.xml b/indra/newview/skins/default/xui/ja/panel_fs_login.xml
index c5587e00c7..c6d949ed2e 100644
--- a/indra/newview/skins/default/xui/ja/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_fs_login.xml
@@ -51,7 +51,7 @@
 			<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
 				<combo_box.item label="Firestorm" name="Firestorm" value="settings_firestorm.xml" />
 				<combo_box.item label="Phoenix" name="Phoenix" value="settings_phoenix.xml" />
-				<combo_box.item label="Viewer 4" name="V3" value="settings_v3.xml" />
+				<combo_box.item label="Viewer 5" name="V3" value="settings_v3.xml" />
 				<combo_box.item label="Hybrid" name="Hybrid" value="settings_hybrid.xml" />
 				<combo_box.item label="Latency" name="Latency" value="settings_latency.xml" />
 			</combo_box>
diff --git a/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
index 5e9f9979eb..f748fdd37d 100644
--- a/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_fs_nui_login.xml
@@ -49,7 +49,7 @@
 							<combo_box tool_tip="基本設定を適切に行うために、一番慣れているビューワのタイプを選択して下さい。" name="mode_combo">
 								<combo_box.item label="Firestorm" name="Firestorm" />
 								<combo_box.item label="Phoenix" name="Phoenix" />
-								<combo_box.item label="Viewer 4" name="V3" />
+								<combo_box.item label="Viewer 5" name="V3" />
 								<combo_box.item label="ハイブリッド" name="Hybrid" />
 								<combo_box.item label="Latency" name="Latency" />
 								<combo_box.item label="テキスト" name="Text" />
diff --git a/indra/newview/skins/latency/xui/en/panel_fs_login.xml b/indra/newview/skins/latency/xui/en/panel_fs_login.xml
index 1e3b0b5e67..5ebb33958f 100644
--- a/indra/newview/skins/latency/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/latency/xui/en/panel_fs_login.xml
@@ -311,7 +311,7 @@
                 />
                 <combo_box.item
                  name="V3"
-                 label="Viewer 4"
+                 label="Viewer 5"
                  value="settings_v3.xml"
                 />
                 <combo_box.item
diff --git a/indra/newview/skins/starlight/xui/en/panel_fs_login.xml b/indra/newview/skins/starlight/xui/en/panel_fs_login.xml
index d3874b6104..d38cb120ba 100644
--- a/indra/newview/skins/starlight/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_fs_login.xml
@@ -296,7 +296,7 @@
             name="Phoenix"
             value="settings_phoenix.xml" />
            <combo_box.item
-            label="Viewer 4"
+            label="Viewer 5"
             name="V3"
             value="settings_v3.xml" />
            <combo_box.item
diff --git a/indra/newview/skins/starlight/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/starlight/xui/en/panel_fs_nui_login.xml
index 19ab57d9b0..e1915b39d0 100644
--- a/indra/newview/skins/starlight/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_fs_nui_login.xml
@@ -316,7 +316,7 @@
         name="Phoenix"
         value="settings_phoenix.xml" />
       <combo_box.item
-        label="Viewer 4"
+        label="Viewer 5"
         name="V3"
         value="settings_v3.xml" />
       <combo_box.item
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
index 49f3cefcd8..1a33c592ab 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
@@ -295,7 +295,7 @@ tool_tip="The account name you chose when you registered, like bobsmith420 or St
             name="Phoenix"
             value="settings_phoenix.xml" />
            <combo_box.item
-            label="Viewer 4"
+            label="Viewer 5"
             name="V3"
             value="settings_v3.xml" />
            <combo_box.item
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/starlightcui/xui/en/panel_fs_nui_login.xml
index 19ab57d9b0..e1915b39d0 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_fs_nui_login.xml
@@ -316,7 +316,7 @@
         name="Phoenix"
         value="settings_phoenix.xml" />
       <combo_box.item
-        label="Viewer 4"
+        label="Viewer 5"
         name="V3"
         value="settings_v3.xml" />
       <combo_box.item