diff --git a/addons/spectator/ACE_Settings.hpp b/addons/spectator/ACE_Settings.hpp
index 8fd6981f33..bdf9d5f429 100644
--- a/addons/spectator/ACE_Settings.hpp
+++ b/addons/spectator/ACE_Settings.hpp
@@ -6,7 +6,7 @@ class ACE_Settings {
     class GVAR(filterUnits) {
         typeName = "SCALAR";
         value = 0;
-        values[] = {"$STR_Special_None", CSTRING(units_players), CSTRING(units_all)};
+        values[] = {CSTRING(units_none), CSTRING(units_players), CSTRING(units_all)};
     };
     class GVAR(filterSides) {
         typeName = "SCALAR";
diff --git a/addons/spectator/CfgVehicles.hpp b/addons/spectator/CfgVehicles.hpp
index 30a9c85acf..d6e21789db 100644
--- a/addons/spectator/CfgVehicles.hpp
+++ b/addons/spectator/CfgVehicles.hpp
@@ -15,13 +15,13 @@ class CfgVehicles {
                 typeName = "BOOL";
                 defaultValue = 0;
             };
-            class spectatorUnits {
+            class unitsFilter {
                 displayName = CSTRING(units_DisplayName);
                 description = CSTRING(units_Description);
                 typeName = "NUMBER";
                 class values {
                     class none {
-                        name = "$STR_Special_None";
+                        name = CSTRING(units_none);
                         value = 0;
                         default = 1;
                     };
@@ -35,7 +35,7 @@ class CfgVehicles {
                     };
                 };
             };
-            class spectatorSides {
+            class sidesFilter {
                 displayName = CSTRING(sides_DisplayName);
                 description = CSTRING(sides_Description);
                 typeName = "NUMBER";
diff --git a/addons/spectator/functions/fnc_handleInterface.sqf b/addons/spectator/functions/fnc_handleInterface.sqf
index 10773d61fa..db54d53c09 100644
--- a/addons/spectator/functions/fnc_handleInterface.sqf
+++ b/addons/spectator/functions/fnc_handleInterface.sqf
@@ -137,10 +137,10 @@ switch (toLower _mode) do {
             [localize LSTRING(freeCamPrevVis),"Ctrl + N"],
 
             [localize LSTRING(otherControls)],
-            [localize LSTRING(nextCam),"Up"],
-            [localize LSTRING(prevCam),"Down"],
-            [localize LSTRING(nextUnit),"Right"],
-            [localize LSTRING(prevUnit),"Left"]
+            [localize LSTRING(nextCam),"Up Arrow"],
+            [localize LSTRING(prevCam),"Down Arrow"],
+            [localize LSTRING(nextUnit),"Right Arrow"],
+            [localize LSTRING(prevUnit),"Left Arrow"]
         ];
 
         // Hacky way to enable keybindings
diff --git a/addons/spectator/functions/fnc_handleToolbar.sqf b/addons/spectator/functions/fnc_handleToolbar.sqf
index 58ed926f10..fd29ca532e 100644
--- a/addons/spectator/functions/fnc_handleToolbar.sqf
+++ b/addons/spectator/functions/fnc_handleToolbar.sqf
@@ -37,7 +37,7 @@ if (GVAR(camMode) == 0) then {
 };
 
 if (isNull GVAR(camUnit)) then {
-    _name = localize "STR_VOICE_MASK_NONE";
+    _name = localize "STR_Special_None";
 } else {
     _name = GETVAR(GVAR(camUnit),GVAR(uName),"");
 };
diff --git a/addons/spectator/functions/fnc_moduleSpectatorSettings.sqf b/addons/spectator/functions/fnc_moduleSpectatorSettings.sqf
index f934b95c35..beb8f0be38 100644
--- a/addons/spectator/functions/fnc_moduleSpectatorSettings.sqf
+++ b/addons/spectator/functions/fnc_moduleSpectatorSettings.sqf
@@ -20,7 +20,7 @@ params ["_logic", "_units", "_activated"];
 if !(_activated) exitWith {};
 
 [_logic, QGVAR(enabledSystem), "spectatorSystem"] call EFUNC(common,readSettingFromModule);
-[_logic, QGVAR(filterUnits), "spectatorUnits"] call EFUNC(common,readSettingFromModule);
-[_logic, QGVAR(filterSides), "spectatorSides"] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(filterUnits), "unitsFilter"] call EFUNC(common,readSettingFromModule);
+[_logic, QGVAR(filterSides), "sidesFilter"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(restrictModes), "cameraModes"] call EFUNC(common,readSettingFromModule);
 [_logic, QGVAR(restrictVisions), "visionModes"] call EFUNC(common,readSettingFromModule);
diff --git a/addons/spectator/stringtable.xml b/addons/spectator/stringtable.xml
index 3f0df59804..cbfad243d7 100644
--- a/addons/spectator/stringtable.xml
+++ b/addons/spectator/stringtable.xml
@@ -14,10 +14,13 @@
             <English>Enter spectator mode upon respawn.</English>
         </Key>
         <Key ID="STR_ACE_Spectator_units_DisplayName">
-            <English>Spectatable Units</English>
+            <English>Unit filter</English>
         </Key>
         <Key ID="STR_ACE_Spectator_units_Description">
-            <English>Units automatically made available to spectate.</English>
+            <English>Method of filtering spectatable units.</English>
+        </Key>
+        <Key ID="STR_ACE_Spectator_units_none">
+            <English>No units</English>
         </Key>
         <Key ID="STR_ACE_Spectator_units_players">
             <English>Only players</English>
@@ -26,10 +29,10 @@
             <English>All units</English>
         </Key>
         <Key ID="STR_ACE_Spectator_sides_DisplayName">
-            <English>Spectatable Sides</English>
+            <English>Side filter</English>
         </Key>
         <Key ID="STR_ACE_Spectator_sides_Description">
-            <English>Sides automatically made available to spectate.</English>
+            <English>Method of filtering spectatable sides.</English>
         </Key>
         <Key ID="STR_ACE_Spectator_sides_player">
             <English>Player side</English>
@@ -105,22 +108,22 @@
             <English>Free Camera Controls</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamForward">
-            <English>Move Camera Forward</English>
+            <English>Camera Forward</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamBackward">
-            <English>Move Camera Backward</English>
+            <English>Camera Backward</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamLeft">
-            <English>Move Camera Left</English>
+            <English>Camera Left</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamRight">
-            <English>Move Camera Right</English>
+            <English>Camera Right</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamUp">
-            <English>Move Camera Up</English>
+            <English>Camera Up</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamDown">
-            <English>Move Camera Down</English>
+            <English>Camera Down</English>
         </Key>
         <Key ID="STR_ACE_Spectator_freeCamPan">
             <English>Pan Camera</English>