diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml
index bdef1e6814..5cc1e17c29 100644
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -1026,7 +1026,7 @@ GACTWR:
 	Armament@SAM:
 		UpgradeTypes: tower.sam
 		UpgradeMinEnabledLevel: 1
-		Weapon: SAMTower
+		Weapon: RedEye2
 		LocalOffset: 512,0,512
 	WithMuzzleFlash:
 		UpgradeTypes: tower.vulcan
@@ -1139,7 +1139,7 @@ NASAM:
 	WithTurret:
 		Recoils: no
 	Armament:
-		Weapon: SAMTower
+		Weapon: RedEye2
 		LocalOffset: 512,0,512
 	Power:
 		Amount: -30
@@ -1177,7 +1177,7 @@ NALASR:
 		Offset: 298,-171,0
 	AttackTurreted:
 	Armament:
-		Weapon: TurretLaser
+		Weapon: LaserFire2
 	RenderVoxels:
 	WithVoxelTurret:
 	AutoTarget:
@@ -1212,7 +1212,7 @@ NAOBEL:
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
 	Armament:
-		Weapon: ObeliskLaser
+		Weapon: LaserFire
 		LocalOffset: 0,0,725
 	AttackCharge:
 		ReloadTime: 50
diff --git a/mods/ts/weapons/energyweapons.yaml b/mods/ts/weapons/energyweapons.yaml
index 617891a7db..2cab2d240f 100644
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -125,7 +125,8 @@ Proton:
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 
-ObeliskLaser:
+# Obelisk laser
+LaserFire:
 	ReloadDelay: 120
 	Range: 10c512
 	Charges: true
@@ -138,7 +139,8 @@ ObeliskLaser:
 		DeathType: 5
 		ProneModifier: 60
 
-TurretLaser:
+# Laser turret
+LaserFire2:
 	ReloadDelay: 40
 	Range: 5c512
 	Report: LASTUR1.AUD
diff --git a/mods/ts/weapons/missiles.yaml b/mods/ts/weapons/missiles.yaml
index caf5dd906e..3b1247f07b 100644
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -244,13 +244,13 @@ Hellfire:
 	Warhead@5Smu: LeaveSmudge
 		SmudgeType: SmallCrater
 
-SAMTower:
+RedEye2:
 	ReloadDelay: 55
 	Range: 15c0
 	Report: SAMSHOT1.AUD
 	ValidTargets: Air
 	Projectile: Missile
-		Speed: 298
+		Speed: 384
 		Arm: 2
 		Blockable: false
 		Shadow: true