diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 25e5da03db..6f1a71670a 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -108,7 +108,7 @@ orni:
 		Range: 10c0
 		Type: CenterPosition
 	Armament:
-		Weapon: ChainGun
+		Weapon: M_HMG
 		LocalOffset: 85,-213,-85
 	AttackHeli:
 		FacingTolerance: 20
diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index 3b25e05b74..94269e32d2 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -190,7 +190,7 @@ sardaukar:
 	Armament@PRIMARY:
 		Weapon: M_LMG
 	Armament@SECONDARY:
-		Weapon: FREMEN_L
+		Weapon: M_HMG
 	AttackFrontal:
 	AttractsWorms:
 		Intensity: 180
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index ce72096ce1..7102035894 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -93,6 +93,26 @@ M_LMG:
 	Warhead@2Eff: CreateEffect
 		Explosion: piffs
 
+M_HMG:
+	ReloadDelay: 10
+	Range: 5c0
+	MinRange: 1c0
+	Report: 20MMGUN1.WAV
+	Projectile: Bullet
+		Speed: 1c256
+		Blockable: false
+	Warhead@1Dam: SpreadDamage
+		Spread: 96
+		Damage: 20
+		Versus:
+			Wood: 50
+			Light: 60
+			Heavy: 25
+			Concrete: 25
+		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
+	Warhead@2Eff: CreateEffect
+		Explosion: piffs
+
 Fremen_L:
 	ReloadDelay: 60
 	Delay: 5
@@ -466,26 +486,6 @@ Sound:
 			Concrete: 75
 		DamageTypes: Prone50Percent, TriggerProne, SoundDeath
 
-ChainGun:
-	ReloadDelay: 10
-	Range: 5c0
-	MinRange: 1c0
-	Report: 20MMGUN1.WAV
-	Projectile: Bullet
-		Speed: 1c256
-		Blockable: false
-	Warhead@1Dam: SpreadDamage
-		Spread: 96
-		Damage: 20
-		Versus:
-			Wood: 50
-			Light: 60
-			Heavy: 25
-			Concrete: 25
-		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
-	Warhead@2Eff: CreateEffect
-		Explosion: piffs
-
 Heal:
 	ReloadDelay: 160
 	Range: 4c0