diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp
index 2d5854d86f..c58aab607e 100644
--- a/addons/dragging/config.cpp
+++ b/addons/dragging/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common","ace_interaction","ace_interact_menu"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"Garth 'L-H' de Wet","commy2"};
         authorUrl = "https://github.com/commy2/";
         VERSION_CONFIG;
diff --git a/addons/fcs/config.cpp b/addons/fcs/config.cpp
index 20ae063c70..711cbbbd25 100644
--- a/addons/fcs/config.cpp
+++ b/addons/fcs/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {ace_common, ace_interaction};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"KoffeinFlummi","BadGuy (simon84)","commy2"};
         authorUrl = "https://github.com/KoffeinFlummi/";
         VERSION_CONFIG;
diff --git a/addons/frag/config.cpp b/addons/frag/config.cpp
index d4fa788e97..4c1fb71e15 100644
--- a/addons/frag/config.cpp
+++ b/addons/frag/config.cpp
@@ -4,7 +4,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = { "A3_Misc_F", "A3_Weapons_F" };
+        requiredAddons[] = {"ace_common"};
         author[] = {"Nou"};
         VERSION_CONFIG;
     };
diff --git a/addons/hearing/config.cpp b/addons/hearing/config.cpp
index b822204484..6aab92b9bf 100644
--- a/addons/hearing/config.cpp
+++ b/addons/hearing/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {"ACE_EarPlugs"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"KoffeinFlummi", "esteldunedain", "HopeJ", "commy2"};
         authorUrl = "https://github.com/KoffeinFlummi/";
         VERSION_CONFIG;
diff --git a/addons/kestrel/config.cpp b/addons/kestrel/config.cpp
index b79dcd5825..bece90dd8d 100644
--- a/addons/kestrel/config.cpp
+++ b/addons/kestrel/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {"ACE_Item_Kestrel"};
         weapons[] = {"ACE_Kestrel"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common","ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"Falke","commy2","KoffeinFlummi","esteldunedain"};
         authorUrl = "https://github.com/KoffeinFlummi/";
         VERSION_CONFIG;
diff --git a/addons/laser_selfdesignate/config.cpp b/addons/laser_selfdesignate/config.cpp
index ff9c269989..33c31ba7e5 100644
--- a/addons/laser_selfdesignate/config.cpp
+++ b/addons/laser_selfdesignate/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_interaction", "ace_laser"};
+        requiredAddons[] = {"ace_laser"};
         version = VERSION;
     };
 };
diff --git a/addons/logistics_uavbattery/config.cpp b/addons/logistics_uavbattery/config.cpp
index 32d8c49978..c6123e590f 100644
--- a/addons/logistics_uavbattery/config.cpp
+++ b/addons/logistics_uavbattery/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {"ACE_UAVBattery"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"marc_book"};
         authorUrl = "";
         VERSION_CONFIG;
diff --git a/addons/logistics_wirecutter/config.cpp b/addons/logistics_wirecutter/config.cpp
index 27d4467ccf..6e1db15061 100644
--- a/addons/logistics_wirecutter/config.cpp
+++ b/addons/logistics_wirecutter/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_interact_menu"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"gpgpgpgp", "PabstMirror"};
         authorUrl = "";
         VERSION_CONFIG;
diff --git a/addons/map/config.cpp b/addons/map/config.cpp
index cb3cbc8d6d..e13c3c7e09 100644
--- a/addons/map/config.cpp
+++ b/addons/map/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"KoffeinFlummi","Rocko","esteldunedain"};
         authorUrl = "https://github.com/KoffeinFlummi/";
         VERSION_CONFIG;
diff --git a/addons/maptools/config.cpp b/addons/maptools/config.cpp
index 6ccf874e69..ab11fdceec 100644
--- a/addons/maptools/config.cpp
+++ b/addons/maptools/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {"ACE_MapTools"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"esteldunedain"};
         authorUrl = "https://github.com/esteldunedain/";
         VERSION_CONFIG;
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index a5f00bbeed..4dca8bdeca 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {"ACE_medicalSupplyCrate", "ACE_fieldDressingItem", "ACE_packingBandageItem", "ACE_elasticBandageItem", "ACE_tourniquetItem", "ACE_morphineItem", "ACE_atropineItem", "ACE_epinephrineItem", "ACE_plasmaIVItem", "ACE_bloodIVItem", "ACE_salineIVItem", "ACE_quikclotItem", "ACE_personalAidKitItem", "ACE_surgicalKitItem", "ACE_bodyBagItem", "ACE_bodyBagObject"};
         weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {ace_common, ace_interaction, ace_modules};
+        requiredAddons[] = {"ace_interaction","ace_modules"};
         author[] = {"Glowbal", "KoffienFlummi"};
         authorUrl = "";
         VERSION_CONFIG;
diff --git a/addons/missileguidance/config.cpp b/addons/missileguidance/config.cpp
index 9c5842a065..0341a56df6 100644
--- a/addons/missileguidance/config.cpp
+++ b/addons/missileguidance/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = { "ace_common", "ace_laser" };
+        requiredAddons[] = {"ace_laser"};
         VERSION_CONFIG;
     };
 };
diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp
index 42c970b1e9..e67703e147 100644
--- a/addons/nametags/config.cpp
+++ b/addons/nametags/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = { "ace_main", "ace_common", "ace_interaction" };
+        requiredAddons[] = {"ace_interaction"};
         author[] = { "commy2", "esteldunedain" };
         authorUrl = "https://github.com/commy2/";
         VERSION_CONFIG;
diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp
index 1d932d1f51..3ccc8ee603 100644
--- a/addons/overheating/config.cpp
+++ b/addons/overheating/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {"ACE_SpareBarrel"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_interaction"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {"commy2", "KoffeinFlummi", "esteldunedain"};
         authorUrl = "https://github.com/commy2/";
         VERSION_CONFIG;
diff --git a/addons/reloadlaunchers/config.cpp b/addons/reloadlaunchers/config.cpp
index a039ef87c4..3a66b39719 100644
--- a/addons/reloadlaunchers/config.cpp
+++ b/addons/reloadlaunchers/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common","ace_interaction","ace_interact_menu"};
+        requiredAddons[] = {"ace_interaction"};
         author[] = {""};
         authorUrl = "";
         VERSION_CONFIG;
diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp
index c400be855c..cda974d17e 100644
--- a/addons/switchunits/config.cpp
+++ b/addons/switchunits/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {};
     requiredVersion = REQUIRED_VERSION;
-    requiredAddons[] = {"ace_main", "ace_common"};
+    requiredAddons[] = {"ace_common"};
     author[] = {"bux578"};
     authorUrl = "https://github.com/bux578/";
     VERSION_CONFIG;
diff --git a/addons/switchunits/script_component.hpp b/addons/switchunits/script_component.hpp
index 4e76fb1495..5955e1220f 100644
--- a/addons/switchunits/script_component.hpp
+++ b/addons/switchunits/script_component.hpp
@@ -1,4 +1,4 @@
-#define COMPONENT SwitchUnits
+#define COMPONENT switchunits
 #include "\z\ace\addons\main\script_mod.hpp"
 
 #ifdef DEBUG_ENABLED_SWITCHUNITS
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 700e27b3cb..248a1e7ca0 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
     units[] = {};
     weapons[] = {};
     requiredVersion = REQUIRED_VERSION;
-    requiredAddons[] = {"ace_common", "ace_interaction"};
+    requiredAddons[] = {"ace_interaction"};
     author[] = {"PabstMirror"};
     authorUrl = "https://github.com/PabstMirror/";
     VERSION_CONFIG;
diff --git a/addons/wep_javelin/config.cpp b/addons/wep_javelin/config.cpp
index 3cc607f0bd..c7ea1c867a 100644
--- a/addons/wep_javelin/config.cpp
+++ b/addons/wep_javelin/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = { "ace_main", "ace_common", "ace_laser" };
+        requiredAddons[] = {"ace_laser"};
         VERSION_CONFIG;
     };
 };
diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp
index 3d342d50fe..f515640f12 100644
--- a/addons/winddeflection/config.cpp
+++ b/addons/winddeflection/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ACE_common", "ACE_weather"};
+        requiredAddons[] = {"ace_weather"};
         versionDesc = "ACE Wind Deflection";
         version = VERSION;
         author[] = {$STR_ACE_Common_ACETeam, "Glowbal", "Ruthberg"};