diff --git a/.gitignore b/.gitignore
index 8791a25..100bedb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-.svn
 .vscode
 .git
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index 0a14b37..0000000
--- a/.prettierrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "tabWidth": 4,
-    "useTabs": true,
-    "semi": true,
-    "singleQuote": false,
-    "trailingComma": "none",
-    "bracketSpacing": true,
-    "overrides": [
-      {
-        "files": "*.cfg",
-        "options": {
-          "parser": "cpp"
-        }
-      }
-    ]
-  }
\ No newline at end of file
diff --git a/braf_factions_air/Pantera_Base.hpp b/braf_factions_air/Pantera_Base.hpp
index cedaafd..574512f 100644
--- a/braf_factions_air/Pantera_Base.hpp
+++ b/braf_factions_air/Pantera_Base.hpp
@@ -174,31 +174,31 @@ class BRAF_Pantera_K2_HIAF_Navy : BRAF_Pantera_K2_HIAF1 {
                 priority=1;
                 onlyForPlayer=0;
                 condition="this animationphase 'Hoist_Hide' > 0.9 AND (player in crew this) AND this animationphase 'Door_R_1' > 0.9 AND this animationphase 'Civilian_hide' < 0.1";
-                statement="this execVM ""Braf_SAR\Braf_Scripts\DRS.sqf""; this animate ['Hoist_Hide',-0.5]";
+                statement="this execVM ""braf_SAR\braf_Scripts\DRS.sqf""; this animate ['Hoist_Hide',-0.5]";
             };
             class Hoist_Down: Deploy_Rescue_Seat
             {
                 displayname="<t color='#ffaa00'> Extend Cable Hook </t>";
                 condition="this animationphase 'Hoist_Hide' < -0.4 AND this animationphase 'Hoist_Hide' > -0.6 AND (player in crew this) AND this animationphase 'Door_R_1' > 0.9";
-                statement="this execVM ""Braf_SAR\Braf_Scripts\hoist_down.sqf""; this animate ['Hoist_Hide',-1]; this say3d ""Winch""";
+                statement="this execVM ""braf_SAR\braf_Scripts\hoist_down.sqf""; this animate ['Hoist_Hide',-1]; this say3d ""Winch""";
             };
             class Hoist_Up: Deploy_Rescue_Seat
             {
                 displayname="<t color='#ffaa00'> Recover Cable Hook </t>";
                 condition="this animationphase 'Hoist_Hide' < -0.9  AND (player in crew this) AND this animationphase 'Door_R_1' > 0.9";
-                statement="this execVM ""Braf_SAR\Braf_Scripts\hoist_up.sqf""; this animate ['Hoist_Hide',-0.5]; this say3d ""Winch""";
+                statement="this execVM ""braf_SAR\braf_Scripts\hoist_up.sqf""; this animate ['Hoist_Hide',-0.5]; this say3d ""Winch""";
             };
             class Recover_Rescue_Seat: Deploy_Rescue_Seat
             {
                 displayname="<t color='#ffaa00'> Retrieve Rescue Seat </t>";
                 condition="(player in crew this) AND this animationphase 'Door_R_1' > 0.9 AND this animationphase 'Hoist_Hide' < -0.4  AND this animationphase 'Hoist_Hide' > -0.6";
-                statement="this execVM ""Braf_SAR\Braf_Scripts\recover_seat.sqf""; this animate ['Hoist_Hide',1]";
+                statement="this execVM ""braf_SAR\braf_Scripts\recover_seat.sqf""; this animate ['Hoist_Hide',1]";
             };
             class Hoist_Cut: Deploy_Rescue_Seat
             {
                 displayname="<t color='#b31d00'> Cut Hoist Hook Cable </t>";
                 condition="(player in crew this) AND this animationphase 'Door_R_1' > 0.9 AND this animationphase 'Hoist_Hide' < 0";
-                statement="this execVM ""Braf_SAR\Braf_Scripts\hoist_cut.sqf""; this animate ['Hoist_Hide',1]";
+                statement="this execVM ""braf_SAR\braf_Scripts\hoist_cut.sqf""; this animate ['Hoist_Hide',1]";
             };
             class Open_Door_Left
             {
diff --git a/braf_factions_characters/units/v_cratenia_2020.hpp b/braf_factions_characters/units/v_cratenia_2020.hpp
index de6e101..a77549e 100644
--- a/braf_factions_characters/units/v_cratenia_2020.hpp
+++ b/braf_factions_characters/units/v_cratenia_2020.hpp
@@ -31,14 +31,14 @@ class braf_cra_of_regular : braf_army_of_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
@@ -118,14 +118,14 @@ class braf_cra_sl_regular : braf_army_sl_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
@@ -212,14 +212,14 @@ class braf_cra_tl_regular : braf_army_tl_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_PT92",
         "Binocular",
         "Throw",
@@ -306,12 +306,12 @@ class braf_cra_medic_regular : braf_army_medic_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -392,12 +392,12 @@ class braf_cra_eng_regular : braf_army_eng_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -480,12 +480,12 @@ class braf_cra_rifleman_regular : braf_army_rifleman_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -562,12 +562,12 @@ class braf_cra_riflelight_regular : braf_army_rifleman_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -638,12 +638,12 @@ class braf_cra_ammo_regular : braf_army_rifleman_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -723,12 +723,12 @@ class braf_cra_dmr_regular : braf_army_dmr_regular_2000 {
         "braf_20Rnd_762x51_red"
     };
     respawnWeapons[] = {
-        "Braf_fal",
+        "braf_fal",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_fal",
+        "braf_fal",
         "Throw",
         "Put"
     };
@@ -801,12 +801,12 @@ class braf_cra_ar_regular : braf_army_ar_regular_2000 {
         "30Rnd_556x45_Stanag"
     };
     respawnWeapons[] = {
-        "Braf_lmga4",
+        "braf_lmga4",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_lmga4",
+        "braf_lmga4",
         "Throw",
         "Put"
     };
@@ -880,13 +880,13 @@ class braf_cra_lat_regular : braf_army_lat_regular_2000 {
         "braf_Lapa30Rnd_556x45_red"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_launch_alac",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_launch_alac",
         "Throw",
         "Put"
@@ -963,12 +963,12 @@ class braf_cra_militia_regular : braf_army_rifleman_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Mosquefal",
+        "braf_Mosquefal",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Mosquefal",
+        "braf_Mosquefal",
         "Throw",
         "Put"
     };
@@ -1063,13 +1063,13 @@ class braf_cra_at_regular : braf_army_at_regular_2000 {
         "Chemlight_green",
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "braf_Gustav",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "braf_Gustav",
         "Throw",
         "Put"
@@ -1141,13 +1141,13 @@ class braf_cra_aa_regular : braf_army_aa_regular_2000 {
         "BRAF_Igla_missile"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_Igla",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "BRAF_Igla",
         "Throw",
         "Put"
@@ -1219,12 +1219,12 @@ class braf_cra_mortar_regular : braf_army_mortar_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -1296,12 +1296,12 @@ class braf_cra_mortar_a_regular : braf_army_mortar_a_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -1374,12 +1374,12 @@ class braf_cra_hmg_regular : braf_army_rifleman_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
@@ -1452,12 +1452,12 @@ class braf_cra_hmg_a_regular : braf_army_rifleman_regular_2000 {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Lapa",
+        "braf_Lapa",
         "Throw",
         "Put"
     };
diff --git a/braf_factions_characters/units/v_cratenia_jungle_2020.hpp b/braf_factions_characters/units/v_cratenia_jungle_2020.hpp
index 27f87b3..bd8beaa 100644
--- a/braf_factions_characters/units/v_cratenia_jungle_2020.hpp
+++ b/braf_factions_characters/units/v_cratenia_jungle_2020.hpp
@@ -825,12 +825,12 @@ class braf_cra_ar_jungle : braf_cra_ar_regular {
         "30Rnd_556x45_Stanag"
     };
     respawnWeapons[] = {
-        "Braf_lmga4_green",
+        "braf_lmga4_green",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_lmga4_green",
+        "braf_lmga4_green",
         "Throw",
         "Put"
     };
@@ -997,12 +997,12 @@ class braf_cra_militia_jungle : braf_cra_militia_regular {
         "Chemlight_green"
     };
     respawnWeapons[] = {
-        "Braf_Mosquefal",
+        "braf_Mosquefal",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Mosquefal",
+        "braf_Mosquefal",
         "Throw",
         "Put"
     };
diff --git a/braf_factions_characters/units/v_hiaf_army_2020.hpp b/braf_factions_characters/units/v_hiaf_army_2020.hpp
index 804525c..7bea904 100644
--- a/braf_factions_characters/units/v_hiaf_army_2020.hpp
+++ b/braf_factions_characters/units/v_hiaf_army_2020.hpp
@@ -1180,12 +1180,12 @@ class braf_hiaf_dmr_regular : braf_army_dmr_regular_2000 {
         "braf_20Rnd_762x51_red"
     };
     respawnWeapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
@@ -1655,10 +1655,10 @@ class braf_hiaf_ar_regular : braf_army_ar_regular_2000 {
     genericNames = "TanoanMen";
     editorPreview = "BRAF_Factions\braf_factions_characters\units\editorPreview\hiaf_army\braf_hiaf_ar_regular.jpg";
     magazines[] = {
-        "Braf_75Rnd_mag58_mag_Tracer_red",
-        "Braf_75Rnd_mag58_mag_Tracer_red",
+        "braf_75Rnd_mag58_mag_Tracer_red",
+        "braf_75Rnd_mag58_mag_Tracer_red",
         "16Rnd_9x21_Mag",
-        "Braf_75Rnd_mag58_mag_Tracer_red"
+        "braf_75Rnd_mag58_mag_Tracer_red"
     };
     respawnWeapons[] = {
         "BRAF_mag",
@@ -1673,10 +1673,10 @@ class braf_hiaf_ar_regular : braf_army_ar_regular_2000 {
         "Put"
     };
     respawnMagazines[] = {
-        "Braf_75Rnd_mag58_mag_Tracer_red",
-        "Braf_75Rnd_mag58_mag_Tracer_red",
+        "braf_75Rnd_mag58_mag_Tracer_red",
+        "braf_75Rnd_mag58_mag_Tracer_red",
         "16Rnd_9x21_Mag",
-        "Braf_75Rnd_mag58_mag_Tracer_red"
+        "braf_75Rnd_mag58_mag_Tracer_red"
     };
     Items[] = {
         "FirstAidKit",
diff --git a/braf_factions_characters/units/v_hiaf_commando_2020.hpp b/braf_factions_characters/units/v_hiaf_commando_2020.hpp
index 2095e47..355358b 100644
--- a/braf_factions_characters/units/v_hiaf_commando_2020.hpp
+++ b/braf_factions_characters/units/v_hiaf_commando_2020.hpp
@@ -357,12 +357,12 @@ class braf_hiaf_dmr_commando : braf_factions_specops_base {
         "braf_20Rnd_762x51_red"
     };
     respawnWeapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
diff --git a/braf_factions_characters/units/v_hiaf_marine_2020.hpp b/braf_factions_characters/units/v_hiaf_marine_2020.hpp
index 5bbfe2b..dcb009b 100644
--- a/braf_factions_characters/units/v_hiaf_marine_2020.hpp
+++ b/braf_factions_characters/units/v_hiaf_marine_2020.hpp
@@ -800,12 +800,12 @@ class braf_hiaf_dmr_marine : braf_hiaf_dmr_regular {
         "braf_20Rnd_762x51_red"
     };
     respawnWeapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_Fal_hiaf_Scope",
+        "braf_Fal_hiaf_Scope",
         "Throw",
         "Put"
     };
@@ -1105,13 +1105,13 @@ class braf_hiaf_ar_marine : braf_hiaf_ar_regular {
         "16Rnd_9x21_Mag"
     };
     respawnWeapons[] = {
-        "Braf_FAP",
+        "braf_FAP",
         "BRAF_PT92",
         "Throw",
         "Put"
     };
     weapons[] = {
-        "Braf_FAP",
+        "braf_FAP",
         "BRAF_PT92",
         "Throw",
         "Put"
diff --git a/braf_factions_characters_backpack/v_backpack.hpp b/braf_factions_characters_backpack/v_backpack.hpp
index 2a8c439..8badfea 100644
--- a/braf_factions_characters_backpack/v_backpack.hpp
+++ b/braf_factions_characters_backpack/v_backpack.hpp
@@ -281,8 +281,8 @@ class braf_hiaf_alice_medium_ammo_mg_762 : braf_hiaf_alice_medium_medic {
         ""
     };
     class TransportMagazines {
-        class _xx_Braf_75Rnd_mag58_mag_Tracer_red {
-            magazine = "Braf_75Rnd_mag58_mag_Tracer_red";
+        class _xx_braf_75Rnd_mag58_mag_Tracer_red {
+            magazine = "braf_75Rnd_mag58_mag_Tracer_red";
             count = 6;
         };
     };
diff --git a/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_regular.rvmat b/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_regular.rvmat
index d54ed75..4318c3b 100644
--- a/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_regular.rvmat
+++ b/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_regular.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_regular_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_regular_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_sf.rvmat b/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_sf.rvmat
index d54ed75..4318c3b 100644
--- a/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_sf.rvmat
+++ b/braf_factions_characters_headgear/data/Beret/cratenia/cratenia_sf.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_regular_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_regular_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\cratenia\cratenia_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_army_beret.rvmat b/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_army_beret.rvmat
index fae5536..556818c 100644
--- a/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_army_beret.rvmat
+++ b/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_army_beret.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_army_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_m_beret.rvmat b/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_m_beret.rvmat
index cba026d..041d633 100644
--- a/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_m_beret.rvmat
+++ b/braf_factions_characters_headgear/data/Beret/hiaf/hiaf_m_beret.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\Beret\hiaf\hiaf_marine_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/ccb/ccb.rvmat b/braf_factions_characters_headgear/data/ccb/ccb.rvmat
index e359acc..edd0f4f 100644
--- a/braf_factions_characters_headgear/data/ccb/ccb.rvmat
+++ b/braf_factions_characters_headgear/data/ccb/ccb.rvmat
@@ -7,7 +7,7 @@ specularPower = 40;
 PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_NOHQ.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_NOHQ.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -37,7 +37,7 @@ class Stage3 {
     };
 };
 class Stage4 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_AS.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_AS.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -47,7 +47,7 @@ class Stage4 {
     };
 };
 class Stage5 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_smdi.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_smdi.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
diff --git a/braf_factions_characters_headgear/data/ccb/ccb_coifa.rvmat b/braf_factions_characters_headgear/data/ccb/ccb_coifa.rvmat
index c434f85..5b1fee3 100644
--- a/braf_factions_characters_headgear/data/ccb/ccb_coifa.rvmat
+++ b/braf_factions_characters_headgear/data/ccb/ccb_coifa.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\ccb\ccb_coifa_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/goggles_nvg/goggles_large.rvmat b/braf_factions_characters_headgear/data/goggles_nvg/goggles_large.rvmat
index 4eaa935..a527b01 100644
--- a/braf_factions_characters_headgear/data/goggles_nvg/goggles_large.rvmat
+++ b/braf_factions_characters_headgear/data/goggles_nvg/goggles_large.rvmat
@@ -7,7 +7,7 @@ specularPower = 1000.0;
 PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_nohq.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_nohq.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -37,7 +37,7 @@ class Stage3 {
     };
 };
 class Stage4 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_as.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_as.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -47,7 +47,7 @@ class Stage4 {
     };
 };
 class Stage5 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_smdi.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_large_smdi.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
diff --git a/braf_factions_characters_headgear/data/goggles_nvg/goggles_small.rvmat b/braf_factions_characters_headgear/data/goggles_nvg/goggles_small.rvmat
index 995a1e9..3551741 100644
--- a/braf_factions_characters_headgear/data/goggles_nvg/goggles_small.rvmat
+++ b/braf_factions_characters_headgear/data/goggles_nvg/goggles_small.rvmat
@@ -7,7 +7,7 @@ specularPower = 40.0;
 PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_nohq.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_nohq.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -37,7 +37,7 @@ class Stage3 {
     };
 };
 class Stage4 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_as.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_as.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -47,7 +47,7 @@ class Stage4 {
     };
 };
 class Stage5 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_smdi.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\goggles_nvg\goggles_small_smdi.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
diff --git a/braf_factions_characters_headgear/data/m1/coifa_early.rvmat b/braf_factions_characters_headgear/data/m1/coifa_early.rvmat
index 680fb74..a1f4028 100644
--- a/braf_factions_characters_headgear/data/m1/coifa_early.rvmat
+++ b/braf_factions_characters_headgear/data/m1/coifa_early.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_NOHQ.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_NOHQ.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_early_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/m1/coifa_late.rvmat b/braf_factions_characters_headgear/data/m1/coifa_late.rvmat
index facc584..f85b4cb 100644
--- a/braf_factions_characters_headgear/data/m1/coifa_late.rvmat
+++ b/braf_factions_characters_headgear/data/m1/coifa_late.rvmat
@@ -7,7 +7,7 @@ specularPower = 30.0;
 PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_NOHQ.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_NOHQ.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -37,7 +37,7 @@ class Stage3 {
     };
 };
 class Stage4 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_as.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_as.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
@@ -47,7 +47,7 @@ class Stage4 {
     };
 };
 class Stage5 {
-    texture = "Braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_smdi.paa";
+    texture = "braf_factions\braf_factions_characters_headgear\data\m1\coifa_late_smdi.paa";
     uvSource = "tex";
     class uvTransform {
         aside[] = { 1.0, 0.0, 0.0 };
diff --git a/braf_factions_characters_headgear/data/m1/liner.rvmat b/braf_factions_characters_headgear/data/m1/liner.rvmat
index f17c675..c971061 100644
--- a/braf_factions_characters_headgear/data/m1/liner.rvmat
+++ b/braf_factions_characters_headgear/data/m1/liner.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_NOHQ.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_NOHQ.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/m1/liner_plastic.rvmat b/braf_factions_characters_headgear/data/m1/liner_plastic.rvmat
index a8d056c..09a2533 100644
--- a/braf_factions_characters_headgear/data/m1/liner_plastic.rvmat
+++ b/braf_factions_characters_headgear/data/m1/liner_plastic.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_NOHQ.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_NOHQ.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\liner_plastic_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/m1/m1.rvmat b/braf_factions_characters_headgear/data/m1/m1.rvmat
index a541493..f9561db 100644
--- a/braf_factions_characters_headgear/data/m1/m1.rvmat
+++ b/braf_factions_characters_headgear/data/m1/m1.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\m1_NOHQ.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\m1_NOHQ.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\m1_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\m1_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\m1\m1_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\m1\m1_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/orlite/orlite.rvmat b/braf_factions_characters_headgear/data/orlite/orlite.rvmat
index d959033..f3ccc68 100644
--- a/braf_factions_characters_headgear/data/orlite/orlite.rvmat
+++ b/braf_factions_characters_headgear/data/orlite/orlite.rvmat
@@ -8,7 +8,7 @@ PixelShaderID="Super";
 VertexShaderID="Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\orlite\orlite_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\orlite\orlite_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\orlite\orlite_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\orlite\orlite_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\orlite\orlite_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\orlite\orlite_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/patrol_cap/cloth.rvmat b/braf_factions_characters_headgear/data/patrol_cap/cloth.rvmat
index 547878b..9c586f0 100644
--- a/braf_factions_characters_headgear/data/patrol_cap/cloth.rvmat
+++ b/braf_factions_characters_headgear/data/patrol_cap/cloth.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -44,7 +44,7 @@ class Stage3
 };
 class Stage4
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_as.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_as.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\patrol_cap\camo_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_characters_headgear/data/patrol_cap/details.rvmat b/braf_factions_characters_headgear/data/patrol_cap/details.rvmat
index 0a39b18..6875bf8 100644
--- a/braf_factions_characters_headgear/data/patrol_cap/details.rvmat
+++ b/braf_factions_characters_headgear/data/patrol_cap/details.rvmat
@@ -8,7 +8,7 @@ PixelShaderID = "Super";
 VertexShaderID = "Super";
 class Stage1
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\patrol_cap\details_nohq.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\patrol_cap\details_nohq.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
@@ -56,7 +56,7 @@ class Stage4
 };
 class Stage5
 {
-	texture = "Braf_factions\braf_factions_characters_headgear\data\patrol_cap\details_smdi.paa";
+	texture = "braf_factions\braf_factions_characters_headgear\data\patrol_cap\details_smdi.paa";
 	uvSource = "tex";
 	class uvTransform
 	{
diff --git a/braf_factions_soft/AM11_base.hpp b/braf_factions_soft/AM11_base.hpp
index a70e43e..a0a36ba 100644
--- a/braf_factions_soft/AM11_base.hpp
+++ b/braf_factions_soft/AM11_base.hpp
@@ -1,9 +1,9 @@
-class Braf_AM11_Unarmed_HIAF : braf_am11_unarmed {
-    _generalMacro = "Braf_AM11_Unarmed_HIAF";
+class braf_AM11_Unarmed_HIAF : braf_am11_unarmed {
+    _generalMacro = "braf_AM11_Unarmed_HIAF";
     displayName = "AM-11 VTL-REC";
     faction = "BRAF_HIAF";
     side = 1;
-    editorPreview = "\BRAF_Factions\braf_factions_soft\data\am11\ui\Braf_AM11_Unarmed_HIAF.jpg";
+    editorPreview = "\BRAF_Factions\braf_factions_soft\data\am11\ui\braf_AM11_Unarmed_HIAF.jpg";
     crew = "braf_hiaf_rifleman_regular";
     hiddenSelectionsTextures[] = {
         "BRAF_Factions\braf_factions_soft\data\am11\HIAF1_co.paa",
@@ -26,18 +26,18 @@ class Braf_AM11_Unarmed_HIAF : braf_am11_unarmed {
         };
     };
 };
-class Braf_AM11_Unarmed_MAR : Braf_AM11_Unarmed_HIAF {
-    _generalMacro = "Braf_AM11_Unarmed_MAR";
+class braf_AM11_Unarmed_MAR : braf_AM11_Unarmed_HIAF {
+    _generalMacro = "braf_AM11_Unarmed_MAR";
     displayName = "AM-11 VTL-REC Marines";
     side = 1;
-    editorPreview = "\BRAF_Factions\braf_factions_soft\data\am11\ui\Braf_AM11_Unarmed_MAR.jpg";
+    editorPreview = "\BRAF_Factions\braf_factions_soft\data\am11\ui\braf_AM11_Unarmed_MAR.jpg";
     crew = "braf_hiaf_rifleman_marine";
     hiddenSelectionsTextures[] = {
         "BRAF_Factions\braf_factions_soft\data\am11\HIAF_M1_co.paa",
         "BRAF_Factions\braf_factions_soft\data\am11\HIAF_M2_co.paa"
     };
 };
-class BRAF_AM11_Armed_HIAF : Braf_AM11_Armed {
+class BRAF_AM11_Armed_HIAF : braf_AM11_Armed {
     _generalMacro = "BRAF_AM11_Armed_HIAF";
     displayName = "AM-11 VTL-REC Armed";
     faction = "BRAF_HIAF";
diff --git a/braf_factions_soft/AM21_base.hpp b/braf_factions_soft/AM21_base.hpp
index 5d59ac1..ffd4d8f 100644
--- a/braf_factions_soft/AM21_base.hpp
+++ b/braf_factions_soft/AM21_base.hpp
@@ -1,4 +1,4 @@
-class braf_am21_hiaf : Braf_AM21_Covered {
+class braf_am21_hiaf : braf_AM21_Covered {
     _generalMacro = "braf_am21_hiaf";
     faction = "BRAF_HIAF";
     editorPreview = "BRAF_Factions\braf_factions_soft\data\am21\ui\braf_am21_hiaf.jpg";
@@ -36,7 +36,7 @@ class braf_am21_hiafm : braf_am21_hiaf {
         "BRAF_Factions\braf_factions_soft\data\am21\HIAF_M2_co.paa"
     };
 };
-class braf_am21_opened_hiaf : Braf_AM21_Opened {
+class braf_am21_opened_hiaf : braf_AM21_Opened {
     _generalMacro = "braf_am21_opened_hiaf";
     faction = "BRAF_HIAF";
     editorPreview = "BRAF_Factions\braf_factions_soft\data\am21\ui\braf_am21_opened_hiaf.jpg";
@@ -75,7 +75,7 @@ class braf_am21_opened_hiafm : braf_am21_opened_hiaf {
         "BRAF_Factions\braf_factions_soft\data\am21\HIAF_M2_co.paa"
     };
 };
-class braf_am21_cargo_hiaf : Braf_AM21_Cargo {
+class braf_am21_cargo_hiaf : braf_AM21_Cargo {
     _generalMacro = "braf_am21_cargo_hiaf";
     faction = "BRAF_HIAF";
     editorPreview = "BRAF_Factions\braf_factions_soft\data\am21\ui\braf_am21_opened_hiaf.jpg";
diff --git a/braf_factions_soft/Worker_base.hpp b/braf_factions_soft/Worker_base.hpp
index 86a605b..b27961f 100644
--- a/braf_factions_soft/Worker_base.hpp
+++ b/braf_factions_soft/Worker_base.hpp
@@ -1,5 +1,5 @@
-class braf_worker_covered_hiaf : Braf_Worker_Covered {
-    _generalMacro = "Braf_Worker_Covered_HIAF";
+class braf_worker_covered_hiaf : braf_Worker_Covered {
+    _generalMacro = "braf_Worker_Covered_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_covered_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
@@ -10,8 +10,8 @@ class braf_worker_covered_hiaf : Braf_Worker_Covered {
         "BRAF_Factions\braf_factions_soft\data\worker\HIAF3_co.paa"
     };
 };
-class braf_worker_health_hiaf : Braf_Worker_Health {
-    _generalMacro = "Braf_Worker_Health_HIAF";
+class braf_worker_health_hiaf : braf_Worker_Health {
+    _generalMacro = "braf_Worker_Health_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_health_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
@@ -22,8 +22,8 @@ class braf_worker_health_hiaf : Braf_Worker_Health {
         "BRAF_Factions\braf_factions_soft\data\worker\HIAF3_Health_co.paa"
     };
 };
-class braf_worker_fuel_hiaf : Braf_Worker_Fuel {
-    _generalMacro = "Braf_Worker_Fuel_HIAF";
+class braf_worker_fuel_hiaf : braf_Worker_Fuel {
+    _generalMacro = "braf_Worker_Fuel_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_fuel_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
@@ -34,8 +34,8 @@ class braf_worker_fuel_hiaf : Braf_Worker_Fuel {
         "BRAF_Factions\braf_factions_soft\data\worker\HIAF3_Fuel_co.paa"
     };
 };
-class braf_worker_ammo_hiaf : Braf_Worker_Ammo {
-    _generalMacro = "Braf_Worker_Ammo_HIAF";
+class braf_worker_ammo_hiaf : braf_Worker_Ammo {
+    _generalMacro = "braf_Worker_Ammo_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_ammo_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
@@ -46,8 +46,8 @@ class braf_worker_ammo_hiaf : Braf_Worker_Ammo {
         "BRAF_Factions\braf_factions_soft\data\worker\HIAF3_Ammo_co.paa"
     };
 };
-class braf_worker_repair_hiaf : Braf_Worker_Repair {
-    _generalMacro = "Braf_Worker_Repair_HIAF";
+class braf_worker_repair_hiaf : braf_Worker_Repair {
+    _generalMacro = "braf_Worker_Repair_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_repair_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
@@ -58,8 +58,8 @@ class braf_worker_repair_hiaf : Braf_Worker_Repair {
         "BRAF_Factions\braf_factions_soft\data\worker\HIAF3_co.paa"
     };
 };
-class braf_worker_cargo_hiaf : Braf_Worker_Cargo {
-    _generalMacro = "Braf_Worker_Cargo_HIAF";
+class braf_worker_cargo_hiaf : braf_Worker_Cargo {
+    _generalMacro = "braf_Worker_Cargo_HIAF";
     editorPreview = "\BRAF_Factions\braf_factions_soft\data\worker\ui\braf_worker_cargo_hiaf.jpg";
     faction = "BRAF_HIAF";
     side = 1;
diff --git a/braf_factions_soft/config.cpp b/braf_factions_soft/config.cpp
index 488ac32..0751c0c 100644
--- a/braf_factions_soft/config.cpp
+++ b/braf_factions_soft/config.cpp
@@ -15,14 +15,14 @@ class CfgPatches {
             "BRAF_Worker_Repair_HIAF",
             "BRAF_Worker_Cargo_HIAF",
             // AM11
-            "Braf_AM11_Unarmed_HIAF",
-            "Braf_AM11_Unarmed_MAR",
+            "braf_AM11_Unarmed_HIAF",
+            "braf_AM11_Unarmed_MAR",
             "BRAF_AM11_Armed_HIAF",
             "BRAF_AM11_Armed_MAR",
             // AM21
-            "Braf_AM21_Covered",
-            "Braf_AM21_Opened",
-            "Braf_AM21_Cargo"
+            "braf_AM21_Covered",
+            "braf_AM21_Opened",
+            "braf_AM21_Cargo"
         };
         weapons[] = {};
     };
@@ -37,13 +37,13 @@ class CfgVehicles {
     class BRAF_Worker_Cargo;
     #include "Worker_base.hpp"
 
-    class Braf_AM21_Covered;
-    class Braf_AM21_Opened;
-    class Braf_AM21_Cargo;
+    class braf_AM21_Covered;
+    class braf_AM21_Opened;
+    class braf_AM21_Cargo;
     #include "AM21_base.hpp"
 
-    class Braf_AM11_Unarmed;
-    class Braf_AM11_Armed;
+    class braf_AM11_Unarmed;
+    class braf_AM11_Armed;
     #include "AM11_base.hpp"
 
     #include "v_cratenia.hpp"
diff --git a/braf_factions_weapons/308_MSR/308_MSR.hpp b/braf_factions_weapons/308_MSR/308_MSR.hpp
index 89f6f49..e7503f7 100644
--- a/braf_factions_weapons/308_MSR/308_MSR.hpp
+++ b/braf_factions_weapons/308_MSR/308_MSR.hpp
@@ -1,7 +1,7 @@
-class Braf_msr_308;
-class Braf_factions_msr_308_spray: Braf_msr_308
+class braf_msr_308;
+class braf_factions_msr_308_spray: braf_msr_308
 {
-	_generalMacro="Braf_msr_308_spray";
+	_generalMacro="braf_factions_msr_308_spray";
 	author="BRAF Team";
 	displayName="Remington MSR .308 (Spray)";
 	picture="\braf_factions\braf_factions_weapons\308_MSR\ui\msr_308_ui_spray.paa";
@@ -10,9 +10,9 @@ class Braf_factions_msr_308_spray: Braf_msr_308
 		"braf_factions\braf_factions_weapons\308_MSR\data\MSRSPRAY_CO.paa"
 	};
 };
-class Braf_factions_msr_308_ts: Braf_msr_308
+class braf_factions_msr_308_ts: braf_msr_308
 {
-	_generalMacro="Braf_msr_308_ts";
+	_generalMacro="braf_factions_msr_308_ts";
 	author="BRAF Team";
 	displayName="Remington MSR .308 (TS)";
 	picture="\braf_factions\braf_factions_weapons\308_MSR\ui\msr_308_ui_ts.paa";
diff --git a/braf_factions_weapons/338_MSR/338_MSR.hpp b/braf_factions_weapons/338_MSR/338_MSR.hpp
index 91889bb..c4b5323 100644
--- a/braf_factions_weapons/338_MSR/338_MSR.hpp
+++ b/braf_factions_weapons/338_MSR/338_MSR.hpp
@@ -1,7 +1,7 @@
-class Braf_msr_338;
-class Braf_factions_msr_338_spray: Braf_msr_338
+class braf_msr_338;
+class braf_factions_msr_338_spray: braf_msr_338
 {
-	_generalMacro="Braf_msr_308_spray";
+	_generalMacro="braf_msr_308_spray";
 	author="BRAF Team";
 	displayName="Remington MSR .338 (Spray)";
 	picture="\braf_factions\braf_factions_weapons\308_MSR\ui\msr_308_ui_spray.paa";
@@ -10,9 +10,9 @@ class Braf_factions_msr_338_spray: Braf_msr_338
 		"braf_factions\braf_factions_weapons\308_MSR\data\MSRSPRAY_CO.paa"
 	};
 };
-class Braf_factions_msr_338_ts: Braf_msr_338
+class braf_factions_msr_338_ts: braf_msr_338
 {
-	_generalMacro="Braf_msr_308_ts";
+	_generalMacro="braf_msr_308_ts";
 	author="BRAF Team";
 	displayName="Remington MSR .338 (TS)";
 	picture="\braf_factions\braf_factions_weapons\308_MSR\ui\msr_308_ui_ts.paa";
diff --git a/braf_factions_weapons/556_Colt/556_Colt.hpp b/braf_factions_weapons/556_Colt/556_Colt.hpp
index 4ccd001..b29e8f7 100644
--- a/braf_factions_weapons/556_Colt/556_Colt.hpp
+++ b/braf_factions_weapons/556_Colt/556_Colt.hpp
@@ -1,6 +1,6 @@
-class Braf_lmga4;
-class Braf_factions_colt_lmga4_aaf : Braf_lmga4 {
-    _generalMacro = "Braf_lmga4_aaf";
+class braf_lmga4;
+class braf_factions_colt_lmga4_aaf : braf_lmga4 {
+    _generalMacro = "braf_lmga4_aaf";
 	author="BRAF Team";
     displayName = "Colt LMGA4 5.56mm (AAF)";
     hiddenSelections[] = { "camo1", "camo2", "camo3" };
@@ -10,8 +10,8 @@ class Braf_factions_colt_lmga4_aaf : Braf_lmga4 {
         "braf_factions\braf_factions_weapons\556_Colt\data\aaf\AR15_LMG_CO.paa"
     };
 };
-class Braf_factions_colt_lmga4_green : Braf_lmga4 {
-    _generalMacro = "Braf_lmga4_green";
+class braf_factions_colt_lmga4_green : braf_lmga4 {
+    _generalMacro = "braf_lmga4_green";
 	author="BRAF Team";
     displayName = "Colt LMGA4 5.56mm (Green)";
     hiddenSelections[] = { "camo1", "camo2", "camo3" };
diff --git a/braf_factions_weapons/556_LAPA/556_LAPA.hpp b/braf_factions_weapons/556_LAPA/556_LAPA.hpp
index 56e7cb6..8fb245c 100644
--- a/braf_factions_weapons/556_LAPA/556_LAPA.hpp
+++ b/braf_factions_weapons/556_LAPA/556_LAPA.hpp
@@ -1,7 +1,7 @@
-class Braf_Lapa;
-class braf_factions_lapa_tan: Braf_Lapa
+class braf_Lapa;
+class braf_factions_lapa_tan: braf_Lapa
 {
-	_generalMacro="Braf_Lapa_tan";
+	_generalMacro="braf_Lapa_tan";
 	author="BRAF Team";
 	displayName="LAPA FA-03 5.56mm (Tan)";
 	picture="\braf_factions\braf_factions_weapons\556_LAPA\ui\lapa_fa03_ui_snaketan.paa";
@@ -10,9 +10,9 @@ class braf_factions_lapa_tan: Braf_Lapa
 		"braf_factions\braf_factions_weapons\556_LAPA\data\lapa_fa03_snaketan_CO.paa"
 	};
 };
-class braf_factions_lapa_Green: Braf_Lapa
+class braf_factions_lapa_green: braf_Lapa
 {
-	_generalMacro="Braf_Lapa_Green";
+	_generalMacro="braf_Lapa_Green";
 	author="BRAF Team";
 	displayName="LAPA FA-03 5.56mm (Green)";
 	picture="\braf_factions\braf_factions_weapons\556_LAPA\ui\lapa_fa03_ui_green.paa";
@@ -21,9 +21,9 @@ class braf_factions_lapa_Green: Braf_Lapa
 		"braf_factions\braf_factions_weapons\556_LAPA\data\lapa_fa03_green_CO.paa"
 	};
 };
-class braf_factions_lapa_Desert: Braf_Lapa
+class braf_factions_lapa_Desert: braf_Lapa
 {
-	_generalMacro="Braf_Lapa_Desert";
+	_generalMacro="braf_Lapa_Desert";
 	author="BRAF Team";
 	displayName="LAPA FA-03 5.56mm (Desert)";
 	picture="\braf_factions\braf_factions_weapons\556_LAPA\ui\lapa_fa03_ui_desert.paa";
diff --git a/braf_factions_weapons/762_FAL/762_FAL.hpp b/braf_factions_weapons/762_FAL/762_FAL.hpp
index 48d29b9..707847a 100644
--- a/braf_factions_weapons/762_FAL/762_FAL.hpp
+++ b/braf_factions_weapons/762_FAL/762_FAL.hpp
@@ -1,7 +1,7 @@
-class Braf_Fal;
-class braf_factions_fal_hiaf : Braf_Fal
+class braf_Fal;
+class braf_factions_fal_hiaf : braf_Fal
 {
-	_generalMacro="Braf_md1_hiaf";
+	_generalMacro="braf_md1_hiaf";
 	author="BRAF Team";
 	displayName="IMBEL M964 FAL 7.62mm (Green)";
 	picture="\braf_factions\braf_factions_weapons\762_FAL\ui\MD1_ui.paa";
@@ -24,7 +24,7 @@ class braf_factions_fal_hiaf_scope: braf_factions_fal_hiaf
 {
 	scope = 1;
 	author="BRAF Team";
-	_generalMacro="Braf_Fal_hiaf_Scope";
+	_generalMacro="braf_Fal_hiaf_Scope";
 	class LinkedItems
 	{
 		class LinkedItemsOptic
diff --git a/braf_factions_weapons/762_MD1/762_MD1.hpp b/braf_factions_weapons/762_MD1/762_MD1.hpp
index 9bc1023..02ed6cc 100644
--- a/braf_factions_weapons/762_MD1/762_MD1.hpp
+++ b/braf_factions_weapons/762_MD1/762_MD1.hpp
@@ -1,7 +1,7 @@
 class braf_md1;
 class braf_factions_md1_hiaf: braf_md1
 {
-	_generalMacro="Braf_md1_hiaf";
+	_generalMacro="braf_factions_md1_hiaf";
 	author="BRAF Team";
 	scope=2;
 	displayName="IMBEL M964 MD1 7.62mm (Green)";
@@ -25,7 +25,7 @@ class braf_factions_md1_hiaf: braf_md1
 };
 class braf_factions_md1_hiaf_scope : braf_factions_md1_hiaf
 {
-	_generalMacro="Braf_md1_hiaf_Scope";
+	_generalMacro="braf_factions_md1_hiaf_scope";
 	author="BRAF Team";
 	class LinkedItems
 	{
diff --git a/braf_factions_weapons/config.cpp b/braf_factions_weapons/config.cpp
index 3dd0c81..74208f2 100644
--- a/braf_factions_weapons/config.cpp
+++ b/braf_factions_weapons/config.cpp
@@ -8,17 +8,24 @@ class CfgPatches
             "braf_factions_aglc_aaf",
             "braf_factions_aglc_verde_scope",
             "braf_factions_aglc_aaf_scope",
-            "Braf_factions_msr_308_spray",
-            "Braf_factions_msr_308_ts",
-            "Braf_factions_msr_338_spray",
-            "Braf_factions_msr_338_ts",
-            "Braf_factions_colt_lmga4_aaf",
-            "Braf_factions_colt_lmga4_green",
+            "braf_factions_msr_308_spray",
+            "braf_factions_msr_308_ts",
+            "braf_factions_msr_338_spray",
+            "braf_factions_msr_338_ts",
+            "braf_factions_colt_lmga4_aaf",
+            "braf_factions_colt_lmga4_green",
+            "braf_factions_lapa_tan",
+            "braf_factions_lapa_green",
             "braf_factions_fal_hiaf",
-            "braf_factions_fal_hiaf_scope"};
+            "braf_factions_fal_hiaf_scope",
+        };
 
         requiredVersion = 0.1;
-        requiredAddons[] = {"braf_weap"};
+        requiredAddons[] = {
+            "braf_weapons_assault_rifles",
+            "braf_weapons_sniper_rifles",
+            "braf_weapons_sound",
+        };
     };
 };