diff --git a/Sources/epoch_code/System/task_control.fsm b/Sources/epoch_code/System/task_control.fsm
index f23aa88b..78b11ec5 100644
--- a/Sources/epoch_code/System/task_control.fsm
+++ b/Sources/epoch_code/System/task_control.fsm
@@ -279,13 +279,13 @@ class FSM
                          "" \n
                          "//Mission Control - WIP. TODO: Move to serverside mission control UINamespace not secure." \n
                          "//uiNameSpace setVariable [""axeTask"",_taskName];" \n
-                         "_plyrVar = player getVariable [""SERVER_VARS"",[]];" \n
+                         "_plyrVar = missionNamespace  getVariable [""EPOCH_playerMissionArray"",[]];" \n
                          "_taskIndex = ((_plyrVar apply {_x find ""axeTask"" > -1;}) find true);" \n
                          "if(_taskIndex > -1)then{" \n
                          "_plyrVar deleteAt _taskIndex;" \n
                          "};" \n
                          "_plyrVar pushBack [""axeTask"",_taskName];" \n
-                         "player setVariable [""SERVER_VARS"",_plyrVar,true];" \n
+                         "missionNamespace setVariable [""EPOCH_playerMissionArray"",_plyrVar];" \n
                          "" \n
                          "missionNameSpace setVariable [""axeTask"",_taskName];" \n
                          "" \n
@@ -496,12 +496,12 @@ class FSM
                         itemno = 6;
                         init = /*%FSM<STATEINIT""">*/"//uiNameSpace setVariable [""axeTask"",nil];" \n
                          "if!(_doBin)then{" \n
-                         "_plyrVar = player getVariable [""SERVER_VARS"",[]];" \n
+                         "_plyrVar = missionNamespace getVariable [""EPOCH_playerMissionArray"",[]];" \n
                          "_taskIndex = ((_plyrVar apply {_x find ""axeTask"" > -1;}) find true);" \n
                          "if(_taskIndex > -1)then{" \n
                          "_plyrVar deleteAt _taskIndex;" \n
                          "};" \n
-                         "player setVariable [""SERVER_VARS"",_plyrVar,true];" \n
+                         "missionNamespace setVariable [""EPOCH_playerMissionArray"",_plyrVar];" \n
                          "};" \n
                          "if(count _missionCleanUp > 0)then{" \n
                          "{" \n
diff --git a/Sources/mpmissions/epoch.Altis/treeView.txt b/Sources/mpmissions/epoch.Altis/treeView.txt
index 12f95481..20610c58 100644
Binary files a/Sources/mpmissions/epoch.Altis/treeView.txt and b/Sources/mpmissions/epoch.Altis/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Australia/treeView.txt b/Sources/mpmissions/epoch.Australia/treeView.txt
index 733b4641..d686e796 100644
Binary files a/Sources/mpmissions/epoch.Australia/treeView.txt and b/Sources/mpmissions/epoch.Australia/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt b/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt
index d4d02981..c81ebd13 100644
Binary files a/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt and b/Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Bornholm/treeView.txt b/Sources/mpmissions/epoch.Bornholm/treeView.txt
index 6011b39e..dc495830 100644
Binary files a/Sources/mpmissions/epoch.Bornholm/treeView.txt and b/Sources/mpmissions/epoch.Bornholm/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Chernarus/treeView.txt b/Sources/mpmissions/epoch.Chernarus/treeView.txt
index 4e4f2113..28d4005e 100644
Binary files a/Sources/mpmissions/epoch.Chernarus/treeView.txt and b/Sources/mpmissions/epoch.Chernarus/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt b/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt
index 81d384ad..4b7bea30 100644
Binary files a/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt and b/Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt differ
diff --git a/Sources/mpmissions/epoch.Desert_E/treeView.txt b/Sources/mpmissions/epoch.Desert_E/treeView.txt
index f998ab1e..92b2930a 100644
Binary files a/Sources/mpmissions/epoch.Desert_E/treeView.txt and b/Sources/mpmissions/epoch.Desert_E/treeView.txt differ