diff --git a/mods/cnc/rules/ai.yaml b/mods/cnc/rules/ai.yaml
index 90ffbafbba..4e36253d7d 100644
--- a/mods/cnc/rules/ai.yaml
+++ b/mods/cnc/rules/ai.yaml
@@ -1,6 +1,6 @@
 Player:
-	HackyAI@Default:
-		Name: Easy AI
+	HackyAI@Cabal:
+		Name:Cabal
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -61,8 +61,8 @@ Player:
 			heli: 5%
 			orca: 5%
 		SquadSize: 15
-	HackyAI@Normal:
-		Name: Normal AI
+	HackyAI@Watson:
+		Name:Watson
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -123,8 +123,8 @@ Player:
 			jeep: 20%
 			mtnk: 50%
 		SquadSize: 15
-	HackyAI@hard:
-		Name: Hard AI
+	HackyAI@HAL9001:
+		Name:HAL 9001
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -187,4 +187,3 @@ Player:
 			htnk: 50%
 			orca: 10%
 		SquadSize: 8
-
diff --git a/mods/ra/rules/ai.yaml b/mods/ra/rules/ai.yaml
index bf46a08b3c..dd786b174d 100644
--- a/mods/ra/rules/ai.yaml
+++ b/mods/ra/rules/ai.yaml
@@ -1,6 +1,6 @@
 Player:
-	HackyAI@EasyAI:
-		Name: Easy AI
+	HackyAI@RushAI:
+		Name: Rush AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -117,8 +117,8 @@ Player:
 			ca: 10%
 			pt: 10%
 		SquadSize: 40
-	HackyAI@HardAI:
-		Name: Hard AI
+	HackyAI@TurtleAI:
+		Name: Turtle AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -182,81 +182,8 @@ Player:
 			ca: 10%
 			pt: 10%
 		SquadSize: 10
-	HackyAI@TestAI:
-		Name: Test AI
-		BuildingCommonNames:
-			ConstructionYard: fact
-			Refinery: proc
-			Power: powr,apwr
-			Barracks: barr,tent
-			VehiclesFactory: weap
-			Silo: silo
-		UnitsCommonNames:
-			Mcv: mcv
-		BuildingLimits:
-			proc: 4
-			barr: 1
-			tent: 1
-			dome: 1
-			weap: 1
-			spen: 1
-			syrd: 1
-			hpad: 4
-			afld: 4
-			atek: 1
-			stek: 1
-			fix: 1
-		BuildingFractions:
-			proc: 29%
-			powr: 1%
-			apwr: 24%
-			tent: 3%
-			barr: 3%
-			dome: 1%
-			weap: 5%
-			hpad: 5%
-			afld: 5%
-			fix: 1%
-			atek: 1%
-			stek: 1%
-			spen: 1%
-			syrd: 1%
-			pbox.e1: 12%
-			gun: 12%
-			ftur: 12%
-			tsla: 12%
-			agun: 5%
-			sam: 5%
-			mslo: 1%
-		UnitsToBuild:
-			e1: 4%
-			e2: 4%
-			e3: 8%
-			e4: 4%
-			shok: 3%
-			harv: 1%
-			apc: 3%
-			jeep: 5%
-			ftrk: 8%
-			1tnk: 9%
-			2tnk: 20%
-			3tnk: 10%
-			4tnk: 14%
-			ttnk: 8%
-			arty: 15%
-			v2rl: 10%
-			heli: 7%
-			hind: 7%
-			mig: 10%
-			yak: 1%
-			ss: 7%
-			msub: 5%
-			dd: 8%
-			ca: 8%
-			pt: 8%
-		SquadSize: 10
-	HackyAI@IslandMapAI:
-		Name: Island Map AI
+	HackyAI@NavalAI:
+		Name: Naval AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -305,176 +232,3 @@ Player:
 			ca: 20%
 			pt: 10%
 		SquadSize: 1
-	HackyAI@HightechAI:
-		Name: High-Tech AI
-		BuildingCommonNames:
-			ConstructionYard: fact
-			Refinery: proc
-			Power: powr,apwr
-			Barracks: barr,tent
-			VehiclesFactory: weap
-			Silo: silo
-		UnitsCommonNames:
-			Mcv: mcv
-		BuildingLimits:
-			proc: 4
-			barr: 1
-			tent: 1
-			dome: 1
-			weap: 1
-			fix: 1
-			spen: 1
-			syrd: 1
-			hpad: 4
-			afld: 4
-			atek: 1
-			stek: 1
-			pdox: 1
-			mslo: 1
-			e7: 1
-			e8: 1
-		BuildingFractions:
-			proc: 25.1%
-			powr: 35%
-			tent: 1%
-			barr: 1%
-			weap: 1%
-			fix: 1%
-			dome: 1%
-			atek: 1%
-			stek: 1%
-			pdox: 1%
-			mslo: 1%
-			pbox.e1: 15%
-			gun: 15%
-			ftur: 15%
-			tsla: 15%
-			agun: 5%
-			sam: 5%
-		UnitsToBuild:
-			e1: 50%
-			e2: 1%
-			e3: 10%
-			medi: 1%
-			e7: 100%
-			e8: 100%
-			apc: 1%
-			jeep: 1%
-			ftrk: 1%
-			1tnk: 5%
-			2tnk: 5%
-			3tnk: 5%
-			4tnk: 100%
-			arty: 5%
-			v2rl: 5%
-			yak: 5%
-			mig: 100%
-			ctnk: 100%
-			ttnk: 100%
-			dd: 5%
-			ca: 100%
-			ss: 5%
-			msub: 100%
-		SquadSize: 10
-	HackyAI@LongrangeAI:
-		Name: Long-Range AI
-		BuildingCommonNames:
-			ConstructionYard: fact
-			Refinery: proc
-			Power: powr,apwr
-			Barracks: barr,tent
-			VehiclesFactory: weap
-			Silo: silo
-		UnitsCommonNames:
-			Mcv: mcv
-		BuildingLimits:
-			proc: 4
-			barr: 1
-			tent: 1
-			dome: 1
-			weap: 1
-			spen: 1
-			syrd: 1
-			hpad: 4
-			afld: 4
-			atek: 1
-			stek: 1
-			fix: 1
-		BuildingFractions:
-			proc: 20%
-			powr: 35%
-			tent: 1%
-			barr: 1%
-			weap: 1%
-			pbox.e1: 4%
-			hbox.e1: 3%
-			gun: 10%
-			ftur: 10%
-			tsla: 5%
-			dome: 10%
-			fix: 0.1%
-			agun: 7%
-			sam: 7%
-			atek: 1%
-			stek: 1%
-		UnitsToBuild:
-			e1: 4%
-			e3: 1%
-			harv: 10%
-			ftrk: 5%
-			v2rl: 40%
-			arty: 40%
-			1tnk: 15%
-			2tnk: 15%
-			3tnk: 15%
-		SquadSize: 25
-	HackyAI@TankAI:
-		Name: Tank AI
-		BuildingCommonNames:
-			ConstructionYard: fact
-			Refinery: proc
-			Power: powr,apwr
-			Barracks: barr,tent
-			VehiclesFactory: weap
-			Silo: silo
-		UnitsCommonNames:
-			Mcv: mcv
-		BuildingLimits:
-			proc: 4
-			barr: 1
-			tent: 1
-			dome: 1
-			weap: 1
-			spen: 1
-			syrd: 1
-			hpad: 4
-			afld: 4
-			atek: 1
-			stek: 1
-			fix: 1
-		BuildingFractions:
-			proc: 30%
-			powr: 35%
-			tent: 1%
-			barr: 1%
-			weap: 1%
-			pbox.e1: 7%
-			gun: 7%
-			ftur: 10%
-			tsla: 5%
-			fix: 0.1%
-			dome: 10%
-			agun: 5%
-			sam: 1%
-			atek: 1%
-			stek: 1%
-		UnitsToBuild:
-			e1: 5%
-			e3: 10%
-			3tnk: 75%
-			2tnk: 75%
-			v2rl: 15%
-			arty: 15%
-			harv: 10%
-		SquadSize: 7
-