diff --git a/addons/realisticnames/CfgVehicles.hpp b/addons/realisticnames/CfgVehicles.hpp
index 29ac412957..00298d0c24 100644
--- a/addons/realisticnames/CfgVehicles.hpp
+++ b/addons/realisticnames/CfgVehicles.hpp
@@ -1,6 +1,5 @@
-
 class CfgVehicles {
-    // static weapons
+    // Static weapons
     class StaticMGWeapon;
     class HMG_01_base_F: StaticMGWeapon {
         displayName = CSTRING(HMG_01_Name);
@@ -61,7 +60,7 @@ class CfgVehicles {
         displayName = CSTRING(MRAP_01_hmg_Name);
     };
 
-    // punisher
+    // Punisher
     class MRAP_02_base_F;
     class O_MRAP_02_F: MRAP_02_base_F {
         displayName = CSTRING(MRAP_02_Name);
@@ -86,7 +85,7 @@ class CfgVehicles {
         displayName = CSTRING(MRAP_02_gmg_Name);
     };
 
-    // strider
+    // Strider
     class MRAP_03_base_F;
     class I_MRAP_03_F: MRAP_03_base_F {
         displayName = CSTRING(MRAP_03_Name);
@@ -102,7 +101,7 @@ class CfgVehicles {
         displayName = CSTRING(MRAP_03_gmg_Name);
     };
 
-    // merkava derivates
+    // Merkava derivates
     class MBT_01_base_F;
     class B_MBT_01_base_F: MBT_01_base_F {};
 
@@ -124,7 +123,7 @@ class CfgVehicles {
     class B_MBT_01_mlrs_base_F: MBT_01_mlrs_base_F {};
 
     class B_MBT_01_mlrs_F: B_MBT_01_mlrs_base_F {
-        displayName = CSTRING(MBT_01_mlrs_Name); // Fictional name, (probably wrong) hebrew translation of storm.
+        displayName = CSTRING(MBT_01_mlrs_Name); // Fictional name, (probably wrong) hebrew translation of storm
     };
 
     // T100 derivates
@@ -142,20 +141,20 @@ class CfgVehicles {
         displayName = CSTRING(MBT_02_arty_Name);
     };
 
-    // leopard sg
+    // Leopard 2 SG
     class I_MBT_03_base_F;
     class I_MBT_03_cannon_F: I_MBT_03_base_F {
         displayName = CSTRING(MBT_03_cannon_Name);
     };
 
-    // tracked apcs
+    // Tracked apcs
     class B_APC_Tracked_01_base_F;
     class B_APC_Tracked_01_rcws_F: B_APC_Tracked_01_base_F {
         displayName = CSTRING(APC_Tracked_01_rcws_Name);
     };
 
     class B_APC_Tracked_01_AA_F: B_APC_Tracked_01_base_F {
-        displayName = CSTRING(APC_Tracked_01_AA_Name); // Fictional name, (probably wrong) hebrew translation of cheetah.
+        displayName = CSTRING(APC_Tracked_01_AA_Name); // Fictional name, (probably wrong) hebrew translation of cheetah
     };
 
     class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F {
@@ -176,7 +175,7 @@ class CfgVehicles {
         displayName = CSTRING(APC_tracked_03_cannon_Name);
     };
 
-    // wheeled apcs
+    // Wheeled apcs
     class B_APC_Wheeled_01_base_F;
     class B_APC_Wheeled_01_cannon_F: B_APC_Wheeled_01_base_F {
         displayName = CSTRING(APC_Wheeled_01_cannon_Name);
@@ -199,7 +198,7 @@ class CfgVehicles {
         displayName = CSTRING(APC_Wheeled_03_cannon_Name);
     };
 
-    // trucks
+    // Trucks
     class Truck_01_base_F;
     class B_Truck_01_transport_F: Truck_01_base_F {
         displayName = CSTRING(Truck_01_transport_Name);
@@ -317,7 +316,7 @@ class CfgVehicles {
         displayName = CSTRING(Truck_03_medical_Name);
     };
 
-    // helicopters
+    // Helicopters
     class Heli_Attack_01_base_F;
     class B_Heli_Attack_01_F: Heli_Attack_01_base_F {
         displayName = CSTRING(Heli_Attack_01_Name);
@@ -398,7 +397,7 @@ class CfgVehicles {
         displayName = CSTRING(Heli_Transport_02_Name);
     };
 
-    // planes
+    // Planes
     class Plane_CAS_01_base_F;
     class B_Plane_CAS_01_F: Plane_CAS_01_base_F {
         displayName = CSTRING(Plane_CAS_01_Name);
@@ -438,7 +437,7 @@ class CfgVehicles {
         displayName = CSTRING(Plane_Fighter_04_Name);
     };
 
-    // uavs
+    // UAVs
     class UAV_02_base_F;
     class B_UAV_02_F: UAV_02_base_F {
         displayName = CSTRING(UAV_02_Name);
@@ -472,7 +471,177 @@ class CfgVehicles {
         displayName = CSTRING(UAV_02_Name);
     };
 
-    // pistols
+    #include "CfgVehiclesAttachments.hpp"
+
+    // Assault rifles
+
+    // MX
+    class Weapon_Base_F;
+    class Weapon_arifle_MX_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_Name);
+    };
+    class Weapon_arifle_MX_Black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_Black_Name);
+    };
+    class Weapon_arifle_MX_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_Khaki_Name);
+    };
+
+    class Weapon_arifle_MXC_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXC_Name);
+    };
+    class Weapon_arifle_MXC_Black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXC_Black_Name);
+    };
+    class Weapon_arifle_MXC_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXC_Khaki_Name);
+    };
+
+    class Weapon_arifle_MX_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_GL_Name);
+    };
+    class Weapon_arifle_MX_GL_Black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_GL_Black_Name);
+    };
+    class Weapon_arifle_MX_GL_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_GL_Khaki_Name);
+    };
+
+    class Weapon_arifle_MX_SW_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_SW_Name);
+    };
+    class Weapon_arifle_MX_SW_Black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_SW_Black_Name);
+    };
+    class Weapon_arifle_MX_SW_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MX_SW_Khaki_Name);
+    };
+
+    class Weapon_arifle_MXM_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXM_Name);
+    };
+    class Weapon_arifle_MXM_Black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXM_Black_Name);
+    };
+    class Weapon_arifle_MXM_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MXM_Khaki_Name);
+    };
+
+    // Katiba
+    class Weapon_arifle_Katiba_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Katiba_Name);
+    };
+    class Weapon_arifle_Katiba_C_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Katiba_C_Name);
+    };
+    class Weapon_arifle_Katiba_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Katiba_GL_Name);
+    };
+
+    // SDAR
+    class Weapon_arifle_SDAR_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SDAR_Name);
+    };
+
+    // TAR-21
+    class Weapon_arifle_TRG21_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_TRG21_Name);
+    };
+    class Weapon_arifle_TRG20_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_TRG20_Name);
+    };
+    class Weapon_arifle_TRG21_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_TRG21_GL_Name);
+    };
+
+    // F2000
+    class Weapon_arifle_Mk20_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20_Name);
+    };
+    class Weapon_arifle_Mk20_plain_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20_plain_Name);
+    };
+
+    class Weapon_arifle_Mk20C_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20C_Name);
+    };
+    class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20C_plain_Name);
+    };
+
+    class Weapon_arifle_Mk20_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20_GL_Name);
+    };
+    class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_Mk20_GL_plain_Name);
+    };
+
+    // P90 (1.86)
+    class Weapon_SMG_03_TR_black: Weapon_Base_F {
+        displayName = CSTRING(PS90_TR_Black_Name);
+    };
+    class Weapon_SMG_03_TR_khaki: Weapon_Base_F {
+        displayName = CSTRING(PS90_TR_Khaki_Name);
+    };
+    class Weapon_SMG_03_TR_camo: Weapon_Base_F {
+        displayName = CSTRING(PS90_TR_Camo_Name);
+    };
+    class Weapon_SMG_03_TR_hex: Weapon_Base_F {
+        displayName = CSTRING(PS90_TR_Hex_Name);
+    };
+    class Weapon_SMG_03_black: Weapon_Base_F {
+        displayName = CSTRING(PS90_Black_Name);
+    };
+    class Weapon_SMG_03_khaki: Weapon_Base_F {
+        displayName = CSTRING(PS90_Khaki_Name);
+    };
+    class Weapon_SMG_03_camo: Weapon_Base_F {
+        displayName = CSTRING(PS90_Camo_Name);
+    };
+    class Weapon_SMG_03_hex: Weapon_Base_F {
+        displayName = CSTRING(PS90_Hex_Name);
+    };
+    class Weapon_SMG_03C_TR_black: Weapon_Base_F {
+        displayName = CSTRING(P90_TR_Black_Name);
+    };
+    class Weapon_SMG_03C_TR_khaki: Weapon_Base_F {
+        displayName = CSTRING(P90_TR_Khaki_Name);
+    };
+    class Weapon_SMG_03C_TR_camo: Weapon_Base_F {
+        displayName = CSTRING(P90_TR_Camo_Name);
+    };
+    class Weapon_SMG_03C_TR_hex: Weapon_Base_F {
+        displayName = CSTRING(P90_TR_Hex_Name);
+    };
+    class Weapon_SMG_03C_black: Weapon_Base_F {
+        displayName = CSTRING(P90_Black_Name);
+    };
+    class Weapon_SMG_03C_khaki: Weapon_Base_F {
+        displayName = CSTRING(P90_Khaki_Name);
+    };
+    class Weapon_SMG_03C_camo: Weapon_Base_F {
+        displayName = CSTRING(P90_Camo_Name);
+    };
+    class Weapon_SMG_03C_hex: Weapon_Base_F {
+        displayName = CSTRING(P90_Hex_Name);
+    };
+
+    // Vector
+    class Weapon_SMG_01_F: Weapon_Base_F {
+        displayName = CSTRING(SMG_01_Name);
+    };
+
+    // Scorpion
+    class Weapon_SMG_02_F: Weapon_Base_F {
+        displayName = CSTRING(SMG_02_Name);
+    };
+
+    // CPW
+    class Weapon_hgun_PDW2000_F: Weapon_Base_F {
+        displayName = CSTRING(hgun_PDW2000_Name);
+    };
+
+    // Pistols
     class Pistol_Base_F;
     class Weapon_hgun_P07_F: Pistol_Base_F {
         displayName = CSTRING(hgun_P07_Name);
@@ -498,16 +667,48 @@ class CfgVehicles {
         displayName = CSTRING(hgun_Pistol_Signal_Name);
     };
 
-    // rocket launchers
-    class Launcher_Base_F;
-    class Weapon_launch_NLAW_F: Launcher_Base_F {
-        displayName = CSTRING(launch_NLAW_Name);
+    // Machine guns
+    class Weapon_LMG_Mk200_F: Weapon_Base_F {
+        displayName = CSTRING(LMG_Mk200_Name);
     };
 
+    class Weapon_LMG_Zafir_F: Weapon_Base_F {
+        displayName = CSTRING(LMG_Zafir_Name);
+    };
+
+    // Sniper rifles
+    class Weapon_srifle_EBR_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_EBR_Name);
+    };
+
+    class Weapon_srifle_LRR_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_LRR_Name);
+    };
+    class Weapon_srifle_LRR_camo_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_LRR_camo_Name);
+    };
+
+    class Weapon_srifle_GM6_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_GM6_Name);
+    };
+    class Weapon_srifle_GM6_camo_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_GM6_camo_Name);
+    };
+
+    class Weapon_srifle_DMR_01_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_DMR_01_Name);
+    };
+
+    // Rocket launchers
+    class Launcher_Base_F;
     class Weapon_launch_RPG32_F: Launcher_Base_F {
         displayName = CSTRING(launch_RPG32_Name);
     };
 
+    class Weapon_launch_NLAW_F: Launcher_Base_F {
+        displayName = CSTRING(launch_NLAW_Name);
+    };
+
     /*class Weapon_launch_Titan_F: Launcher_Base_F {
         displayName = CSTRING(launch_Titan_Name);
     };
@@ -528,145 +729,20 @@ class CfgVehicles {
     //class Weapon_launch_I_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {};
     //class Weapon_launch_O_Titan_short_F: Weapon_launch_launch_B_Titan_short_F {};
 
-    // rifles
-
-    // MX
-    class Weapon_Base_F;
-    class Weapon_arifle_MX_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_MX_Name);
+    class Weapon_launch_O_Vorona_brown_F: Launcher_Base_F {
+        displayName = CSTRING(launch_Vorona_brown);
+    };
+    class Weapon_launch_O_Vorona_green_F: Launcher_Base_F {
+        displayName = CSTRING(launch_Vorona_green);
     };
 
-    class Weapon_arifle_MXC_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_MXC_Name);
-    };
-
-    class Weapon_arifle_MX_GL_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_MX_GL_Name);
-    };
-
-    class Weapon_arifle_MX_SW_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_MX_SW_Name);
-    };
-
-    class Weapon_arifle_MXM_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_MXM_Name);
-    };
-
-    // Katiba
-    class Weapon_arifle_Katiba_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Katiba_Name);
-    };
-
-    class Weapon_arifle_Katiba_C_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Katiba_C_Name);
-    };
-
-    class Weapon_arifle_Katiba_GL_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Katiba_GL_Name);
-    };
-
-    // F2000
-    class Weapon_arifle_Mk20_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20_Name);
-    };
-
-    class Weapon_arifle_Mk20_plain_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20_plain_Name);
-    };
-
-    class Weapon_arifle_Mk20C_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20C_Name);
-    };
-
-    class Weapon_arifle_Mk20C_plain_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20C_plain_Name);
-    };
-
-    class Weapon_arifle_Mk20_GL_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20_GL_Name);
-    };
-
-    class Weapon_arifle_Mk20_GL_plain_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_Mk20_GL_plain_Name);
-    };
-
-    // TAR-21
-    class Weapon_arifle_TRG21_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_TRG21_Name);
-    };
-
-    class Weapon_arifle_TRG20_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_TRG20_Name);
-    };
-
-    class Weapon_arifle_TRG21_GL_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_TRG21_GL_Name);
-    };
-
-    // sub machine guns
-    class Weapon_SMG_01_F: Weapon_Base_F {
-        displayName = CSTRING(SMG_01_Name);
-    };
-
-    class Weapon_SMG_02_F: Weapon_Base_F {
-        displayName = CSTRING(SMG_02_Name);
-    };
-
-    class Weapon_SMG_05_F: Weapon_Base_F {
-        displayName = CSTRING(SMG_05);
-    };
-
-    class Weapon_hgun_PDW2000_F: Weapon_Base_F {
-        displayName = CSTRING(hgun_PDW2000_Name);
-    };
-
-    class Weapon_arifle_SDAR_F: Weapon_Base_F {
-        displayName = CSTRING(arifle_SDAR_Name);
-    };
-
-    // machine guns
-    class Weapon_LMG_Mk200_F: Weapon_Base_F {
-        displayName = CSTRING(LMG_Mk200_Name);
-    };
-
-    class Weapon_LMG_Zafir_F: Weapon_Base_F {
-        displayName = CSTRING(LMG_Zafir_Name);
-    };
-
-    // sniper rifles
-    class Weapon_srifle_EBR_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_EBR_Name);
-    };
-
-    class Weapon_srifle_GM6_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_GM6_Name);
-    };
-
-    class Weapon_srifle_GM6_camo_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_GM6_camo_Name);
-    };
-
-    class Weapon_srifle_LRR_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_LRR_Name);
-    };
-
-    class Weapon_srifle_LRR_camo_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_LRR_camo_Name);
-    };
-
-    class Weapon_srifle_DMR_01_F: Weapon_Base_F {
-        displayName = CSTRING(srifle_DMR_01_Name);
-    };
-
-    // marksmen
-    /*class Weapon_srifle_DMR_02_F: Weapon_Base_F {
+    // Marksmen marksman
+    class Weapon_srifle_DMR_02_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_02);
     };
-
     class Weapon_srifle_DMR_02_camo_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_02_camo);
     };
-
     class Weapon_srifle_DMR_02_sniper_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_02_sniper);
     };
@@ -674,19 +750,15 @@ class CfgVehicles {
     class Weapon_srifle_DMR_03_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_03);
     };
-
     class Weapon_srifle_DMR_03_khaki_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_03_khaki);
     };
-
     class Weapon_srifle_DMR_03_tan_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_03_tan);
     };
-
     class Weapon_srifle_DMR_03_multicam_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_03_multicam);
     };
-
     class Weapon_srifle_DMR_03_woodland_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_03_woodland);
     };
@@ -694,7 +766,6 @@ class CfgVehicles {
     class Weapon_srifle_DMR_04_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_04);
     };
-
     class Weapon_srifle_DMR_04_Tan_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_04_Tan);
     };
@@ -702,11 +773,9 @@ class CfgVehicles {
     class Weapon_srifle_DMR_05_blk_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_05_blk);
     };
-
     class Weapon_srifle_DMR_05_hex_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_05_hex);
     };
-
     class Weapon_srifle_DMR_05_tan_f: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_05_tan);
     };
@@ -714,11 +783,11 @@ class CfgVehicles {
     class Weapon_srifle_DMR_06_camo_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_06_camo);
     };
-
     class Weapon_srifle_DMR_06_olive_F: Weapon_Base_F {
         displayName = CSTRING(srifle_DMR_06_olive);
     };
 
+    // Marksmen MGs
     class Weapon_MMG_01_hex_F: Weapon_Base_F {
         displayName = CSTRING(MMG_01_hex);
     };
@@ -737,14 +806,58 @@ class CfgVehicles {
 
     class Weapon_MMG_02_sand_F: Weapon_Base_F {
         displayName = CSTRING(MMG_02_sand);
-    };*/
+    };
 
-    //attachments
+    // Tanks DLC
 
-    class Item_Base_F;
+    // Rooikat 120 (Rhino MGS)
+    class AFV_Wheeled_01_base_F;
+    class B_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F {
+        displayName = CSTRING(afv_wheeled_01);
+    };
+    class B_T_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F {
+        displayName = CSTRING(afv_wheeled_01);
+    };
+    class AFV_Wheeled_01_up_base_F;
+    class B_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F {
+        displayName = CSTRING(afv_wheeled_01_up);
+    };
+    class B_T_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F {
+        displayName = CSTRING(afv_wheeled_01_up);
+    };
 
-    class Item_acc_flashlight: Item_Base_F {
-        displayName="UTG Defender 126";
+    // T-14 Armata (T-140 Angara)
+    class MBT_04_cannon_base_F;
+    class O_MBT_04_cannon_F: MBT_04_cannon_base_F {
+        displayName = CSTRING(MBT_04_cannon);
+    };
+    class O_T_MBT_04_cannon_F: MBT_04_cannon_base_F {
+        displayName = CSTRING(MBT_04_cannon);
+    };
+    class MBT_04_command_base_F; // Keep "K" designation for command variant.
+    class O_MBT_04_command_F: MBT_04_command_base_F {
+        displayName = CSTRING(MBT_04_command);
+    };
+    class O_T_MBT_04_command_F: MBT_04_command_base_F {
+        displayName = CSTRING(MBT_04_command);
+    };
+
+    // Wiesel 2 (AWC 302 Nyx)
+    class LT_01_AA_base_F;
+    class I_LT_01_AA_F: LT_01_AA_base_F {
+        displayName = CSTRING(LT_01_AA);
+    };
+    class LT_01_AT_base_F;
+    class I_LT_01_AT_F: LT_01_AT_base_F {
+        displayName = CSTRING(LT_01_AT);
+    };
+    class LT_01_cannon_base_F;
+    class I_LT_01_cannon_F: LT_01_cannon_base_F {
+        displayName = CSTRING(LT_01_cannon);
+    };
+    class LT_01_scout_base_F;
+    class I_LT_01_scout_F: LT_01_scout_base_F {
+        displayName = CSTRING(LT_01_scout);
     };
 
     // APEX/Tanoa
@@ -815,54 +928,266 @@ class CfgVehicles {
         displayName = CSTRING(lsv_02_at);
     };
 
-    // Rooikat 120 (Rhino MGS)
-    class AFV_Wheeled_01_base_F;
-    class B_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F {
-        displayName = CSTRING(afv_wheeled_01);
+    // Type 115
+    class Weapon_arifle_ARX_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_arx_blk_Name);
     };
-    class B_T_AFV_Wheeled_01_cannon_F: AFV_Wheeled_01_base_F {
-        displayName = CSTRING(afv_wheeled_01);
+    class Weapon_arifle_ARX_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_arx_ghex_Name);
     };
-    class AFV_Wheeled_01_up_base_F;
-    class B_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F {
-        displayName = CSTRING(afv_wheeled_01_up);
-    };
-    class B_T_AFV_Wheeled_01_up_cannon_F: AFV_Wheeled_01_up_base_F {
-        displayName = CSTRING(afv_wheeled_01_up);
+    class Weapon_arifle_ARX_hex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_arx_hex_Name);
     };
 
-    // T-14 Armata (T-140 Angara)
-    class MBT_04_cannon_base_F;
-    class O_MBT_04_cannon_F: MBT_04_cannon_base_F {
-        displayName = CSTRING(MBT_04_cannon);
+    // QBZ-95 and variants
+    class Weapon_arifle_CTAR_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_blk);
     };
-    class O_T_MBT_04_cannon_F: MBT_04_cannon_base_F {
-        displayName = CSTRING(MBT_04_cannon);
+    class Weapon_arifle_CTAR_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_ghex);
     };
-    class MBT_04_command_base_F; // Keep "K" designation for command variant.
-    class O_MBT_04_command_F: MBT_04_command_base_F {
-        displayName = CSTRING(MBT_04_command);
-    };
-    class O_T_MBT_04_command_F: MBT_04_command_base_F {
-        displayName = CSTRING(MBT_04_command);
+    class Weapon_arifle_CTAR_hex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_hex);
     };
 
-    // Wiesel 2 (AWC 302 Nyx)
-    class LT_01_AA_base_F;
-    class I_LT_01_AA_F: LT_01_AA_base_F {
-        displayName = CSTRING(LT_01_AA);
+    class Weapon_arifle_CTAR_GL_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_GL_blk);
     };
-    class LT_01_AT_base_F;
-    class I_LT_01_AT_F: LT_01_AT_base_F {
-        displayName = CSTRING(LT_01_AT);
+    class Weapon_arifle_CTAR_GL_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_GL_ghex);
     };
-    class LT_01_cannon_base_F;
-    class I_LT_01_cannon_F: LT_01_cannon_base_F {
-        displayName = CSTRING(LT_01_cannon);
-    };
-    class LT_01_scout_base_F;
-    class I_LT_01_scout_F: LT_01_scout_base_F {
-        displayName = CSTRING(LT_01_scout);
+    class Weapon_arifle_CTAR_GL_hex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTAR_GL_hex);
     };
 
+    class Weapon_arifle_CTARS_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTARS_blk);
+    };
+    class Weapon_arifle_CTARS_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTARS_ghex);
+    };
+    class Weapon_arifle_CTARS_hex_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_CTARS_hex);
+    };
+
+    // QBU-88
+    class Weapon_srifle_DMR_07_blk_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_DMR_07_blk);
+    };
+    class Weapon_srifle_DMR_07_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_DMR_07_ghex);
+    };
+    class Weapon_srifle_DMR_07_hex_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_DMR_07_hex);
+    };
+
+    // GM6
+    class Weapon_srifle_GM6_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_GM6_ghex);
+    };
+
+    // M249
+    class Weapon_LMG_03_F: Weapon_Base_F {
+        displayName = CSTRING(LMG_03);
+    };
+
+    // Intervention
+    class Weapon_srifle_LRR_tna_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_LRR_tna);
+    };
+
+    // MP5
+    class Weapon_SMG_05_F: Weapon_Base_F {
+        displayName = CSTRING(SMG_05);
+    };
+
+    // HK416 and variants
+    class Weapon_arifle_SPAR_01_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_blk);
+    };
+    class Weapon_arifle_SPAR_01_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_khk);
+    };
+    class Weapon_arifle_SPAR_01_snd_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_snd);
+    };
+
+    class Weapon_arifle_SPAR_01_GL_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_GL_blk);
+    };
+    class Weapon_arifle_SPAR_01_GL_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_GL_khk);
+    };
+    class Weapon_arifle_SPAR_01_GL_snd_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_01_GL_snd);
+    };
+
+    class Weapon_arifle_SPAR_02_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_02_blk);
+    };
+    class Weapon_arifle_SPAR_02_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_02_khk);
+    };
+    class Weapon_arifle_SPAR_02_snd_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_02_snd);
+    };
+
+    class Weapon_arifle_SPAR_03_blk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_03_blk);
+    };
+    class Weapon_arifle_SPAR_03_khk_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_03_khk);
+    };
+    class Weapon_arifle_SPAR_03_snd_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_SPAR_03_snd);
+    };
+
+    // RPG-32
+    class Weapon_launch_RPG32_ghex_F: Weapon_Base_F {
+        displayName = CSTRING(launch_RPG32_ghex);
+    };
+
+    // P99
+    class Weapon_hgun_P07_khk_F: Weapon_Base_F {
+        displayName = CSTRING(hgun_P07_khk);
+    };
+    class Weapon_hgun_P07_blk_F: Weapon_Base_F {
+        displayName = CSTRING(hgun_P07_blk);
+    };
+
+    // Makarov
+    class Weapon_hgun_Pistol_01_F: Weapon_Base_F {
+        displayName = CSTRING(hgun_Pistol_01);
+    };
+
+    // AKM
+    class Weapon_arifle_AKM_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AKM);
+    };
+
+    // AKSU
+    class Weapon_arifle_AKS_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AKS);
+    };
+
+    // Contact/Livonia
+
+    // CZ 581 Shotgun
+    class Weapon_sgun_HunterShotgun_01_F: Weapon_Base_F {
+        displayName = CSTRING(sgun_huntershotgun_01_Name);
+    };
+    class Weapon_sgun_HunterShotgun_01_sawedoff_F: Weapon_Base_F {
+        displayName = CSTRING(sgun_huntershotgun_sawedoff_01_Name);
+    };
+
+    // FNX-45 (Green)
+    class Weapon_hgun_Pistol_heavy_01_green_F: Weapon_Base_F {
+        displayName = CSTRING(hgun_Pistol_heavy_01_green_Name);
+    };
+
+    // RPG-32 (Green)
+    class Weapon_launch_RPG32_green_F: Weapon_Base_F {
+        displayName = CSTRING(launch_RPG32_green_Name);
+    };
+
+    // AK15 variants
+    class Weapon_arifle_AK12_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12);
+    };
+    class Weapon_arifle_AK12_lush_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12_lush);
+    };
+    class Weapon_arifle_AK12_arid_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12_arid);
+    };
+
+    class Weapon_arifle_AK12_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12_GL);
+    };
+    class Weapon_arifle_AK12_GL_lush_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12_GL_lush);
+    };
+    class Weapon_arifle_AK12_GL_arid_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12_GL_arid);
+    };
+
+    class Weapon_arifle_AK12U_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12U);
+    };
+    class Weapon_arifle_AK12U_lush_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12U_lush);
+    };
+    class Weapon_arifle_AK12U_arid_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_AK12U_arid);
+    };
+
+    class Weapon_arifle_RPK12_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_RPK12);
+    };
+    class Weapon_arifle_RPK12_lush_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_RPK12_lush);
+    };
+    class Weapon_arifle_RPK12_arid_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_RPK12_arid);
+    };
+
+    // M14 (Classic)
+    class Weapon_srifle_DMR_06_hunter_F: Weapon_Base_F {
+        displayName = CSTRING(srifle_DMR_06_hunter);
+    };
+
+    // Stoner 99 LMG (Black)
+    class Weapon_LMG_Mk200_black_F: Weapon_Base_F {
+        displayName = CSTRING(LMG_Mk200_black);
+    };
+
+    // MSBS Grot variants
+    class Weapon_arifle_MSBS65_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65);
+    };
+    class Weapon_arifle_MSBS65_black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_black);
+    };
+    class Weapon_arifle_MSBS65_camo_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_camo);
+    };
+    class Weapon_arifle_MSBS65_sand_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_sand);
+    };
+    class Weapon_arifle_MSBS65_GL_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_GL);
+    };
+    class Weapon_arifle_MSBS65_GL_black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_GL_black);
+    };
+    class Weapon_arifle_MSBS65_GL_camo_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_GL_camo);
+    };
+    class Weapon_arifle_MSBS65_GL_sand_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_GL_sand);
+    };
+    class Weapon_arifle_MSBS65_Mark_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_Mark);
+    };
+    class Weapon_arifle_MSBS65_Mark_black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_Mark_black);
+    };
+    class Weapon_arifle_MSBS65_Mark_camo_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_Mark_camo);
+    };
+    class Weapon_arifle_MSBS65_Mark_sand_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_Mark_sand);
+    };
+    class Weapon_arifle_MSBS65_UBS_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_UBS);
+    };
+    class Weapon_arifle_MSBS65_UBS_black_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_UBS_black);
+    };
+    class Weapon_arifle_MSBS65_UBS_camo_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_UBS_camo);
+    };
+    class Weapon_arifle_MSBS65_UBS_sand_F: Weapon_Base_F {
+        displayName = CSTRING(arifle_MSBS65_UBS_sand);
+    };
 };
diff --git a/addons/realisticnames/CfgVehiclesAttachments.hpp b/addons/realisticnames/CfgVehiclesAttachments.hpp
new file mode 100644
index 0000000000..54e6206fe3
--- /dev/null
+++ b/addons/realisticnames/CfgVehiclesAttachments.hpp
@@ -0,0 +1,146 @@
+// Attachments
+class Item_Base_F;
+class Item_acc_flashlight: Item_Base_F {
+    displayName = CSTRING(flashlight_Name);
+};
+
+class Item_optic_MRD: Item_Base_F {
+    displayName = CSTRING(optic_mrd_Name);
+};
+class Item_optic_MRD_black: Item_Base_F {
+    displayName = CSTRING(optic_mrd_black_Name);
+};
+
+class Item_optic_Hamr: Item_Base_F {
+    displayName = CSTRING(optic_hamr);
+};
+class Item_optic_Hamr_khk_F: Item_Base_F {
+    displayName = CSTRING(optic_hamr_khk);
+};
+
+class Item_optic_Arco: Item_Base_F {
+    displayName = CSTRING(optic_arco);
+};
+class Item_optic_Arco_blk_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_blk);
+};
+class Item_optic_Arco_ghex_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_ghex);
+};
+class Item_optic_Arco_lush_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_lush);
+};
+class Item_optic_Arco_arid_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_arid);
+};
+class Item_optic_Arco_AK_blk_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_ak_blk);
+};
+class Item_optic_Arco_AK_lush_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_ak_lush);
+};
+class Item_optic_Arco_AK_arid_F: Item_Base_F {
+    displayName = CSTRING(optic_arco_ak_arid);
+};
+
+class Item_optic_ERCO_blk_f: Item_Base_F {
+    displayName = CSTRING(optic_erco_blk);
+};
+class Item_optic_ERCO_khk_f: Item_Base_F {
+    displayName = CSTRING(optic_erco_khk);
+};
+class Item_optic_ERCO_snd_f: Item_Base_F {
+    displayName = CSTRING(optic_erco_snd);
+};
+
+class Item_optic_LRPS: Item_Base_F {
+    displayName = CSTRING(optic_lrps);
+};
+class Item_optic_LRPS_ghex_F: Item_Base_F {
+    displayName = CSTRING(optic_lrps_ghex);
+};
+class Item_optic_LRPS_tna_F: Item_Base_F {
+    displayName = CSTRING(optic_lrps_tna);
+};
+
+class Item_optic_AMS: Item_Base_F {
+    displayName = CSTRING(optic_ams);
+};
+class Item_optic_AMS_khk: Item_Base_F {
+    displayName = CSTRING(optic_ams_khk);
+};
+class Item_optic_AMS_snd: Item_Base_F {
+    displayName = CSTRING(optic_ams_snd);
+};
+
+class Item_optic_KHS_blk: Item_Base_F {
+    displayName = CSTRING(optic_khs_blk);
+};
+class Item_optic_KHS_hex: Item_Base_F {
+    displayName = CSTRING(optic_khs_hex);
+};
+class Item_optic_KHS_old: Item_Base_F {
+    displayName = CSTRING(optic_khs_old);
+};
+class Item_optic_KHS_tan: Item_Base_F {
+    displayName = CSTRING(optic_khs_tan);
+};
+
+class Item_optic_DMS: Item_Base_F {
+    displayName = CSTRING(optic_dms);
+};
+class Item_optic_DMS_ghex_F: Item_Base_F {
+    displayName = CSTRING(optic_dms_ghex);
+};
+class Item_optic_DMS_weathered_F: Item_Base_F {
+    displayName = CSTRING(optic_dms_weathered);
+};
+class Item_optic_DMS_weathered_Kir_F: Item_Base_F {
+    displayName = CSTRING(optic_dms_weathered_kir);
+};
+
+class Item_optic_holosight: Item_Base_F {
+    displayName = CSTRING(optic_holosight);
+};
+class Item_optic_Holosight_blk_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_blk);
+};
+class Item_optic_Holosight_khk_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_khk);
+};
+class Item_optic_Holosight_lush_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_lush);
+};
+class Item_optic_Holosight_arid_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_arid);
+};
+class Item_optic_Holosight_smg: Item_Base_F {
+    displayName = CSTRING(optic_holosight_smg);
+};
+class Item_optic_Holosight_smg_blk_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_smg_blk);
+};
+class Item_optic_Holosight_smg_khk_F: Item_Base_F {
+    displayName = CSTRING(optic_holosight_smg_khk);
+};
+
+class Item_optic_MRCO: Item_Base_F {
+    displayName = CSTRING(optic_MRCO);
+};
+
+class Item_optic_Yorris: Item_Base_F {
+    displayName = CSTRING(optic_Yorris);
+};
+
+class Item_optic_ACO: Item_Base_F {
+    displayName = CSTRING(optic_ACO);
+};
+class Item_optic_ACO_grn: Item_Base_F {
+    displayName = CSTRING(optic_ACO_grn);
+};
+class Item_optic_ACO_smg: Item_Base_F {
+    displayName = CSTRING(optic_ACO_smg);
+};
+class Item_optic_ACO_grn_smg: Item_Base_F {
+    displayName = CSTRING(optic_ACO_grn_smg);
+};
diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp
index dfe5e6525e..c515cf08fc 100644
--- a/addons/realisticnames/CfgWeapons.hpp
+++ b/addons/realisticnames/CfgWeapons.hpp
@@ -2,8 +2,9 @@ class Mode_SemiAuto;
 class Mode_FullAuto;
 
 class CfgWeapons {
-    #include "Attachments.hpp"
-    // assault rifles
+    #include "CfgWeaponsAttachments.hpp"
+
+    // Assault rifles
 
     // MX
     class arifle_MX_Base_F;
@@ -176,13 +177,13 @@ class CfgWeapons {
         displayName = CSTRING(SMG_02_Name);
     };
 
-    // PDW 2000
+    // CPW
     class pdw2000_base_F;
     class hgun_pdw2000_F: pdw2000_base_F {
         displayName = CSTRING(hgun_PDW2000_Name);
     };
 
-    // pistols
+    // Pistols
     class Pistol_Base_F;
     class hgun_P07_F: Pistol_Base_F {
         displayName = CSTRING(hgun_P07_Name);
@@ -208,7 +209,7 @@ class CfgWeapons {
         displayName = CSTRING(hgun_Pistol_Signal_Name);
     };
 
-    // machine guns
+    // Machine guns
     class Rifle_Long_Base_F;
     class LMG_Mk200_F: Rifle_Long_Base_F {
         displayName = CSTRING(LMG_Mk200_Name);
@@ -218,7 +219,7 @@ class CfgWeapons {
         displayName = CSTRING(LMG_Zafir_Name);
     };
 
-    // sniper rifles
+    // Sniper rifles
     class EBR_base_F;
     class srifle_EBR_F: EBR_base_F {
         displayName = CSTRING(srifle_EBR_Name);
@@ -245,7 +246,7 @@ class CfgWeapons {
         displayName = CSTRING(srifle_DMR_01_Name);
     };
 
-    // launchers
+    // Launchers
     class Launcher_Base_F;
     class launch_RPG32_F: Launcher_Base_F {
         displayName = CSTRING(launch_RPG32_Name);
@@ -270,42 +271,35 @@ class CfgWeapons {
         displayName = CSTRING(launch_Vorona_green);
     };
 
-    // marksmen marksman
+    // Marksmen marksman
     class DMR_02_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(DMR_02); //MAR-10 .338;
     };
-
     class srifle_DMR_02_F: DMR_02_base_F {
         displayName = CSTRING(srifle_DMR_02); //MAR-10 .338 (Black);
     };
-
     class srifle_DMR_02_camo_F: srifle_DMR_02_F {
         displayName = CSTRING(srifle_DMR_02_camo); //MAR-10 .338 (Camo);
     };
-
     class srifle_DMR_02_sniper_F: srifle_DMR_02_F {
         displayName = CSTRING(srifle_DMR_02_sniper); //MAR-10 .338 (Sand);
     };
+
     class DMR_03_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(DMR_03); //Mk-I EMR 7.62 mm;
     };
-
     class srifle_DMR_03_F: DMR_03_base_F {
         displayName = CSTRING(srifle_DMR_03); //Mk-I EMR 7.62 mm (Black);
     };
-
     class srifle_DMR_03_khaki_F: srifle_DMR_03_F {
         displayName = CSTRING(srifle_DMR_03_khaki); //Mk-I EMR 7.62 mm (Khaki);
     };
-
     class srifle_DMR_03_tan_F: srifle_DMR_03_F {
         displayName = CSTRING(srifle_DMR_03_tan); //Mk-I EMR 7.62 mm (Sand);
     };
-
     class srifle_DMR_03_multicam_F: srifle_DMR_03_F {
         displayName = CSTRING(srifle_DMR_03_multicam); //Mk-I EMR 7.62 mm (Camo);
     };
-
     class srifle_DMR_03_woodland_F: srifle_DMR_03_F {
         displayName = CSTRING(srifle_DMR_03_woodland); //Mk-I EMR 7.62 mm (Woodland);
     };
@@ -313,11 +307,9 @@ class CfgWeapons {
     class DMR_04_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(DMR_04); //ASP-1 Kir 12.7 mm;
     };
-
     class srifle_DMR_04_F: DMR_04_base_F {
         displayName = CSTRING(srifle_DMR_04); //ASP-1 Kir 12.7 mm (Black);
     };
-
     class srifle_DMR_04_Tan_F: srifle_DMR_04_F {
         displayName = CSTRING(srifle_DMR_04_Tan); //ASP-1 Kir 12.7 mm (Tan);
     };
@@ -325,31 +317,27 @@ class CfgWeapons {
     class DMR_05_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(DMR_05); //Cyrus 9.3 mm;
     };
-
     class srifle_DMR_05_blk_F: DMR_05_base_F {
         displayName = CSTRING(srifle_DMR_05_blk); //Cyrus 9.3 mm (Black)
     };
-
     class srifle_DMR_05_hex_F: srifle_DMR_05_blk_F {
         displayName = CSTRING(srifle_DMR_05_hex); //Cyrus 9.3 mm (Hex);
     };
-
     class srifle_DMR_05_tan_f: srifle_DMR_05_blk_F {
         displayName = CSTRING(srifle_DMR_05_tan); //Cyrus 9.3 mm (Tan);
     };
+
     class DMR_06_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(DMR_06); //Mk14 7.62 mm;
     };
-
     class srifle_DMR_06_camo_F: DMR_06_base_F {
         displayName = CSTRING(srifle_DMR_06_camo); //Mk14 7.62 mm (Camo)
     };
-
     class srifle_DMR_06_olive_F: srifle_DMR_06_camo_F {
         displayName = CSTRING(srifle_DMR_06_olive); //Mk14 7.62 mm (Olive);
     };
 
-    // marksmen mgs
+    // Marksmen MGs
     class MMG_01_base_F: Rifle_Long_Base_F {
         displayName = CSTRING(MMG_01); //Navid 9.3 mm;
     };
@@ -377,15 +365,12 @@ class CfgWeapons {
         displayName = CSTRING(MMG_02_sand); //SPMG .338 (Sand);
     };
 
-    // vehicle weapons
+    // Vehicle weapons
 
-    // gatlings
+    // Gatlings
     class CannonCore;
     class gatling_20mm: CannonCore {
-        //displayName = "";
-        class manual: CannonCore {
-            //displayName = "";
-        };
+        class manual;
     };
     class Twin_Cannon_20mm: gatling_20mm {
         displayName = "Plamen PL-20";
@@ -415,7 +400,7 @@ class CfgWeapons {
         };
     };
 
-    // missiles
+    // Missiles
     class RocketPods;
     class Missile_AA_04_Plane_CAS_01_F: RocketPods {
         displayName = "AIM-9 Sidewinder";
@@ -438,7 +423,7 @@ class CfgWeapons {
         displayName = CSTRING(missiles_vorona);
     };
 
-    // rockets
+    // Rockets
     class Rocket_04_HE_Plane_CAS_01_F: RocketPods {
         displayName = "Hydra 70";
         class Burst: RocketPods {
@@ -469,7 +454,7 @@ class CfgWeapons {
         };
     };
 
-    // more missiles
+    // More missiles
     class missiles_DAR: RocketPods {
         displayName = "Hydra 70";
         class Burst: RocketPods {
@@ -492,17 +477,17 @@ class CfgWeapons {
         displayName = "AIM-120A AMRAAM";
     };
 
-    class missiles_SCALPEL: RocketPods { // according to zGuba, this is what it's based on
+    class missiles_SCALPEL: RocketPods { // According to zGuba, this is what it's based on
         displayName = "9K121 Vikhr";
     };
 
-    // bomb
+    // Bomb
     class Bomb_04_Plane_CAS_01_F;
     class Bomb_03_Plane_CAS_02_F: Bomb_04_Plane_CAS_01_F {
         displayName = "FAB-250M-54";
     };
 
-    // machine guns
+    // Machine guns
     class MGunCore;
     class M134_minigun: MGunCore {
         displayName = "2x M134 Minigun";
@@ -546,7 +531,7 @@ class CfgWeapons {
         };
     };
 
-    // grenade launchers
+    // Grenade launchers
     class GMG_F;
     class GMG_20mm: GMG_F {
         displayName = "XM307";
@@ -562,7 +547,7 @@ class CfgWeapons {
         };
     };
 
-    // autocannons
+    // Autocannons
     class autocannon_35mm: CannonCore {
         displayName = "GDF-001";
         class manual: CannonCore {
@@ -570,7 +555,7 @@ class CfgWeapons {
         };
     };
 
-    // aa missiles
+    // AA missiles
     class missiles_titan: MissileLauncher {
         displayName = "Mini-Spike";
     };
@@ -579,17 +564,17 @@ class CfgWeapons {
         displayName = "FIM-92F";
     };
 
-    // mortar
+    // Nortar
     class mortar_155mm_AMOS: CannonCore {
         displayName = "L/52";
     };
 
-    // artillery rockets
+    // Artillery rockets
     class rockets_230mm_GAT: RocketPods {
         displayName = "M269";
     };
 
-    // tank guns
+    // Tank guns
     class cannon_120mm: CannonCore {
         class player;
         displayName = "MG251";
@@ -615,12 +600,12 @@ class CfgWeapons {
         displayName = "2A82-1M";
     };
 
-    // coax machine guns
+    // Coax machine guns
     class LMG_coax: LMG_RCWS {
         displayName = "PKT";
     };
 
-    // more autocannons
+    // More autocannons
     class autocannon_Base_F;
     class autocannon_40mm_CTWS: autocannon_Base_F {
         displayName = "Mk44 Bushmaster II";
diff --git a/addons/realisticnames/Attachments.hpp b/addons/realisticnames/CfgWeaponsAttachments.hpp
similarity index 99%
rename from addons/realisticnames/Attachments.hpp
rename to addons/realisticnames/CfgWeaponsAttachments.hpp
index 84b9bcaebf..c23559b702 100644
--- a/addons/realisticnames/Attachments.hpp
+++ b/addons/realisticnames/CfgWeaponsAttachments.hpp
@@ -1,7 +1,5 @@
-//attachments
-
+// Attachments
 class ItemCore;
-
 class acc_flashlight: ItemCore {
     displayName = CSTRING(flashlight_Name);
 };