diff --git a/addons/advanced_fatigue/initSettings.sqf b/addons/advanced_fatigue/initSettings.sqf
index fa90aa9a4b..7787fd3f5d 100644
--- a/addons/advanced_fatigue/initSettings.sqf
+++ b/addons/advanced_fatigue/initSettings.sqf
@@ -13,7 +13,7 @@
         [QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)
     },
     true // Needs mission restart
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableStaminaBar),
@@ -28,7 +28,7 @@
             _staminaBarContainer ctrlCommit 0;
         };
     }
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fadeStaminaBar),
@@ -43,7 +43,7 @@
             _staminaBarContainer ctrlCommit 0;
         };
     }
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(performanceFactor),
@@ -52,7 +52,7 @@
     LSTRING(DisplayName),
     [0, 5, 1, 1],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(recoveryFactor),
@@ -61,7 +61,7 @@
     LSTRING(DisplayName),
     [0, 5, 1, 1],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(loadFactor),
@@ -70,7 +70,7 @@
     LSTRING(DisplayName),
     [0, 5, 1, 1],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(terrainGradientFactor),
@@ -79,7 +79,7 @@
     LSTRING(DisplayName),
     [0, 5, 1, 1],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(swayFactor),
@@ -88,4 +88,4 @@
     LSTRING(DisplayName),
     [0, 5, 1, 1],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/arsenal/XEH_preInit.sqf b/addons/arsenal/XEH_preInit.sqf
index 1aebf5040f..3fb6a7817c 100644
--- a/addons/arsenal/XEH_preInit.sqf
+++ b/addons/arsenal/XEH_preInit.sqf
@@ -8,15 +8,15 @@ PREP_RECOMPILE_START;
 PREP_RECOMPILE_END;
 
 // Arsenal
-[QGVAR(camInverted), "CHECKBOX", localize LSTRING(invertCameraSetting), localize LSTRING(settingCategory), false] call CBA_Settings_fnc_init;
-[QGVAR(enableModIcons), "CHECKBOX", [LSTRING(modIconsSetting), LSTRING(modIconsTooltip)], localize LSTRING(settingCategory), true] call CBA_Settings_fnc_init;
-[QGVAR(fontHeight), "SLIDER", [LSTRING(fontHeightSetting), LSTRING(fontHeightTooltip)], localize LSTRING(settingCategory), [1, 10, 4.5, 1]] call CBA_Settings_fnc_init;
-[QGVAR(enableIdentityTabs), "CHECKBOX", localize LSTRING(enableIdentityTabsSettings), localize LSTRING(settingCategory), true, true] call CBA_Settings_fnc_init;
+[QGVAR(camInverted), "CHECKBOX", localize LSTRING(invertCameraSetting), localize LSTRING(settingCategory), false] call CBA_fnc_addSetting;
+[QGVAR(enableModIcons), "CHECKBOX", [LSTRING(modIconsSetting), LSTRING(modIconsTooltip)], localize LSTRING(settingCategory), true] call CBA_fnc_addSetting;
+[QGVAR(fontHeight), "SLIDER", [LSTRING(fontHeightSetting), LSTRING(fontHeightTooltip)], localize LSTRING(settingCategory), [1, 10, 4.5, 1]] call CBA_fnc_addSetting;
+[QGVAR(enableIdentityTabs), "CHECKBOX", localize LSTRING(enableIdentityTabsSettings), localize LSTRING(settingCategory), true, true] call CBA_fnc_addSetting;
 
 // Arsenal loadouts
-[QGVAR(allowDefaultLoadouts), "CHECKBOX", [LSTRING(allowDefaultLoadoutsSetting), LSTRING(defaultLoadoutsTooltip)], localize LSTRING(settingCategory), true, true] call CBA_Settings_fnc_init;
-[QGVAR(allowSharedLoadouts), "CHECKBOX", localize LSTRING(allowSharingSetting), localize LSTRING(settingCategory), true, true] call CBA_Settings_fnc_init;
-[QGVAR(EnableRPTLog), "CHECKBOX", [LSTRING(printToRPTSetting), LSTRING(printToRPTTooltip)], localize LSTRING(settingCategory), false, false] call CBA_Settings_fnc_init;
+[QGVAR(allowDefaultLoadouts), "CHECKBOX", [LSTRING(allowDefaultLoadoutsSetting), LSTRING(defaultLoadoutsTooltip)], localize LSTRING(settingCategory), true, true] call CBA_fnc_addSetting;
+[QGVAR(allowSharedLoadouts), "CHECKBOX", localize LSTRING(allowSharingSetting), localize LSTRING(settingCategory), true, true] call CBA_fnc_addSetting;
+[QGVAR(EnableRPTLog), "CHECKBOX", [LSTRING(printToRPTSetting), LSTRING(printToRPTTooltip)], localize LSTRING(settingCategory), false, false] call CBA_fnc_addSetting;
 
 [QGVAR(statsToggle), {
     params ["_display", "_showStats"];
diff --git a/addons/artillerytables/initSettings.sqf b/addons/artillerytables/initSettings.sqf
index c578901e2e..0a909ae41b 100644
--- a/addons/artillerytables/initSettings.sqf
+++ b/addons/artillerytables/initSettings.sqf
@@ -10,7 +10,7 @@ private _categoryName = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"
     true, // isGlobal
     {[QGVAR(advancedCorrections), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(disableArtilleryComputer), "CHECKBOX",
@@ -20,4 +20,4 @@ private _categoryName = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"
     true, // isGlobal
     {[QGVAR(disableArtilleryComputer), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/cargo/initSettings.sqf b/addons/cargo/initSettings.sqf
index cbf0a121e5..83bc2d6b31 100644
--- a/addons/cargo/initSettings.sqf
+++ b/addons/cargo/initSettings.sqf
@@ -5,7 +5,7 @@
     true,
     true,
     {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(loadTimeCoefficient), "SLIDER",
@@ -14,7 +14,7 @@
     [0, 10, 5, 1],
     true,
     {[QGVAR(loadTimeCoefficient), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(paradropTimeCoefficent), "SLIDER",
@@ -23,4 +23,4 @@
     [0, 10, 2.5, 1],
     true,
     {[QGVAR(paradropTimeCoefficent), _this, true] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/common/functions/fnc_cbaSettings_convertHelper.sqf b/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
index 8c892bcf13..b2b23eec91 100644
--- a/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
+++ b/addons/common/functions/fnc_cbaSettings_convertHelper.sqf
@@ -123,7 +123,7 @@ private _settings = configProperties [configFile >> "ACE_Settings", "(isClass _x
         _output pushBack format ["    {[""%1"", _this] call ace_common_fnc_cbaSettings_settingChanged},", _varName];
     };
     _output pushBack format ["    %1 // Needs mission restart", _warnIfChangedMidMission];
-    _output pushBack "] call CBA_settings_fnc_init;";
+    _output pushBack "] call CBA_fnc_addSetting;";
 } forEach _settings;
 
 copyToClipboard (_output joinString endl);
diff --git a/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf b/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf
index 7f6637f622..d6ded9969e 100644
--- a/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf
+++ b/addons/common/functions/fnc_cbaSettings_loadFromConfig.sqf
@@ -98,7 +98,7 @@ private _code = compile format ['["%1", _this] call FUNC(cbaSettings_settingChan
 
 TRACE_2("setting",_cbaSettingType,_cbaValueInfo);
 TRACE_4("",_isForced,_cbaIsGlobal,_category,_cbaValueInfo);
-private _return = [_varName, _cbaSettingType, [_localizedName, _localizedDescription], _category, _cbaValueInfo, _cbaIsGlobal, _code, _warnIfChangedMidMission] call CBA_settings_fnc_init;
+private _return = [_varName, _cbaSettingType, [_localizedName, _localizedDescription], _category, _cbaValueInfo, _cbaIsGlobal, _code, _warnIfChangedMidMission] call CBA_fnc_addSetting;
 TRACE_1("returned",_return);
 if ((isNil "_return") || {_return != 0}) then {ERROR_1("Setting [%1] - CBA Error",_varName);};
 _return
diff --git a/addons/common/initSettings.sqf b/addons/common/initSettings.sqf
index fcaa242ac3..7546256d1b 100644
--- a/addons/common/initSettings.sqf
+++ b/addons/common/initSettings.sqf
@@ -6,7 +6,7 @@
     false,
     false,
     LINKFUNC(switchPersistentLaser)
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowFadeMusic),
@@ -15,4 +15,4 @@
     localize LSTRING(ACEKeybindCategoryCommon),
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/cookoff/initSettings.sqf b/addons/cookoff/initSettings.sqf
index ce510a299d..42a4ac3397 100644
--- a/addons/cookoff/initSettings.sqf
+++ b/addons/cookoff/initSettings.sqf
@@ -8,7 +8,7 @@
     true, // isGlobal
     {[QGVAR(enable), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableAmmobox), "CHECKBOX",
@@ -18,7 +18,7 @@
     true, // isGlobal
     {[QGVAR(enableAmmobox), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableAmmoCookoff), "CHECKBOX",
@@ -28,7 +28,7 @@
     true, // isGlobal
     {[QGVAR(enableAmmoCookoff), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(ammoCookoffDuration), "SLIDER",
@@ -38,7 +38,7 @@
     true, // isGlobal
     {[QGVAR(ammoCookoffDuration), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(probabilityCoef), "SLIDER",
@@ -48,4 +48,4 @@
     true, // isGlobal
     {[QGVAR(probabilityCoef), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/csw/initSettings.sqf b/addons/csw/initSettings.sqf
index 28397a6e9b..10030b68da 100644
--- a/addons/csw/initSettings.sqf
+++ b/addons/csw/initSettings.sqf
@@ -10,7 +10,7 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     true, // isGlobal
     {[QGVAR(defaultAssemblyMode), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(handleExtraMagazines), "CHECKBOX",
@@ -20,7 +20,7 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     true, // isGlobal
     {[QGVAR(handleExtraMagazines), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(ammoHandling), "LIST",
@@ -30,7 +30,7 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     true, // isGlobal
     {[QGVAR(ammoHandling), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(progressBarTimeCoefficent), "SLIDER",
@@ -40,7 +40,7 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     true, // isGlobal
     {[QGVAR(progressBarTimeCoefficent), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(dragAfterDeploy), "CHECKBOX",
@@ -50,4 +50,4 @@ private _categoryArray = [format ["ACE %1", localize LSTRING(DisplayName)]];
     false, // isGlobal
     {[QGVAR(dragAfterDeploy), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/fastroping/initSettings.sqf b/addons/fastroping/initSettings.sqf
index eac47639c6..5888f49aa2 100644
--- a/addons/fastroping/initSettings.sqf
+++ b/addons/fastroping/initSettings.sqf
@@ -10,4 +10,4 @@ private _category = ["ACE Uncategorized", LLSTRING(setting_categoryMenu_displayN
     true, // isGlobal
     {[QGVAR(requireRopeItems), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // needRestart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/interact_menu/initSettings.sqf b/addons/interact_menu/initSettings.sqf
index 6b58196f07..f9395f69e6 100644
--- a/addons/interact_menu/initSettings.sqf
+++ b/addons/interact_menu/initSettings.sqf
@@ -6,7 +6,7 @@
     [1, 0, 0],
     false,
     {GVAR(selectorColorHex) = _this call BIS_fnc_colorRGBtoHTML} // Stored in Hex to avoid constant conversion
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(consolidateSingleChild),
@@ -23,7 +23,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LLSTRING(Category_InteractionMenu)],
     false,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(cursorKeepCentered),
@@ -32,7 +32,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LLSTRING(Category_InteractionMenu)],
     false,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(useListMenu),
@@ -41,7 +41,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LLSTRING(Category_InteractionMenu)],
     false,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(menuBackground),
@@ -50,7 +50,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LLSTRING(Category_InteractionMenu)],
     [[0, 1, 2], ["STR_A3_OPTIONS_DISABLED", LLSTRING(backgroundBlur), LLSTRING(backgroundBlack)], 0],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(alwaysUseCursorSelfInteraction),
@@ -59,7 +59,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LELSTRING(Interaction,InteractionMenuSelf)],
     true,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(cursorKeepCenteredSelfInteraction),
@@ -68,7 +68,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LELSTRING(Interaction,InteractionMenuSelf)],
     false,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(useListMenuSelf),
@@ -77,7 +77,7 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LELSTRING(Interaction,InteractionMenuSelf)],
     false,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(menuBackgroundSelf),
@@ -86,4 +86,4 @@
     [format ["ACE %1", LLSTRING(Category_InteractionMenu)], LELSTRING(Interaction,InteractionMenuSelf)],
     [[0, 1, 2], ["STR_A3_OPTIONS_DISABLED", LLSTRING(backgroundBlur), LLSTRING(backgroundBlack)], 0],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf
index 35d1cca4bb..b7bd72efca 100644
--- a/addons/markers/initSettings.sqf
+++ b/addons/markers/initSettings.sqf
@@ -23,7 +23,7 @@ private _categoryName = format ["ACE %1", localize ELSTRING(map,Module_DisplayNa
         ],
         1
     ]
-] call cba_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(timestampEnabled), "CHECKBOX",
diff --git a/addons/medical/initSettings.sqf b/addons/medical/initSettings.sqf
index 065314fcf9..3c54f47cee 100644
--- a/addons/medical/initSettings.sqf
+++ b/addons/medical/initSettings.sqf
@@ -7,7 +7,7 @@
     true,
     {},
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fractures),
@@ -18,7 +18,7 @@
     true,
     {},
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fractureChance),
@@ -27,7 +27,7 @@
     LSTRING(Category),
     [0, 1, 0.8, 2, true],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(spontaneousWakeUpChance),
@@ -36,7 +36,7 @@
     LSTRING(Category),
     [0, 1, 0.05, 2, true],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(spontaneousWakeUpEpinephrineBoost),
@@ -45,4 +45,4 @@
     LSTRING(Category),
     [1, 30, 1, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_ai/initSettings.sqf b/addons/medical_ai/initSettings.sqf
index 6fada00db5..7d583382d7 100644
--- a/addons/medical_ai/initSettings.sqf
+++ b/addons/medical_ai/initSettings.sqf
@@ -14,4 +14,4 @@ private _categoryArray = [ELSTRING(medical,Category), "STR_TEAM_SWITCH_AI"];
     true, // isGlobal
     {[QGVAR(enabledFor), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_blood/initSettings.sqf b/addons/medical_blood/initSettings.sqf
index c2c52f93b8..c4ad57d4d7 100644
--- a/addons/medical_blood/initSettings.sqf
+++ b/addons/medical_blood/initSettings.sqf
@@ -6,7 +6,7 @@
     [[BLOOD_DISABLED, BLOOD_ONLY_PLAYERS, BLOOD_ENABLED], [ELSTRING(Common,Disabled), LSTRING(OnlyPlayers), ELSTRING(Common,Enabled)], 2],
     true,
     LINKFUNC(init)
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(maxBloodObjects),
@@ -15,7 +15,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[50, 100, 200, 300, 400, 500, 1000, 2000, 3000, 4000, 5000], [/* settings function will auto create names */], 5],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(bloodLifetime),
@@ -24,4 +24,4 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [1, 3600, 900],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_damage/initSettings.sqf b/addons/medical_damage/initSettings.sqf
index 9f606169b5..12806a46a2 100644
--- a/addons/medical_damage/initSettings.sqf
+++ b/addons/medical_damage/initSettings.sqf
@@ -5,7 +5,7 @@
     [ELSTRING(medical,Category)],
     [[0, 1, 2], [LSTRING(fatalDamageSource_vitalShotsOnly), LSTRING(fatalDamageSource_trauma), LSTRING(fatalDamageSource_both)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QEGVAR(medical,playerDamageThreshold),
@@ -14,7 +14,7 @@
     ELSTRING(medical,Category),
     [0, 25, 1, 2],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QEGVAR(medical,AIDamageThreshold),
@@ -23,7 +23,7 @@
     ELSTRING(medical,Category),
     [0, 25, 1, 2],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QEGVAR(medical,painUnconsciousChance),
@@ -32,4 +32,4 @@
     ELSTRING(medical,Category),
     [0, 1, 0.1, 2, true],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_gui/initSettings.sqf b/addons/medical_gui/initSettings.sqf
index e61dd647b2..c2a4831d8a 100644
--- a/addons/medical_gui/initSettings.sqf
+++ b/addons/medical_gui/initSettings.sqf
@@ -5,7 +5,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[0, 1, 2], [LSTRING(Selections3D), LSTRING(Radial), ELSTRING(common,Disabled)], 0],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableSelfActions),
@@ -14,7 +14,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableMedicalMenu),
@@ -23,7 +23,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), ELSTRING(common,VehiclesOnly)], 1],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(openAfterTreatment),
@@ -32,7 +32,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(maxDistance),
@@ -41,7 +41,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 10, 3, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(interactionMenuShowTriage),
@@ -50,4 +50,4 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(Medical_Treatment,Anyone), ELSTRING(Medical_Treatment,Medics)], 1],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_statemachine/initSettings.sqf b/addons/medical_statemachine/initSettings.sqf
index 75d93f19b2..c129223931 100644
--- a/addons/medical_statemachine/initSettings.sqf
+++ b/addons/medical_statemachine/initSettings.sqf
@@ -9,7 +9,7 @@
         0
     ],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fatalInjuriesAI),
@@ -22,7 +22,7 @@
         0
     ],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(AIUnconsciousness),
@@ -31,7 +31,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(cardiacArrestTime),
@@ -40,7 +40,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [1, 3600, 300],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(cardiacArrestBleedoutEnabled),
@@ -49,4 +49,4 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_status/initSettings.sqf b/addons/medical_status/initSettings.sqf
index 95231b0acc..743c55cc00 100644
--- a/addons/medical_status/initSettings.sqf
+++ b/addons/medical_status/initSettings.sqf
@@ -5,7 +5,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 25, 1, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QEGVAR(medical,painCoefficient),
@@ -14,7 +14,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 25, 1, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QEGVAR(medical,ivFlowRate),
@@ -23,4 +23,4 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory)],
     [0, 25, 1, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/medical_treatment/initSettings.sqf b/addons/medical_treatment/initSettings.sqf
index 54a83453e4..b7b559594b 100644
--- a/addons/medical_treatment/initSettings.sqf
+++ b/addons/medical_treatment/initSettings.sqf
@@ -5,7 +5,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(advancedMedication),
@@ -14,7 +14,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(advancedBandages),
@@ -23,7 +23,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [ELSTRING(common,Disabled), ELSTRING(common,Enabled), LSTRING(AdvancedBandages_EnabledCanReopen)], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(woundReopenChance),
@@ -32,7 +32,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0, 5, 1, 2],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(clearTraumaAfterBandage),
@@ -41,7 +41,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     false,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 // todo: should this setting differentiate between medical vehicles and facilities?
 [
@@ -51,7 +51,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     false,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowSharedEquipment),
@@ -60,7 +60,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [LSTRING(AllowSharedEquipment_PriorityPatient), LSTRING(AllowSharedEquipment_PriorityMedic), ELSTRING(common,No)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(convertItems),
@@ -69,7 +69,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [ELSTRING(common,Enabled), LSTRING(ConvertItems_RemoveOnly), ELSTRING(common,Disabled)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeAutoinjector),
@@ -78,7 +78,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 5, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeTourniquet),
@@ -87,7 +87,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 7, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeSplint),
@@ -96,7 +96,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 7, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeBodyBag),
@@ -105,7 +105,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 15, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(medicEpinephrine),
@@ -114,7 +114,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(locationEpinephrine),
@@ -123,7 +123,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(medicPAK),
@@ -132,7 +132,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(locationPAK),
@@ -141,7 +141,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 3],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(consumePAK),
@@ -150,7 +150,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowSelfPAK),
@@ -159,7 +159,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(timeCoefficientPAK),
@@ -168,7 +168,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0, 5, 1, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(medicSurgicalKit),
@@ -177,7 +177,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(locationSurgicalKit),
@@ -186,7 +186,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2, 3, 4], [ELSTRING(common,Anywhere), ELSTRING(common,Vehicle), LSTRING(MedicalFacilities), LSTRING(VehiclesAndFacilities), ELSTRING(common,Disabled)], 2],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(consumeSurgicalKit),
@@ -195,7 +195,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowSelfStitch),
@@ -204,7 +204,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(woundStitchTime),
@@ -213,7 +213,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 5, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(medicIV),
@@ -222,7 +222,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2], [LSTRING(Anyone), LSTRING(Medics), LSTRING(Doctors)], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowSelfIV),
@@ -231,7 +231,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1], [ELSTRING(common,No), ELSTRING(common,Yes)], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeIV),
@@ -240,7 +240,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 12, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(cprSuccessChance),
@@ -249,7 +249,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0, 1, 0.4, 2, true],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(treatmentTimeCPR),
@@ -258,7 +258,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [0.1, 60, 15, 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowBodyBagUnconscious),
@@ -267,7 +267,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     false,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(holsterRequired),
@@ -276,7 +276,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Treatment)],
     [[0, 1, 2, 3, 4], [ELSTRING(common,Disabled), LSTRING(HolsterRequired_Lowered), LSTRING(HolsterRequired_LoweredExam), LSTRING(HolsterRequired_Holstered), LSTRING(HolsterRequired_HolsteredExam)], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowLitterCreation),
@@ -285,7 +285,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(maxLitterObjects),
@@ -294,7 +294,7 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
     [[50, 100, 200, 300, 400, 500, 1000, 2000, 3000, 4000, 5000], [/* settings function will auto create names */], 5],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(litterCleanupDelay),
@@ -303,4 +303,4 @@
     [ELSTRING(medical,Category), LSTRING(SubCategory_Litter)],
     [-1, 3600, 600, 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/microdagr/initSettings.sqf b/addons/microdagr/initSettings.sqf
index 5138637645..85614c9821 100644
--- a/addons/microdagr/initSettings.sqf
+++ b/addons/microdagr/initSettings.sqf
@@ -8,7 +8,7 @@
     true, // isGlobal
     {[QGVAR(mapDataAvailable), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // require mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(waypointPrecision), "LIST",
@@ -18,4 +18,4 @@
     true, // isGlobal
     {[QGVAR(waypointPrecision), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // require mission restart
-] call cba_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/mk6mortar/initSettings.sqf b/addons/mk6mortar/initSettings.sqf
index 1e48575b97..1b22600cbe 100644
--- a/addons/mk6mortar/initSettings.sqf
+++ b/addons/mk6mortar/initSettings.sqf
@@ -11,7 +11,7 @@ private _category = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"], l
     true, // isGlobal
     {[QGVAR(airResistanceEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowComputerRangefinder), "CHECKBOX",
@@ -21,7 +21,7 @@ private _category = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"], l
     true, // isGlobal
     {[QGVAR(allowComputerRangefinder), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowCompass), "CHECKBOX",
@@ -31,7 +31,7 @@ private _category = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"], l
     true, // isGlobal
     {[QGVAR(allowCompass), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(useAmmoHandling), "CHECKBOX",
@@ -41,4 +41,4 @@ private _category = [format ["ACE %1", localize "str_a3_cfgmarkers_nato_art"], l
     true, // isGlobal
     {[QGVAR(useAmmoHandling), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/nametags/initSettings.sqf b/addons/nametags/initSettings.sqf
index b2cf482ce1..edabaa002f 100644
--- a/addons/nametags/initSettings.sqf
+++ b/addons/nametags/initSettings.sqf
@@ -7,7 +7,7 @@
     [0.77, 0.51, 0.08, 1],
     false, // isGlobal
     {[QGVAR(defaultNametagColor), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(nametagColorMain), "COLOR",
@@ -16,7 +16,7 @@
     [1.00, 1.00, 1.00, 1],
     false, // isGlobal
     {[QGVAR(nametagColorMain), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(nametagColorRed), "COLOR",
@@ -25,7 +25,7 @@
     [1.00, 0.67, 0.67, 1],
     false, // isGlobal
     {[QGVAR(nametagColorRed), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(nametagColorGreen), "COLOR",
@@ -34,7 +34,7 @@
     [0.67, 1.00, 0.67, 1],
     false, // isGlobal
     {[QGVAR(nametagColorGreen), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(nametagColorBlue), "COLOR",
@@ -43,7 +43,7 @@
     [0.67, 0.67, 1.00, 1],
     false, // isGlobal
     {[QGVAR(nametagColorBlue), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(nametagColorYellow),
@@ -53,4 +53,4 @@
     [1.00, 1.00, 0.67, 1],
     false, // isGlobal
     {[QGVAR(nametagColorYellow), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/nightvision/initSettings.sqf b/addons/nightvision/initSettings.sqf
index 9ccf2cc7f9..1a42c74863 100644
--- a/addons/nightvision/initSettings.sqf
+++ b/addons/nightvision/initSettings.sqf
@@ -44,14 +44,14 @@
             };
         };
     }
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 [
     QGVAR(fogScaling), "SLIDER",
     [LSTRING(fogScaling_DisplayName), LSTRING(fogScaling_Description)],
     localize LSTRING(Category),
     [0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(noiseScaling), "SLIDER",
@@ -59,7 +59,7 @@
     localize LSTRING(Category),
     [0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(aimDownSightsBlur), "SLIDER",
@@ -67,7 +67,7 @@
     localize LSTRING(Category),
     [0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(disableNVGsWithSights), "CHECKBOX",
@@ -75,7 +75,7 @@
     localize LSTRING(Category),
     false, // default value
     true // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(shutterEffects), "CHECKBOX",
@@ -83,4 +83,4 @@
     localize LSTRING(Category),
     true, // default value
     false // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/noradio/XEH_preInit.sqf b/addons/noradio/XEH_preInit.sqf
index 61492aa36d..48463b70ef 100644
--- a/addons/noradio/XEH_preInit.sqf
+++ b/addons/noradio/XEH_preInit.sqf
@@ -36,4 +36,4 @@ if (hasInterface) then {
         [ACE_player, "isPlayer"] call EFUNC(common,unmuteUnit);
     };
 }, true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/parachute/XEH_preInit.sqf b/addons/parachute/XEH_preInit.sqf
index 5a10c0bd83..b01263d60b 100644
--- a/addons/parachute/XEH_preInit.sqf
+++ b/addons/parachute/XEH_preInit.sqf
@@ -16,6 +16,6 @@ PREP_RECOMPILE_END;
     true,
     false,
     {[QGVAR(hideAltimeter), _this, false] call EFUNC(common,cbaSettings_settingChanged)}
-] call cba_settings_fnc_init; 
+] call CBA_fnc_addSetting;
 
 ADDON = true;
diff --git a/addons/pylons/initSettings.sqf b/addons/pylons/initSettings.sqf
index 57a2a79efb..70b158957f 100644
--- a/addons/pylons/initSettings.sqf
+++ b/addons/pylons/initSettings.sqf
@@ -5,7 +5,7 @@
     LSTRING(Category_Pylons),
     [true],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enabledForZeus),
@@ -14,7 +14,7 @@
     LSTRING(Category_Pylons),
     [true],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(rearmNewPylons),
@@ -23,7 +23,7 @@
     LSTRING(Category_Pylons),
     [false],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(requireEngineer),
@@ -32,7 +32,7 @@
     LSTRING(Category_Pylons),
     [false],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(requireToolkit),
@@ -41,7 +41,7 @@
     LSTRING(Category_Pylons),
     [true],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(searchDistance),
@@ -54,7 +54,7 @@
         params ["_searchDistance"];
         GVAR(searchDistanceSqr) = _searchDistance ^ 2;
     }
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(timePerPylon),
@@ -63,4 +63,4 @@
     LSTRING(Category_Pylons),
     [1, 10, 5, 0],
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/quickmount/initSettings.sqf b/addons/quickmount/initSettings.sqf
index 742a45cb7e..88fa78bd64 100644
--- a/addons/quickmount/initSettings.sqf
+++ b/addons/quickmount/initSettings.sqf
@@ -5,7 +5,7 @@
     format ["ACE %1", LLSTRING(Category)],
     true,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(distance),
@@ -14,7 +14,7 @@
     format ["ACE %1", LLSTRING(Category)],
     [0, 10, DEFAULT_DISTANCE, 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(speed),
@@ -23,7 +23,7 @@
     format ["ACE %1", LLSTRING(Category)],
     [0, 30, DEFAULT_SPEED, 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(priority),
@@ -32,7 +32,7 @@
     format ["ACE %1", LLSTRING(Category)],
     [[0, 1, 2, 3], ["str_getin_pos_driver", "str_getin_pos_gunn", "str_getin_pos_comm", "str_getin_pos_passenger"], DEFAULT_PRIORITY],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableMenu),
@@ -49,4 +49,4 @@
         ],
         3
     ]
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/rearm/initSettings.sqf b/addons/rearm/initSettings.sqf
index 3cac2fead7..08494ae582 100644
--- a/addons/rearm/initSettings.sqf
+++ b/addons/rearm/initSettings.sqf
@@ -7,7 +7,7 @@
     [[0,1,2],[LSTRING(RearmSettings_vehicle), LSTRING(RearmSettings_magazine), LSTRING(RearmSettings_caliber)],0], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(level), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(supply), "LIST",
@@ -16,7 +16,7 @@
     [[0,1,2],[LSTRING(RearmSettings_unlimited), LSTRING(RearmSettings_limited), LSTRING(RearmSettings_magazineSupply)],0], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(distance), "SLIDER",
@@ -25,4 +25,4 @@
     [10, 50, 20, 0],
     true, // isGlobal
     {[QGVAR(supply), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/refuel/initSettings.sqf b/addons/refuel/initSettings.sqf
index b16cff3230..deb6c2adee 100644
--- a/addons/refuel/initSettings.sqf
+++ b/addons/refuel/initSettings.sqf
@@ -7,7 +7,7 @@
     [0,25,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true, // isGlobal
     {[QGVAR(rate), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(hoseLength), "SLIDER",
@@ -16,4 +16,4 @@
     [0,50,12,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true, // isGlobal
     {[QGVAR(hoseLength), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/repair/initSettings.sqf b/addons/repair/initSettings.sqf
index 38e9e19e97..2e64f01208 100644
--- a/addons/repair/initSettings.sqf
+++ b/addons/repair/initSettings.sqf
@@ -5,7 +5,7 @@
     true, // default value
     false, // isGlobal
     {[QGVAR(displayTextOnRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(engineerSetting_repair), "LIST",
@@ -14,7 +14,7 @@
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],1], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(engineerSetting_repair), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(engineerSetting_wheel), "LIST",
@@ -23,7 +23,7 @@
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],0], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(engineerSetting_wheel), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(repairDamageThreshold), "SLIDER",
@@ -32,7 +32,7 @@
     [0,1,0.6,2], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true, // isGlobal
     {[QGVAR(repairDamageThreshold), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(repairDamageThreshold_engineer), "SLIDER",
@@ -41,7 +41,7 @@
     [0,1,0.4,2], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true, // isGlobal
     {[QGVAR(repairDamageThreshold_engineer), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(consumeItem_toolKit), "LIST", // fnc_repair expects number
@@ -50,7 +50,7 @@
     [[0,1],[ELSTRING(common,No), ELSTRING(common,Yes)],0], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(consumeItem_toolKit), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fullRepairLocation), "LIST",
@@ -59,7 +59,7 @@
     [[0,1,2,3,4],[LSTRING(useAnywhere), LSTRING(repairVehicleOnly), LSTRING(repairFacilityOnly), LSTRING(vehicleAndFacility), ELSTRING(common,Disabled)],2], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(fullRepairLocation), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(engineerSetting_fullRepair), "LIST",
@@ -68,7 +68,7 @@
     [[0,1,2],[LSTRING(engineerSetting_anyone), LSTRING(engineerSetting_EngineerOnly), LSTRING(engineerSetting_AdvancedOnly)],2], // [values, titles, defaultIndex]
     true, // isGlobal
     {[QGVAR(engineerSetting_fullRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(addSpareParts), "CHECKBOX",
@@ -78,7 +78,7 @@
     true, // isGlobal
     {[QGVAR(addSpareParts), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(wheelRepairRequiredItems),
@@ -87,7 +87,7 @@
     [localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_repair"],
     [[[], ["ToolKit"]], ["STR_A3_None", "STR_A3_CfgWeapons_Toolkit0"], 0],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(miscRepairRequiredItems),
@@ -96,7 +96,7 @@
     [localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_repair"],
     [[[], ["ToolKit"]], ["STR_A3_None", "STR_A3_CfgWeapons_Toolkit0"], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(fullRepairRequiredItems),
@@ -105,7 +105,7 @@
     [localize ELSTRING(OptionsMenu,CategoryLogistics), localize "str_state_repair"],
     [[[], ["ToolKit"]], ["STR_A3_None", "STR_A3_CfgWeapons_Toolkit0"], 1],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(autoShutOffEngineWhenStartingRepair), "CHECKBOX",
@@ -114,4 +114,4 @@
     false, // default value
     true, // isGlobal
     {[QGVAR(autoShutOffEngineWhenStartingRepair), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/spectator/initSettings.sqf b/addons/spectator/initSettings.sqf
index c970fe77c7..6663d5a908 100644
--- a/addons/spectator/initSettings.sqf
+++ b/addons/spectator/initSettings.sqf
@@ -5,7 +5,7 @@
     LSTRING(Settings_DisplayName),
     false,
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(restrictModes),
@@ -16,7 +16,7 @@
     true,
     {},
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(restrictVisions),
@@ -27,7 +27,7 @@
     true,
     {},
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(maxFollowDistance),
@@ -36,4 +36,4 @@
     LSTRING(Settings_DisplayName),
     [5, 25, 5, 1],
     false
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/tagging/initSettings.sqf b/addons/tagging/initSettings.sqf
index c5d0fbfa42..72672032ff 100644
--- a/addons/tagging/initSettings.sqf
+++ b/addons/tagging/initSettings.sqf
@@ -6,4 +6,4 @@
     false, // isGlobal
     {[QGVAR(quickTag), _this] call EFUNC(common,cbaSettings_settingChanged)},
     false // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/vehiclelock/initSettings.sqf b/addons/vehiclelock/initSettings.sqf
index 30de8a692c..6c71d6b24f 100644
--- a/addons/vehiclelock/initSettings.sqf
+++ b/addons/vehiclelock/initSettings.sqf
@@ -7,7 +7,7 @@
     [-1,60,10,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
     true, // isGlobal
     {[QGVAR(defaultLockpickStrength), _this] call EFUNC(common,cbaSettings_settingChanged)}
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(lockVehicleInventory), "CHECKBOX",
@@ -17,7 +17,7 @@
     true, // isGlobal
     {[QGVAR(lockVehicleInventory), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(vehicleStartingLockState), "LIST",
@@ -27,4 +27,4 @@
     true, // isGlobal
     {[QGVAR(vehicleStartingLockState), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/weaponselect/initSettings.sqf b/addons/weaponselect/initSettings.sqf
index d4fc725783..b39251d0b8 100644
--- a/addons/weaponselect/initSettings.sqf
+++ b/addons/weaponselect/initSettings.sqf
@@ -5,4 +5,4 @@
 localize ELSTRING(common,ACEKeybindCategoryWeapons),
 true, // default value
 false, // isGlobal
-{[QGVAR(displayText), _this] call EFUNC(common,cbaSettings_settingChanged)}] call CBA_settings_fnc_init;
+{[QGVAR(displayText), _this] call EFUNC(common,cbaSettings_settingChanged)}] call CBA_fnc_addSetting;
diff --git a/addons/weather/initSettings.sqf b/addons/weather/initSettings.sqf
index 00aa324db0..fb11e31e75 100644
--- a/addons/weather/initSettings.sqf
+++ b/addons/weather/initSettings.sqf
@@ -8,7 +8,7 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
     true, // isGlobal
     {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(updateInterval), "SLIDER",
@@ -18,7 +18,7 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
     true, // isGlobal
     {[QGVAR(updateInterval), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(windSimulation), "CHECKBOX",
@@ -28,7 +28,7 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
     true, // isGlobal
     {[QGVAR(windSimulation), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(showCheckAirTemperature), "CHECKBOX",
@@ -36,4 +36,4 @@ private _category = [format ["ACE %1", LLSTRING(Module_DisplayName)]];
     _category,
     true, // default value
     false // isGlobal
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;
diff --git a/addons/zeus/initSettings.sqf b/addons/zeus/initSettings.sqf
index 1db3fe5205..a9645b5917 100644
--- a/addons/zeus/initSettings.sqf
+++ b/addons/zeus/initSettings.sqf
@@ -19,4 +19,4 @@
         0
     ],
     true
-] call CBA_settings_fnc_init;
+] call CBA_fnc_addSetting;