diff --git a/addons/advanced_throwing/$PBOPREFIX$ b/addons/advanced_throwing/$PBOPREFIX$
new file mode 100644
index 0000000000..86b2999fb3
--- /dev/null
+++ b/addons/advanced_throwing/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\advanced_throwing
diff --git a/addons/advancedthrowing/ACE_Settings.hpp b/addons/advanced_throwing/ACE_Settings.hpp
similarity index 100%
rename from addons/advancedthrowing/ACE_Settings.hpp
rename to addons/advanced_throwing/ACE_Settings.hpp
diff --git a/addons/advancedthrowing/CfgEventHandlers.hpp b/addons/advanced_throwing/CfgEventHandlers.hpp
similarity index 100%
rename from addons/advancedthrowing/CfgEventHandlers.hpp
rename to addons/advanced_throwing/CfgEventHandlers.hpp
diff --git a/addons/advancedthrowing/CfgVehicles.hpp b/addons/advanced_throwing/CfgVehicles.hpp
similarity index 100%
rename from addons/advancedthrowing/CfgVehicles.hpp
rename to addons/advanced_throwing/CfgVehicles.hpp
diff --git a/addons/advancedthrowing/README.md b/addons/advanced_throwing/README.md
similarity index 91%
rename from addons/advancedthrowing/README.md
rename to addons/advanced_throwing/README.md
index 3e6ac7f063..eea1c6e395 100644
--- a/addons/advancedthrowing/README.md
+++ b/addons/advanced_throwing/README.md
@@ -1,4 +1,4 @@
-ace_advancedthrowing
+ace_advanced_throwing
 ===================
 
 Integrates advanced throwing by [Dslyecxi](https://github.com/dslyecxi).
diff --git a/addons/advancedthrowing/UI/Icon_Module_AdvancedThrowing_ca.paa b/addons/advanced_throwing/UI/Icon_Module_AdvancedThrowing_ca.paa
similarity index 100%
rename from addons/advancedthrowing/UI/Icon_Module_AdvancedThrowing_ca.paa
rename to addons/advanced_throwing/UI/Icon_Module_AdvancedThrowing_ca.paa
diff --git a/addons/advancedthrowing/XEH_PREP.hpp b/addons/advanced_throwing/XEH_PREP.hpp
similarity index 100%
rename from addons/advancedthrowing/XEH_PREP.hpp
rename to addons/advanced_throwing/XEH_PREP.hpp
diff --git a/addons/advancedthrowing/XEH_postInitClient.sqf b/addons/advanced_throwing/XEH_postInitClient.sqf
similarity index 100%
rename from addons/advancedthrowing/XEH_postInitClient.sqf
rename to addons/advanced_throwing/XEH_postInitClient.sqf
diff --git a/addons/advancedthrowing/XEH_preInit.sqf b/addons/advanced_throwing/XEH_preInit.sqf
similarity index 100%
rename from addons/advancedthrowing/XEH_preInit.sqf
rename to addons/advanced_throwing/XEH_preInit.sqf
diff --git a/addons/advancedthrowing/XEH_preStart.sqf b/addons/advanced_throwing/XEH_preStart.sqf
similarity index 100%
rename from addons/advancedthrowing/XEH_preStart.sqf
rename to addons/advanced_throwing/XEH_preStart.sqf
diff --git a/addons/advancedthrowing/config.cpp b/addons/advanced_throwing/config.cpp
similarity index 100%
rename from addons/advancedthrowing/config.cpp
rename to addons/advanced_throwing/config.cpp
diff --git a/addons/advancedthrowing/functions/fnc_canPrepare.sqf b/addons/advanced_throwing/functions/fnc_canPrepare.sqf
similarity index 93%
rename from addons/advancedthrowing/functions/fnc_canPrepare.sqf
rename to addons/advanced_throwing/functions/fnc_canPrepare.sqf
index ab6b336da7..396fd7ea5c 100644
--- a/addons/advancedthrowing/functions/fnc_canPrepare.sqf
+++ b/addons/advanced_throwing/functions/fnc_canPrepare.sqf
@@ -9,7 +9,7 @@
  * Can Prepare <BOOL>
  *
  * Example:
- * [unit] call ace_advancedthrowing_fnc_canPrepare
+ * [unit] call ace_advanced_throwing_fnc_canPrepare
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_canThrow.sqf b/addons/advanced_throwing/functions/fnc_canThrow.sqf
similarity index 93%
rename from addons/advancedthrowing/functions/fnc_canThrow.sqf
rename to addons/advanced_throwing/functions/fnc_canThrow.sqf
index c0e742546d..1f5ef20d45 100644
--- a/addons/advancedthrowing/functions/fnc_canThrow.sqf
+++ b/addons/advanced_throwing/functions/fnc_canThrow.sqf
@@ -9,7 +9,7 @@
  * Can Throw <BOOL>
  *
  * Example:
- * [unit] call ace_advancedthrowing_fnc_canThrow
+ * [unit] call ace_advanced_throwing_fnc_canThrow
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_drawArc.sqf b/addons/advanced_throwing/functions/fnc_drawArc.sqf
similarity index 98%
rename from addons/advancedthrowing/functions/fnc_drawArc.sqf
rename to addons/advanced_throwing/functions/fnc_drawArc.sqf
index 616be9671b..53398f7b2f 100644
--- a/addons/advancedthrowing/functions/fnc_drawArc.sqf
+++ b/addons/advanced_throwing/functions/fnc_drawArc.sqf
@@ -9,7 +9,7 @@
  * Flight path (just for debug) <ARRAY>
  *
  * Example:
- * call ace_advancedthrowing_fnc_drawArc
+ * call ace_advanced_throwing_fnc_drawArc
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_drawThrowable.sqf b/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
similarity index 99%
rename from addons/advancedthrowing/functions/fnc_drawThrowable.sqf
rename to addons/advanced_throwing/functions/fnc_drawThrowable.sqf
index 570b021c39..14fbb567d2 100644
--- a/addons/advancedthrowing/functions/fnc_drawThrowable.sqf
+++ b/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * call ace_advancedthrowing_fnc_drawThrowable
+ * call ace_advanced_throwing_fnc_drawThrowable
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_exitThrowMode.sqf b/addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
similarity index 95%
rename from addons/advancedthrowing/functions/fnc_exitThrowMode.sqf
rename to addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
index 51bfc22499..fd6cb7b998 100644
--- a/addons/advancedthrowing/functions/fnc_exitThrowMode.sqf
+++ b/addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [unit, "reason"] call ace_advancedthrowing_fnc_exitThrowMode
+ * [unit, "reason"] call ace_advanced_throwing_fnc_exitThrowMode
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_getMuzzle.sqf b/addons/advanced_throwing/functions/fnc_getMuzzle.sqf
similarity index 91%
rename from addons/advancedthrowing/functions/fnc_getMuzzle.sqf
rename to addons/advanced_throwing/functions/fnc_getMuzzle.sqf
index 7724e48ed4..030ec25ccb 100644
--- a/addons/advancedthrowing/functions/fnc_getMuzzle.sqf
+++ b/addons/advanced_throwing/functions/fnc_getMuzzle.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * "magazine" call ace_advancedthrowing_fnc_getMuzzle
+ * "magazine" call ace_advanced_throwing_fnc_getMuzzle
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_moduleInit.sqf b/addons/advanced_throwing/functions/fnc_moduleInit.sqf
similarity index 92%
rename from addons/advancedthrowing/functions/fnc_moduleInit.sqf
rename to addons/advanced_throwing/functions/fnc_moduleInit.sqf
index d20dd62192..2130319067 100644
--- a/addons/advancedthrowing/functions/fnc_moduleInit.sqf
+++ b/addons/advanced_throwing/functions/fnc_moduleInit.sqf
@@ -11,7 +11,7 @@
  * None
  *
  * Example:
- * [logic, [unit1, unit2], true] call ace_advancedthrowing_fnc_moduleInit
+ * [logic, [unit1, unit2], true] call ace_advanced_throwing_fnc_moduleInit
  *
  * Public:
  * No
diff --git a/addons/advancedthrowing/functions/fnc_onKeyDown.sqf b/addons/advanced_throwing/functions/fnc_onKeyDown.sqf
similarity index 92%
rename from addons/advancedthrowing/functions/fnc_onKeyDown.sqf
rename to addons/advanced_throwing/functions/fnc_onKeyDown.sqf
index 81aabb5c5b..42fab8fc1a 100644
--- a/addons/advancedthrowing/functions/fnc_onKeyDown.sqf
+++ b/addons/advanced_throwing/functions/fnc_onKeyDown.sqf
@@ -13,7 +13,7 @@
  * None
  *
  * Example:
- * [control, 5, false, true, false] call ace_advancedthrowing_fnc_onKeyDown
+ * [control, 5, false, true, false] call ace_advanced_throwing_fnc_onKeyDown
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_onMouseButtonDown.sqf b/addons/advanced_throwing/functions/fnc_onMouseButtonDown.sqf
similarity index 95%
rename from addons/advancedthrowing/functions/fnc_onMouseButtonDown.sqf
rename to addons/advanced_throwing/functions/fnc_onMouseButtonDown.sqf
index b999fc287a..e13ed52290 100644
--- a/addons/advancedthrowing/functions/fnc_onMouseButtonDown.sqf
+++ b/addons/advanced_throwing/functions/fnc_onMouseButtonDown.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * [] call ace_advancedthrowing_fnc_onMouseButtonDown
+ * [] call ace_advanced_throwing_fnc_onMouseButtonDown
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_onMouseScroll.sqf b/addons/advanced_throwing/functions/fnc_onMouseScroll.sqf
similarity index 96%
rename from addons/advancedthrowing/functions/fnc_onMouseScroll.sqf
rename to addons/advanced_throwing/functions/fnc_onMouseScroll.sqf
index 1a15a07f76..b06d198380 100644
--- a/addons/advancedthrowing/functions/fnc_onMouseScroll.sqf
+++ b/addons/advanced_throwing/functions/fnc_onMouseScroll.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * [] call ace_advancedthrowing_fnc_onMouseScroll
+ * [] call ace_advanced_throwing_fnc_onMouseScroll
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_pickUp.sqf b/addons/advanced_throwing/functions/fnc_pickUp.sqf
similarity index 97%
rename from addons/advancedthrowing/functions/fnc_pickUp.sqf
rename to addons/advanced_throwing/functions/fnc_pickUp.sqf
index 631b230fb5..2238ea1893 100644
--- a/addons/advancedthrowing/functions/fnc_pickUp.sqf
+++ b/addons/advanced_throwing/functions/fnc_pickUp.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [helper, player] call ace_advancedthrowing_fnc_pickUp
+ * [helper, player] call ace_advanced_throwing_fnc_pickUp
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_prepare.sqf b/addons/advanced_throwing/functions/fnc_prepare.sqf
similarity index 96%
rename from addons/advancedthrowing/functions/fnc_prepare.sqf
rename to addons/advanced_throwing/functions/fnc_prepare.sqf
index ae91978aff..b9e75ea480 100644
--- a/addons/advancedthrowing/functions/fnc_prepare.sqf
+++ b/addons/advanced_throwing/functions/fnc_prepare.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * [unit] call ace_advancedthrowing_fnc_prepare
+ * [unit] call ace_advanced_throwing_fnc_prepare
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_prime.sqf b/addons/advanced_throwing/functions/fnc_prime.sqf
similarity index 97%
rename from addons/advancedthrowing/functions/fnc_prime.sqf
rename to addons/advanced_throwing/functions/fnc_prime.sqf
index f20fee6221..84a3b0465a 100644
--- a/addons/advancedthrowing/functions/fnc_prime.sqf
+++ b/addons/advanced_throwing/functions/fnc_prime.sqf
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [unit] call ace_advancedthrowing_fnc_prime
+ * [unit] call ace_advanced_throwing_fnc_prime
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_renderPickUpInteraction.sqf b/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
similarity index 97%
rename from addons/advancedthrowing/functions/fnc_renderPickUpInteraction.sqf
rename to addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
index 118b415e76..7e9e5486dc 100644
--- a/addons/advancedthrowing/functions/fnc_renderPickUpInteraction.sqf
+++ b/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
@@ -10,7 +10,7 @@
  * Nothing
  *
  * Example:
- * call ace_advancedthrowing_fnc_renderPickUpInteraction
+ * call ace_advanced_throwing_fnc_renderPickUpInteraction
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_throw.sqf b/addons/advanced_throwing/functions/fnc_throw.sqf
similarity index 98%
rename from addons/advancedthrowing/functions/fnc_throw.sqf
rename to addons/advanced_throwing/functions/fnc_throw.sqf
index 7fb07336f5..0d92a4a7c0 100644
--- a/addons/advancedthrowing/functions/fnc_throw.sqf
+++ b/addons/advanced_throwing/functions/fnc_throw.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * unit call ace_advancedthrowing_fnc_throw
+ * unit call ace_advanced_throwing_fnc_throw
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_throwFiredXEH.sqf b/addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf
similarity index 93%
rename from addons/advancedthrowing/functions/fnc_throwFiredXEH.sqf
rename to addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf
index cb996e53e8..a98551f220 100644
--- a/addons/advancedthrowing/functions/fnc_throwFiredXEH.sqf
+++ b/addons/advanced_throwing/functions/fnc_throwFiredXEH.sqf
@@ -15,7 +15,7 @@
  * None
  *
  * Example:
- * [unit, "weapon", "muzle", "mode", "ammo", "magazine", projectile] call ace_advancedthrowing_fnc_throwFiredXEH
+ * [unit, "weapon", "muzle", "mode", "ammo", "magazine", projectile] call ace_advanced_throwing_fnc_throwFiredXEH
  *
  * Public: No
  */
diff --git a/addons/advancedthrowing/functions/fnc_updateControlsHint.sqf b/addons/advanced_throwing/functions/fnc_updateControlsHint.sqf
similarity index 92%
rename from addons/advancedthrowing/functions/fnc_updateControlsHint.sqf
rename to addons/advanced_throwing/functions/fnc_updateControlsHint.sqf
index a087808cbe..12170b5346 100644
--- a/addons/advancedthrowing/functions/fnc_updateControlsHint.sqf
+++ b/addons/advanced_throwing/functions/fnc_updateControlsHint.sqf
@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * call ace_advancedthrowing_fnc_updateControlsHint
+ * call ace_advanced_throwing_fnc_updateControlsHint
  *
  * Public: No
  */
diff --git a/addons/advanced_throwing/functions/script_component.hpp b/addons/advanced_throwing/functions/script_component.hpp
new file mode 100644
index 0000000000..1927269f9e
--- /dev/null
+++ b/addons/advanced_throwing/functions/script_component.hpp
@@ -0,0 +1 @@
+#include "\z\ace\addons\advanced_throwing\script_component.hpp"
diff --git a/addons/advancedthrowing/script_component.hpp b/addons/advanced_throwing/script_component.hpp
similarity index 78%
rename from addons/advancedthrowing/script_component.hpp
rename to addons/advanced_throwing/script_component.hpp
index bf771992b4..abea16868f 100644
--- a/addons/advancedthrowing/script_component.hpp
+++ b/addons/advanced_throwing/script_component.hpp
@@ -1,4 +1,4 @@
-#define COMPONENT advancedthrowing
+#define COMPONENT advanced_throwing
 #define COMPONENT_BEAUTIFIED Advanced Throwing
 #include "\z\ace\addons\main\script_mod.hpp"
 
@@ -8,12 +8,12 @@
 // #define CBA_DEBUG_SYNCHRONOUS
 // #define ENABLE_PERFORMANCE_COUNTERS
 
-#ifdef DEBUG_ENABLED_ADVANCEDTHROWING
+#ifdef DEBUG_ENABLED_ADVANCED_THROWING
     #define DEBUG_MODE_FULL
 #endif
 
-#ifdef DEBUG_SETTINGS_ADVANCEDTHROWING
-    #define DEBUG_SETTINGS DEBUG_SETTINGS_ADVANCEDTHROWING
+#ifdef DEBUG_SETTINGS_ADVANCED_THROWING
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_ADVANCED_THROWING
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
diff --git a/addons/advancedthrowing/stringtable.xml b/addons/advanced_throwing/stringtable.xml
similarity index 72%
rename from addons/advancedthrowing/stringtable.xml
rename to addons/advanced_throwing/stringtable.xml
index 5a46a36421..1c3729d06e 100644
--- a/addons/advancedthrowing/stringtable.xml
+++ b/addons/advanced_throwing/stringtable.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
-    <Package name="AdvancedThrowing">
-        <Key ID="STR_ACE_AdvancedThrowing_Category">
+    <Package name="Advanced_Throwing">
+        <Key ID="STR_ACE_Advanced_Throwing_Category">
             <English>Advanced Throwing</English>
             <Russian>Улучшенный бросок гранат</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Module_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_Module_Description">
             <English>Allows changing advanced throwing behaviour.</English>
             <Russian>Позволяет настраивать поведение улучшенного броска гранат.</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Enable_DisplayName">
+        <Key ID="STR_ACE_Advanced_Throwing_Enable_DisplayName">
             <English>Enable Advanced Throwing</English>
             <Russian>Включить улучшенный бросок</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Enable_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_Enable_Description">
             <English>Enables advanced throwing system.</English>
             <Russian>Включает систему улучшенного броска.</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_ShowThrowArc_DisplayName">
+        <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_DisplayName">
             <English>Show Throw Arc</English>
             <Russian>Показать траекторию броска</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_ShowThrowArc_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_Description">
             <English>Enables visualization of the throw arc (where throwable will fly).</English>
             <Russian>Включает визуализацию траектории броска (как полетит граната).</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_ShowMouseControls_DisplayName">
+        <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_DisplayName">
             <English>Show Throwing Mouse Controls</English>
             <Russian>Показывать управление мышью</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_ShowMouseControls_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_Description">
             <English>Enables visual cues for mouse controls when throwable is prepared.</English>
             <Russian>Включает отображение подсказок по управлению мышью, когда граната подготовлена.</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_EnablePickUp_DisplayName">
+        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_DisplayName">
             <English>Enable Throwables Pick Up</English>
             <Russian>Включить подбор гранат</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_EnablePickUp_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_Description">
             <English>Enables ability to pick up throwables from the ground.</English>
             <Russian>Включает возможность подбирать гранаты с земли.</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_EnablePickUpAttached_DisplayName">
+        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_DisplayName">
             <English>Enable Attached Throwables Pick Up</English>
             <Russian>Включить подбор прикрепленных гранат</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_EnablePickUpAttached_Description">
+        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_Description">
             <English>Enables ability to pick up throwables from attached objects.</English>
             <Russian>Включает возможность подбирать гранаты, прикрепленные к объектам.</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Prepare">
+        <Key ID="STR_ACE_Advanced_Throwing_Prepare">
             <English>Prepare/Change Throwable</English>
             <Russian>Подготовить/заменить гранату</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_dropModeHold">
+        <Key ID="STR_ACE_Advanced_Throwing_dropModeHold">
             <English>Throwable Drop Mode (Hold)</English>
             <Russian>Режим броска гранаты (удерживать)</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_DropModeToggle">
+        <Key ID="STR_ACE_Advanced_Throwing_DropModeToggle">
             <English>Throwable Drop Mode (Toggle)</English>
             <Russian>Режим броска гранаты (переключить)</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Primed">
+        <Key ID="STR_ACE_Advanced_Throwing_Primed">
             <English>Primed</English>
             <Russian>Подготовлена</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Throw">
+        <Key ID="STR_ACE_Advanced_Throwing_Throw">
             <English>Throw</English>
             <Russian>Бросить</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_ChangeMode">
+        <Key ID="STR_ACE_Advanced_Throwing_ChangeMode">
             <English>(Scroll) Change Mode</English>
             <Russian>(Скролл) Изменить режим</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Extend">
+        <Key ID="STR_ACE_Advanced_Throwing_Extend">
             <English>(Scroll) Extend</English>
             <Russian>(Скролл) Увеличить</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_Cook">
+        <Key ID="STR_ACE_Advanced_Throwing_Cook">
             <English>(Click) Cook</English>
             <Russian>(Клик) Подготовить</Russian>
         </Key>
-        <Key ID="STR_ACE_AdvancedThrowing_PickUp">
+        <Key ID="STR_ACE_Advanced_Throwing_PickUp">
             <English>Pick Up</English>
             <Russian>Подобрать</Russian>
         </Key>
diff --git a/addons/advancedthrowing/$PBOPREFIX$ b/addons/advancedthrowing/$PBOPREFIX$
deleted file mode 100644
index efcf4f0c26..0000000000
--- a/addons/advancedthrowing/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\advancedthrowing
diff --git a/addons/advancedthrowing/functions/script_component.hpp b/addons/advancedthrowing/functions/script_component.hpp
deleted file mode 100644
index 2a1ff8773c..0000000000
--- a/addons/advancedthrowing/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "\z\ace\addons\advancedthrowing\script_component.hpp"
diff --git a/docs/wiki/feature/advancedthrowing.md b/docs/wiki/feature/advanced-throwing.md
similarity index 96%
rename from docs/wiki/feature/advancedthrowing.md
rename to docs/wiki/feature/advanced-throwing.md
index c604206070..7c8dbc06b9 100644
--- a/docs/wiki/feature/advancedthrowing.md
+++ b/docs/wiki/feature/advanced-throwing.md
@@ -10,6 +10,7 @@ version:
   major: 3
   minor: 7
   patch: 0
+redirect_from: "/wiki/feature/advancedthrowing.html"
 ---
 
 ## 1. Overview
@@ -62,4 +63,4 @@ Make sure to use different keybinds for Advanced Throwing or unbind vanilla thro
 
 ## 3. Dependencies
 
-{% include dependencies_list.md component="advancedthrowing" %}
+{% include dependencies_list.md component="advanced_throwing" %}