diff --git a/SQF/dayz_server/traders/caribou.sqf b/SQF/dayz_server/traders/caribou.sqf
index 64a1fee93..a3ec74c17 100644
--- a/SQF/dayz_server/traders/caribou.sqf
+++ b/SQF/dayz_server/traders/caribou.sqf
@@ -48,8 +48,8 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Raven Rock
-		["Functionary1_EP1_DZ",[1386.9,6941.33,0],93],
+		["Functionary1_EP1",[1386.9,6941.33,0],93],
 		//Raun
-		["Functionary1_EP1_DZ",[3946.33,886.11,0],261]
+		["Functionary1_EP1",[3946.33,886.11,0],261]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/chernarus11.sqf b/SQF/dayz_server/traders/chernarus11.sqf
index bf46cc056..dec75ad04 100644
--- a/SQF/dayz_server/traders/chernarus11.sqf
+++ b/SQF/dayz_server/traders/chernarus11.sqf
@@ -63,10 +63,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Stary
-		["Functionary1_EP1_DZ",[6324.71,7787,0],64],
+		["Functionary1_EP1",[6324.71,7787,0],64],
 		//Bash
-		["Functionary1_EP1_DZ",[4057.35,11662.7,0],47],
+		["Functionary1_EP1",[4057.35,11662.7,0],47],
 		//Klen
-		["Functionary1_EP1_DZ",[11461,11348.6,0],312]
+		["Functionary1_EP1",[11461,11348.6,0],312]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/chernarus17.sqf b/SQF/dayz_server/traders/chernarus17.sqf
index 9476920b8..207ade6b3 100644
--- a/SQF/dayz_server/traders/chernarus17.sqf
+++ b/SQF/dayz_server/traders/chernarus17.sqf
@@ -63,10 +63,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Stary
-		["Functionary1_EP1_DZ",[6324.71,7787,0],64],
+		["Functionary1_EP1",[6324.71,7787,0],64],
 		//Bash
-		["Functionary1_EP1_DZ",[4057.35,11662.7,0],47],
+		["Functionary1_EP1",[4057.35,11662.7,0],47],
 		//Klen
-		["Functionary1_EP1_DZ",[11461,11348.6,0],312]
+		["Functionary1_EP1",[11461,11348.6,0],312]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/cmr_ovaron.sqf b/SQF/dayz_server/traders/cmr_ovaron.sqf
index a95148858..8bfb90aee 100644
--- a/SQF/dayz_server/traders/cmr_ovaron.sqf
+++ b/SQF/dayz_server/traders/cmr_ovaron.sqf
@@ -51,8 +51,8 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Lissabon
-		["Functionary1_EP1_DZ",[4349.68,6725.49,0],179],
+		["Functionary1_EP1",[4349.68,6725.49,0],179],
 		//Riad
-		["Functionary1_EP1_DZ",[5883.27,3548.17,0],225]
+		["Functionary1_EP1",[5883.27,3548.17,0],225]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/fdf_isle1_a.sqf b/SQF/dayz_server/traders/fdf_isle1_a.sqf
index f8a2ecaee..a97bb37f2 100644
--- a/SQF/dayz_server/traders/fdf_isle1_a.sqf
+++ b/SQF/dayz_server/traders/fdf_isle1_a.sqf
@@ -47,8 +47,8 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Jesco
-		["Functionary1_EP1_DZ",[9662.23,10879.8,0],0],
+		["Functionary1_EP1",[9662.23,10879.8,0],0],
 		//Berezniki
-		["Functionary1_EP1_DZ",[7979.71,10577.8,0.1],292]
+		["Functionary1_EP1",[7979.71,10577.8,0.1],292]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/isladuala.sqf b/SQF/dayz_server/traders/isladuala.sqf
index a84f75e61..0a30b92f6 100644
--- a/SQF/dayz_server/traders/isladuala.sqf
+++ b/SQF/dayz_server/traders/isladuala.sqf
@@ -63,10 +63,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Camara
-		["Functionary1_EP1_DZ",[2001.31,1196.58,0],342],
+		["Functionary1_EP1",[2001.31,1196.58,0],342],
 		//Nubak
-		["Functionary1_EP1_DZ",[4959.47,5117.99,0],11],
+		["Functionary1_EP1",[4959.47,5117.99,0],11],
 		//Pinley
-		["Functionary1_EP1_DZ",[1286.47,9073.91,0],197]
+		["Functionary1_EP1",[1286.47,9073.91,0],197]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/lingor.sqf b/SQF/dayz_server/traders/lingor.sqf
index d183578e1..f406bdf5f 100644
--- a/SQF/dayz_server/traders/lingor.sqf
+++ b/SQF/dayz_server/traders/lingor.sqf
@@ -62,9 +62,9 @@
 // Bankers
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
-		["Functionary1_EP1_DZ",[3020.2061,5945.2783,0.23],0],
-		["Functionary1_EP1_DZ",[4140.2051,1505.2682,2.3],55],
-		["Functionary1_EP1_DZ",[7519.0171,2949.8694,6.2],-177],
-		["Functionary1_EP1_DZ",[4239.9063,4841.8989,3.8],94]
+		["Functionary1_EP1",[3020.2061,5945.2783,0.23],0],
+		["Functionary1_EP1",[4140.2051,1505.2682,2.3],55],
+		["Functionary1_EP1",[7519.0171,2949.8694,6.2],-177],
+		["Functionary1_EP1",[4239.9063,4841.8989,3.8],94]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/namalsk.sqf b/SQF/dayz_server/traders/namalsk.sqf
index f0b706fdc..e4c4da940 100644
--- a/SQF/dayz_server/traders/namalsk.sqf
+++ b/SQF/dayz_server/traders/namalsk.sqf
@@ -31,10 +31,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Sebjan
-		["Functionary1_EP1_DZ",[6215.8,9177.55,0],133],
+		["Functionary1_EP1",[6215.8,9177.55,0],133],
 		//Hero
-		["Functionary1_EP1_DZ",[8888.08,10759.4,0],114],
+		["Functionary1_EP1",[8888.08,10759.4,0],114],
 		//Bandit
-		["Functionary1_EP1_DZ",[7268.28,5810.53,0],82]
+		["Functionary1_EP1",[7268.28,5810.53,0],82]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/napf.sqf b/SQF/dayz_server/traders/napf.sqf
index 2283b0f53..ced24a451 100644
--- a/SQF/dayz_server/traders/napf.sqf
+++ b/SQF/dayz_server/traders/napf.sqf
@@ -62,9 +62,9 @@
 // Bankers
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
-		["Functionary1_EP1_DZ",[12399.83,5054.3413,0.2],52],
-		["Functionary1_EP1_DZ",[15529.827,13236.555,2.38],164],
-		["Functionary1_EP1_DZ",[8252.4922,15494.612,0.22],24.5],
-		["Functionary1_EP1_DZ",[2123.4653,7806.499,0.28],53]
+		["Functionary1_EP1",[12399.83,5054.3413,0.2],52],
+		["Functionary1_EP1",[15529.827,13236.555,2.38],164],
+		["Functionary1_EP1",[8252.4922,15494.612,0.22],24.5],
+		["Functionary1_EP1",[2123.4653,7806.499,0.28],53]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/panthera2.sqf b/SQF/dayz_server/traders/panthera2.sqf
index d7f7b11d9..40c4b4a50 100644
--- a/SQF/dayz_server/traders/panthera2.sqf
+++ b/SQF/dayz_server/traders/panthera2.sqf
@@ -62,8 +62,8 @@
 // Bankers
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
-		["Functionary1_EP1_DZ",[4770.4067,7482.2651,-1.7],0],
-		["Functionary1_EP1_DZ",[4431.1997,1616.5604,1.9],-85],
-		["Functionary1_EP1_DZ",[8252.4922,15494.612,0.22],93]
+		["Functionary1_EP1",[4770.4067,7482.2651,-1.7],0],
+		["Functionary1_EP1",[4431.1997,1616.5604,1.9],-85],
+		["Functionary1_EP1",[8252.4922,15494.612,0.22],93]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/sauerland.sqf b/SQF/dayz_server/traders/sauerland.sqf
index ac55431ec..bb73ad3e5 100644
--- a/SQF/dayz_server/traders/sauerland.sqf
+++ b/SQF/dayz_server/traders/sauerland.sqf
@@ -61,10 +61,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Seedorf
-		["Functionary1_EP1_DZ",[15488.6,17014.2,0],172],
+		["Functionary1_EP1",[15488.6,17014.2,0],172],
 		//Oberdorf
-		["Functionary1_EP1_DZ",[13160.8,6624.8,0],134],
+		["Functionary1_EP1",[13160.8,6624.8,0],134],
 		//Oberberg
-		["Functionary1_EP1_DZ",[24738.5,21748.2,0],62]
+		["Functionary1_EP1",[24738.5,21748.2,0],62]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/smd_sahrani_a2.sqf b/SQF/dayz_server/traders/smd_sahrani_a2.sqf
index 67d39a87d..7a12542d1 100644
--- a/SQF/dayz_server/traders/smd_sahrani_a2.sqf
+++ b/SQF/dayz_server/traders/smd_sahrani_a2.sqf
@@ -63,10 +63,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Corazol
-		["Functionary1_EP1_DZ",[12552.1,8355.03,0],29],
+		["Functionary1_EP1",[12552.1,8355.03,0],29],
 		//Bagango
-		["Functionary1_EP1_DZ",[14264.6,12431.2,0],97],
+		["Functionary1_EP1",[14264.6,12431.2,0],97],
 		//Ixel
-		["Functionary1_EP1_DZ",[17189,13596.6,0],160]
+		["Functionary1_EP1",[17189,13596.6,0],160]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/takistan.sqf b/SQF/dayz_server/traders/takistan.sqf
index 9a740702c..572559586 100644
--- a/SQF/dayz_server/traders/takistan.sqf
+++ b/SQF/dayz_server/traders/takistan.sqf
@@ -59,10 +59,10 @@
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
 		//Nur
-		["Functionary1_EP1_DZ",[1964.39,12575,0],200],
+		["Functionary1_EP1",[1964.39,12575,0],200],
 		//Garmsar
-		["Functionary1_EP1_DZ",[10857.6,6325.05,0.44],129],
+		["Functionary1_EP1",[10857.6,6325.05,0.44],129],
 		//Khushab
-		["Functionary1_EP1_DZ",[431.039,5574.53,0],84]
+		["Functionary1_EP1",[431.039,5574.53,0],84]
 	] call server_spawnTraders;
 };
diff --git a/SQF/dayz_server/traders/tavi.sqf b/SQF/dayz_server/traders/tavi.sqf
index 7c4958d10..e3552b297 100644
--- a/SQF/dayz_server/traders/tavi.sqf
+++ b/SQF/dayz_server/traders/tavi.sqf
@@ -82,11 +82,11 @@
 // Bankers
 if (Z_singleCurrency && Z_globalBanking && Z_globalBankingTraders) then {
 	[
-		["Functionary1_EP1_DZ",[5461.0132,8762.3438,0.056497198],52],
-		["Functionary1_EP1_DZ",[11026.932,842.23804,0.18712912],138.57352],
-		["Functionary1_EP1_DZ",[17231.154,7661.1392,0.102005],-202.23622],
-		["Functionary1_EP1_DZ",[12643.531,11811.004,100.51027],100.51027],
-		["Functionary1_EP1_DZ",[15370.618,16458.928,0.056785069],-188.12981],
-		["Functionary1_EP1_DZ",[10167.308,19075.475,0.26185527],-116.41749]
+		["Functionary1_EP1",[5461.0132,8762.3438,0.056497198],52],
+		["Functionary1_EP1",[11026.932,842.23804,0.18712912],138.57352],
+		["Functionary1_EP1",[17231.154,7661.1392,0.102005],-202.23622],
+		["Functionary1_EP1",[12643.531,11811.004,100.51027],100.51027],
+		["Functionary1_EP1",[15370.618,16458.928,0.056785069],-188.12981],
+		["Functionary1_EP1",[10167.308,19075.475,0.26185527],-116.41749]
 	] call server_spawnTraders;
 };