diff --git a/src/files/setup/setupame.c b/src/files/setup/setupame.c
index 6e2fefb17..00570c80a 100644
--- a/src/files/setup/setupame.c
+++ b/src/files/setup/setupame.c
@@ -508,25 +508,25 @@ u8 props[] = {
 	chr(0x00010400, CHR_SECRETARY, 0x01c3, BODY_NEGOTIATOR, HEAD_SECRETARY, GAILIST_IDLE, -1, -1, 1000, 100, 0x0000c400, 0x00000000, TEAM_ENEMY, SQUADRON_03, -1, 0, 0x00000000)
 	chr(0x00010480, CHR_PROGRAMMER, 0x007a, BODY_OFFICEWORKER, HEAD_RANDOM, AILIST_PROGRAMMER, -1, -1, 50, 100, 0x00002000, 0x00000000, TEAM_ENEMY, SQUADRON_0F, -1, 0, 0x00000000)
 	tag(0x1f, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x20, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x21, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x22, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x23, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x24, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x25, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x26, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x27, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x28, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	link_scenery(1, 0, 2)
 	door(0x0100, MODEL_DD_AC_UNEXP, 0x019f, 0x13500d00, 0x20304300, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00010000, 0x03e80000, 0x03e80000, 0x00010000, 0x00000000, 0x00000080, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
 	stdobject(0x0100, MODEL_DD_AC_EXP, 0x01a1, 0x031204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
diff --git a/src/files/setup/setupark.c b/src/files/setup/setupark.c
index b3d060df1..95104da75 100644
--- a/src/files/setup/setupark.c
+++ b/src/files/setup/setupark.c
@@ -1092,7 +1092,7 @@ u8 func0406_general_combat[] = {
 
 u8 func0408_hovercopter[] = {
 	set_target_chr(CHR_BOND)
-	heli_arm_weapons
+	chopper_arm_weapons
 	move_object_to_pad(OBJ_HOVERCOPTER, 0x0199)
 	begin_hovercar_path(0x02)
 	restart_timer
diff --git a/src/files/setup/setupcave.c b/src/files/setup/setupcave.c
index 6c7f85946..6a5546e0b 100644
--- a/src/files/setup/setupcave.c
+++ b/src/files/setup/setupcave.c
@@ -442,10 +442,10 @@ u8 props[] = {
 	door(0x0100, MODEL_AF1_INNERDOOR, 0x018f, 0x10000400, 0x20000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x0000f333, 0x0000e666, 0x00005555, 0x00005555, 0x000007ae, 0x00040000, 0x00000002, 0x00000384, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x19, 1)
 	multimonitor(0x0099, MODEL_COMHUB, 0x0154, 0x00000102, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03030300)
-	hover_vehicle(0x0080, MODEL_TESTERBOT, 0x01ba, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000042e, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
-	hover_vehicle(0x0080, MODEL_HOOVERBOT, 0x01ba, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000042f, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
-	hover_vehicle(0x0080, MODEL_HOOVERBOT, 0x01c3, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000431, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
-	hover_vehicle(0x004c, MODEL_TESTERBOT, 0x01c3, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000432, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x0080, MODEL_TESTERBOT, 0x01ba, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000042e, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x0080, MODEL_HOOVERBOT, 0x01ba, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x0000042f, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x0080, MODEL_HOOVERBOT, 0x01c3, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000431, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_TESTERBOT, 0x01c3, 0xe0000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000432, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x03, 1)
 	weapon(0x0040, MODEL_SAFEITEM, 0x00d6, 0x00000008, 0x00000000, 0x00400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_FLIGHTPLANS, 0x00ffffff, 0x00000000)
 	rename_object(-1, 0x42, 0x0e14, 0x0e15, 0x0e16, 0x0e17, 0x0e18, 0x0000, 0x0000) // "Obtain flight plans from safe."
diff --git a/src/files/setup/setupear.c b/src/files/setup/setupear.c
index 9d2a16a38..6cbdb89be 100644
--- a/src/files/setup/setupear.c
+++ b/src/files/setup/setupear.c
@@ -447,9 +447,9 @@ u8 props[] = {
 	tag(0x0a, 1)
 	singlemonitor(0x0100, MODEL_SINISTERPC, 0x025a, 0x010004e1, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffff03)
 	tag(0x37, 1)
-	hover_vehicle(0x00c0, MODEL_HOOVERBOT, 0x0001, 0xe0000008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000411, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x00c0, MODEL_HOOVERBOT, 0x0001, 0xe0000008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000411, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x38, 1)
-	hover_vehicle(0x00c0, MODEL_TESTERBOT, 0x003b, 0xc0020008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000412, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x00c0, MODEL_TESTERBOT, 0x003b, 0xc0020008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, 0x00000412, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	glass(0x0100, MODEL_WINDOW, 0x01b3, 0x04000b62, 0x00104000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000)
 	glass(0x0100, MODEL_WINDOW, 0x01b4, 0x04000b62, 0x00104000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000)
 	glass(0x0100, MODEL_WINDOW, 0x01b8, 0x04000b62, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000)
diff --git a/src/files/setup/setuplue.c b/src/files/setup/setuplue.c
index 9616a8f23..7aaf3812b 100644
--- a/src/files/setup/setuplue.c
+++ b/src/files/setup/setuplue.c
@@ -1675,7 +1675,7 @@ u8 func040a_top_interceptor[] = {
 
 	label(0x06)
 	unset_object_flag_bank0(OBJ_INTERCEPTOR3, OBJECTFLAG0_INTERCEPTOR_DISABLED)
-	heli_arm_weapons
+	chopper_arm_weapons
 	begin_hovercar_path(0x22)
 	set_chr_maxdamage(CHR_SELF, 5000)
 
diff --git a/src/files/setup/setuppete.c b/src/files/setup/setuppete.c
index 4eba05d3f..09d4785f7 100644
--- a/src/files/setup/setuppete.c
+++ b/src/files/setup/setuppete.c
@@ -233,9 +233,9 @@ u8 props[] = {
 	tag(0x1f, 1)
 	stdobject(0x0100, MODEL_CHRBRIEFCASE, 0x009c, 0x012004e1, 0x00086000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
 	tag(0x0a, 1)
-	hover_vehicle(0x0100, MODEL_TAXICAB, 0x00a3, 0x20000108, 0x00000001, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000002bc, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x0100, MODEL_TAXICAB, 0x00a3, 0x20000108, 0x00000001, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000002bc, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x0c, 1)
-	hover_vehicle(0x00cc, MODEL_LIMO, 0x00a4, 0x20000108, 0x00000001, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000002bc, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x00cc, MODEL_LIMO, 0x00a4, 0x20000108, 0x00000001, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000002bc, 0x00000000, 0x00000000, 0x0fff0000, 0x0000040d, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x21, 1)
 	stdobject(0x0100, MODEL_WIREFENCE, 0xffff, 0x00021501, 0x00008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
 	tag(0x08, 1)
diff --git a/src/files/setup/setupwax.c b/src/files/setup/setupwax.c
index 6a97e0218..c10527efc 100644
--- a/src/files/setup/setupwax.c
+++ b/src/files/setup/setupwax.c
@@ -425,25 +425,25 @@ u8 props[] = {
 
 	link_collectibles(-1, -2)
 	tag(0x1f, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x20, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCOP, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x21, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x22, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAR, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x23, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x24, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVMOTO, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x25, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x26, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVTRUCK, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x27, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	tag(0x28, 1)
-	hover_vehicle(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
+	hovercar(0x004c, MODEL_DD_HOVCAB, 0x0144, 0x20000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x0fff0000, AILIST_INIT_HOVERCAR, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000)
 	link_scenery(1, 0, 2)
 	door(0x0100, MODEL_DD_AC_UNEXP, 0x019f, 0x13500d00, 0x20304300, 0x04000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00010000, 0x03e80000, 0x03e80000, 0x00010000, 0x00000000, 0x00000080, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
 	stdobject(0x0100, MODEL_DD_AC_EXP, 0x01a1, 0x031204e8, 0x00304300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c
index d5ad7287c..7ea0c751b 100644
--- a/src/game/chr/chrai.c
+++ b/src/game/chr/chrai.c
@@ -54,9 +54,9 @@ u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label)
 void chraiExecute(void *entity, s32 proptype)
 {
 	g_Vars.chrdata = NULL;
-	g_Vars.objdata = NULL;
-	g_Vars.aicdata = NULL;
-	g_Vars.hovdata = NULL;
+	g_Vars.truck = NULL;
+	g_Vars.heli = NULL;
+	g_Vars.hovercar = NULL;
 	g_Vars.ailist = NULL;
 	g_Vars.aioffset = 0;
 
@@ -65,27 +65,27 @@ void chraiExecute(void *entity, s32 proptype)
 	} else if (proptype == PROPTYPE_OBJ) {
 		struct defaultobj *obj = entity;
 
-		if (obj->type == OBJTYPE_27) {
-			g_Vars.objdata = entity;
-		} else if (obj->type == OBJTYPE_28) {
-			g_Vars.aicdata = entity;
-		} else if (obj->type == OBJTYPE_HOVERVEHICLE || obj->type == OBJTYPE_HELI) {
-			g_Vars.hovdata = entity;
+		if (obj->type == OBJTYPE_TRUCK) {
+			g_Vars.truck = entity;
+		} else if (obj->type == OBJTYPE_HELI) {
+			g_Vars.heli = entity;
+		} else if (obj->type == OBJTYPE_HOVERCAR || obj->type == OBJTYPE_CHOPPER) {
+			g_Vars.hovercar = entity;
 		}
 	}
 
 	if (g_Vars.chrdata) {
 		g_Vars.ailist = g_Vars.chrdata->ailist;
 		g_Vars.aioffset = g_Vars.chrdata->aioffset;
-	} else if (g_Vars.objdata) {
-		g_Vars.ailist = g_Vars.objdata->ailist;
-		g_Vars.aioffset = g_Vars.objdata->aioffset;
-	} else if (g_Vars.aicdata) {
-		g_Vars.ailist = g_Vars.aicdata->ailist;
-		g_Vars.aioffset = g_Vars.aicdata->aioffset;
-	} else if (g_Vars.hovdata) {
-		g_Vars.ailist = g_Vars.hovdata->ailist;
-		g_Vars.aioffset = g_Vars.hovdata->aioffset;
+	} else if (g_Vars.truck) {
+		g_Vars.ailist = g_Vars.truck->ailist;
+		g_Vars.aioffset = g_Vars.truck->aioffset;
+	} else if (g_Vars.heli) {
+		g_Vars.ailist = g_Vars.heli->ailist;
+		g_Vars.aioffset = g_Vars.heli->aioffset;
+	} else if (g_Vars.hovercar) {
+		g_Vars.ailist = g_Vars.hovercar->ailist;
+		g_Vars.aioffset = g_Vars.hovercar->aioffset;
 	}
 
 	if (g_Vars.ailist) {
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index b8b6a5bb7..05dd0b8de 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -157,15 +157,15 @@ bool aiYield(void)
 	if (g_Vars.chrdata) {
 		g_Vars.chrdata->ailist = g_Vars.ailist;
 		g_Vars.chrdata->aioffset = g_Vars.aioffset;
-	} else if (g_Vars.objdata) {
-		g_Vars.objdata->ailist = g_Vars.ailist;
-		g_Vars.objdata->aioffset = g_Vars.aioffset;
-	} else if (g_Vars.aicdata) {
-		g_Vars.aicdata->ailist = g_Vars.ailist;
-		g_Vars.aicdata->aioffset = g_Vars.aioffset;
-	} else if (g_Vars.hovdata) {
-		g_Vars.hovdata->ailist = g_Vars.ailist;
-		g_Vars.hovdata->aioffset = g_Vars.aioffset;
+	} else if (g_Vars.truck) {
+		g_Vars.truck->ailist = g_Vars.ailist;
+		g_Vars.truck->aioffset = g_Vars.aioffset;
+	} else if (g_Vars.heli) {
+		g_Vars.heli->ailist = g_Vars.ailist;
+		g_Vars.heli->aioffset = g_Vars.aioffset;
+	} else if (g_Vars.hovercar) {
+		g_Vars.hovercar->ailist = g_Vars.ailist;
+		g_Vars.hovercar->aioffset = g_Vars.aioffset;
 	}
 
 	return true;
@@ -219,12 +219,12 @@ bool aiSetReturnList(void)
 				chr->aireturnlist = ailistid;
 			}
 		}
-	} else if (g_Vars.objdata) {
-		g_Vars.objdata->aireturnlist = ailistid;
-	} else if (g_Vars.aicdata) {
-		g_Vars.aicdata->aireturnlist = ailistid;
-	} else if (g_Vars.hovdata) {
-		g_Vars.hovdata->aireturnlist = ailistid;
+	} else if (g_Vars.truck) {
+		g_Vars.truck->aireturnlist = ailistid;
+	} else if (g_Vars.heli) {
+		g_Vars.heli->aireturnlist = ailistid;
+	} else if (g_Vars.hovercar) {
+		g_Vars.hovercar->aireturnlist = ailistid;
 	}
 
 	g_Vars.aioffset += 5;
@@ -350,12 +350,12 @@ bool aiReturn(void)
 
 	if (g_Vars.chrdata) {
 		ailist = ailistFindById(g_Vars.chrdata->aireturnlist);
-	} else if (g_Vars.objdata) {
-		ailist = ailistFindById(g_Vars.objdata->aireturnlist);
-	} else if (g_Vars.aicdata) {
-		ailist = ailistFindById(g_Vars.aicdata->aireturnlist);
-	} else if (g_Vars.hovdata) {
-		ailist = ailistFindById(g_Vars.hovdata->aireturnlist);
+	} else if (g_Vars.truck) {
+		ailist = ailistFindById(g_Vars.truck->aireturnlist);
+	} else if (g_Vars.heli) {
+		ailist = ailistFindById(g_Vars.heli->aireturnlist);
+	} else if (g_Vars.hovercar) {
+		ailist = ailistFindById(g_Vars.hovercar->aireturnlist);
 	}
 
 	g_Vars.ailist = ailist;
@@ -383,8 +383,8 @@ bool aiStop(void)
 {
 	if (g_Vars.chrdata) {
 		chrTryStop(g_Vars.chrdata);
-	} else if (g_Vars.hovdata) {
-		heliStop(g_Vars.hovdata);
+	} else if (g_Vars.hovercar) {
+		chopperStop(g_Vars.hovercar);
 	}
 
 	g_Vars.aioffset += 2;
@@ -947,7 +947,7 @@ bool aiAimAndFire2(void)
 	u32 thingtype = cmd[3] | (cmd[2] << 8);
 
 	if ((g_Vars.chrdata && func0f03a76c(g_Vars.chrdata, thingtype, thingid)) ||
-			(g_Vars.hovdata && heliAttack(g_Vars.hovdata))) {
+			(g_Vars.hovercar && chopperAttack(g_Vars.hovercar))) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]);
 	} else {
 		g_Vars.aioffset += 7;
@@ -1428,7 +1428,7 @@ bool aiIfRandomLessThan(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
 	if ((g_Vars.chrdata && g_Vars.chrdata->random < cmd[2]) ||
-			(g_Vars.hovdata && ((u8)random()) < cmd[2])) {
+			(g_Vars.hovercar && ((u8)random()) < cmd[2])) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -1445,7 +1445,7 @@ bool aiIfRandomGreaterThan(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
 	if ((g_Vars.chrdata && g_Vars.chrdata->random > cmd[2]) ||
-			(g_Vars.hovdata && ((u8)random()) > cmd[2])) {
+			(g_Vars.hovercar && ((u8)random()) > cmd[2])) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -1661,7 +1661,7 @@ bool aiIfSawDeath(void)
 bool aiIfSeesPlayer(void)
 {
 	if ((g_Vars.chrdata && func0f039368(g_Vars.chrdata)) ||
-			(g_Vars.hovdata && func0f07ae18(g_Vars.hovdata, 0x40) && heliCheckTargetVisible(g_Vars.hovdata))) {
+			(g_Vars.hovercar && func0f07ae18(g_Vars.hovercar, 0x40) && chopperCheckTargetVisible(g_Vars.hovercar))) {
 		u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
 	} else {
@@ -1677,7 +1677,7 @@ bool aiIfSeesPlayer(void)
 bool ai017a(void)
 {
 	if ((g_Vars.chrdata && g_Vars.chrdata->prop && func0f0391ec(g_Vars.chrdata, &g_Vars.chrdata->prop->pos, &g_Vars.chrdata->prop->rooms[0], 1))
-			|| (g_Vars.hovdata && func0f07ae18(g_Vars.hovdata, 0x40) && heliCheckTargetVisible(g_Vars.hovdata))) {
+			|| (g_Vars.hovercar && func0f07ae18(g_Vars.hovercar, 0x40) && chopperCheckTargetVisible(g_Vars.hovercar))) {
 		u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
 	} else {
@@ -4426,7 +4426,7 @@ glabel aiSetMaxDamage
 .L0f053a04:
 /*  f053a04:	44caf800 */ 	ctc1	$t2,$31
 /*  f053a08:	30abffff */ 	andi	$t3,$a1,0xffff
-/*  f053a0c:	0fc1ec56 */ 	jal	heliSetMaxDamage
+/*  f053a0c:	0fc1ec56 */ 	jal	chopperSetMaxDamage
 /*  f053a10:	01602825 */ 	or	$a1,$t3,$zero
 /*  f053a14:	10000021 */ 	beqz	$zero,.L0f053a9c
 /*  f053a18:	8e0d0438 */ 	lw	$t5,0x438($s0)
@@ -5121,8 +5121,8 @@ bool aiSetPadPreset(void)
 
 	if (g_Vars.chrdata) {
 		chrSetPadPreset(g_Vars.chrdata, pad_id);
-	} else if (g_Vars.aicdata) {
-		g_Vars.aicdata->base.pad = pad_id;
+	} else if (g_Vars.heli) {
+		g_Vars.heli->base.pad = pad_id;
 	}
 
 	g_Vars.aioffset += 4;
@@ -5219,8 +5219,8 @@ bool aiRestartTimer(void)
 {
 	if (g_Vars.chrdata) {
 		chrRestartTimer(g_Vars.chrdata);
-	} else if (g_Vars.hovdata) {
-		heliRestartTimer(g_Vars.hovdata);
+	} else if (g_Vars.hovercar) {
+		chopperRestartTimer(g_Vars.hovercar);
 	}
 
 	g_Vars.aioffset += 2;
@@ -5341,7 +5341,7 @@ glabel aiIfTimerLessThan
 /*  f0551b0:	50800014 */ 	beqzl	$a0,.L0f055204
 /*  f0551b4:	8c6d0438 */ 	lw	$t5,0x438($v1)
 /*  f0551b8:	afa2001c */ 	sw	$v0,0x1c($sp)
-/*  f0551bc:	0fc1ec48 */ 	jal	heliGetTimer
+/*  f0551bc:	0fc1ec48 */ 	jal	chopperGetTimer
 /*  f0551c0:	e7a20018 */ 	swc1	$f2,0x18($sp)
 /*  f0551c4:	c7a20018 */ 	lwc1	$f2,0x18($sp)
 /*  f0551c8:	3c03800a */ 	lui	$v1,%hi(g_Vars)
@@ -5412,7 +5412,7 @@ glabel aiIfTimerGreaterThan
 /*  f05529c:	8e040430 */ 	lw	$a0,0x430($s0)
 /*  f0552a0:	50800005 */ 	beqzl	$a0,.L0f0552b8
 /*  f0552a4:	8e040424 */ 	lw	$a0,0x424($s0)
-/*  f0552a8:	0fc1ec48 */ 	jal	heliGetTimer
+/*  f0552a8:	0fc1ec48 */ 	jal	chopperGetTimer
 /*  f0552ac:	afa20024 */ 	sw	$v0,0x24($sp)
 /*  f0552b0:	8fa20024 */ 	lw	$v0,0x24($sp)
 /*  f0552b4:	8e040424 */ 	lw	$a0,0x424($s0)
@@ -5431,7 +5431,7 @@ glabel aiIfTimerGreaterThan
 .L0f0552e4:
 /*  f0552e4:	50800010 */ 	beqzl	$a0,.L0f055328
 /*  f0552e8:	8e0d0438 */ 	lw	$t5,0x438($s0)
-/*  f0552ec:	0fc1ec48 */ 	jal	heliGetTimer
+/*  f0552ec:	0fc1ec48 */ 	jal	chopperGetTimer
 /*  f0552f0:	afa20024 */ 	sw	$v0,0x24($sp)
 /*  f0552f4:	c7a40020 */ 	lwc1	$f4,0x20($sp)
 /*  f0552f8:	8fa20024 */ 	lw	$v0,0x24($sp)
@@ -6575,7 +6575,7 @@ glabel ai00d5
 .L0f056968:
 /*  f056968:	50800032 */ 	beqzl	$a0,.L0f056a34
 /*  f05696c:	8cb80438 */ 	lw	$t8,0x438($a1)
-/*  f056970:	0fc1eb7d */ 	jal	heliFromObj
+/*  f056970:	0fc1eb7d */ 	jal	chopperFromHovercar
 /*  f056974:	afa60018 */ 	sw	$a2,0x18($sp)
 /*  f056978:	3c05800a */ 	lui	$a1,%hi(g_Vars)
 /*  f05697c:	24a59fc0 */ 	addiu	$a1,$a1,%lo(g_Vars)
@@ -8274,8 +8274,8 @@ bool aiSetTarget(void)
 			g_Vars.chrdata->chrflags &= ~CHRCFLAG_NEAR_MISS;
 			g_Vars.chrdata->target = prop_id;
 		}
-	} else if (g_Vars.hovdata) {
-		heliSetTarget(g_Vars.hovdata, cmd[2]);
+	} else if (g_Vars.hovercar) {
+		chopperSetTarget(g_Vars.hovercar, cmd[2]);
 	}
 
 	g_Vars.aioffset += 5;
@@ -10823,8 +10823,8 @@ bool aiIfHeliWeaponsArmed(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
-	if (g_Vars.hovdata) {
-		if (g_Vars.hovdata->weaponsarmed) {
+	if (g_Vars.hovercar) {
+		if (g_Vars.hovercar->weaponsarmed) {
 			g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
 		} else {
 			g_Vars.aioffset += 3;
@@ -10843,8 +10843,9 @@ bool aiIfHoverbotNextStep(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 
-	if (g_Vars.hovdata) {
-		if ((g_Vars.hovdata->nextstep > cmd[3] && cmd[2] == 1) || (g_Vars.hovdata->nextstep < cmd[3] && cmd[2] == 0)) {
+	if (g_Vars.hovercar) {
+		if ((g_Vars.hovercar->nextstep > cmd[3] && cmd[2] == 1) ||
+				(g_Vars.hovercar->nextstep < cmd[3] && cmd[2] == 0)) {
 			g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
 		} else {
 			g_Vars.aioffset += 5;
@@ -11126,8 +11127,8 @@ bool aiSetPadPresetToInvestigationTerminal(void)
  */
 bool aiHeliArmWeapons(void)
 {
-	if (g_Vars.hovdata) {
-		heliSetArmed(&g_Vars.hovdata->base, true);
+	if (g_Vars.hovercar) {
+		chopperSetArmed(g_Vars.hovercar, true);
 	}
 
 	g_Vars.aioffset += 2;
@@ -11140,8 +11141,8 @@ bool aiHeliArmWeapons(void)
  */
 bool aiHeliUnarmWeapons(void)
 {
-	if (g_Vars.hovdata) {
-		heliSetArmed(&g_Vars.hovdata->base, false);
+	if (g_Vars.hovercar) {
+		chopperSetArmed(g_Vars.hovercar, false);
 	}
 
 	g_Vars.aioffset += 2;
@@ -11555,7 +11556,7 @@ glabel aiIfAction
 bool aiHovercopterFireRocket(void)
 {
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
-	heliFireRocket(g_Vars.hovdata, cmd[2]);
+	chopperFireRocket(g_Vars.hovercar, cmd[2]);
 	g_Vars.aioffset += 3;
 
 	return false;
@@ -11617,11 +11618,11 @@ bool aiIfY(void)
 	struct chrdata *chr = NULL;
 	f32 cutoff_y = ((cmd[4] | (cmd[3] << 8)) << 16) >> 16;
 
-	if (cmd[2] == CHR_TARGET && g_Vars.hovdata) {
-		struct heliobj *heli = heliFromObj(&g_Vars.hovdata->base);
+	if (cmd[2] == CHR_TARGET && g_Vars.hovercar) {
+		struct chopperobj *chopper = chopperFromHovercar(g_Vars.hovercar);
 
-		if (heli) {
-			struct prop *target = heliGetTargetProp(heli);
+		if (chopper) {
+			struct prop *target = chopperGetTargetProp(chopper);
 
 			if (target && (target->type == PROPTYPE_CHR || target->type == PROPTYPE_PLAYER)) {
 				chr = target->chr;
diff --git a/src/game/game_015010.c b/src/game/game_015010.c
index d82320022..126b2767a 100644
--- a/src/game/game_015010.c
+++ b/src/game/game_015010.c
@@ -134,8 +134,8 @@ glabel setupParseObjects
 //			case OBJTYPE_11:
 //			case OBJTYPE_MULTIAMMOCRATE:
 //			case OBJTYPE_24:
-//			case OBJTYPE_27:
-//			case OBJTYPE_28:
+//			case OBJTYPE_TRUCK:
+//			case OBJTYPE_HELI:
 //			case OBJTYPE_29:
 //			case OBJTYPE_GLASS:
 //			case OBJTYPE_2B:
@@ -145,8 +145,8 @@ glabel setupParseObjects
 //			case OBJTYPE_HOVERBIKE:
 //			case OBJTYPE_HOVERPROP:
 //			case OBJTYPE_VENTFAN:
-//			case OBJTYPE_HOVERVEHICLE:
-//			case OBJTYPE_HELI:
+//			case OBJTYPE_HOVERCAR:
+//			case OBJTYPE_CHOPPER:
 //			case OBJTYPE_ESCALATOR:
 //				setupParseObjectWithArg2False(ptr, 1);
 //			}
diff --git a/src/game/game_066310.c b/src/game/game_066310.c
index 2b514ca7a..5f8a175cb 100644
--- a/src/game/game_066310.c
+++ b/src/game/game_066310.c
@@ -24575,19 +24575,19 @@ glabel func0f07accc
 /*  f07adb4:	27bd00f8 */ 	addiu	$sp,$sp,0xf8
 );
 
-struct prop *heliGetTargetProp(struct heliobj *heli)
+struct prop *chopperGetTargetProp(struct chopperobj *chopper)
 {
-	if (heli->target == -1) {
+	if (chopper->target == -1) {
 		return g_Vars.currentplayer->prop;
 	}
 
-	return g_Vars.props + heli->target;
+	return g_Vars.props + chopper->target;
 }
 
-struct heliobj *heliFromObj(struct defaultobj *obj)
+struct chopperobj *chopperFromHovercar(struct chopperobj *chopper)
 {
-	if (obj->type == OBJTYPE_HELI) {
-		return (struct heliobj *) obj;
+	if (chopper->base.type == OBJTYPE_CHOPPER) {
+		return chopper;
 	}
 
 	return NULL;
@@ -24597,7 +24597,7 @@ GLOBAL_ASM(
 glabel func0f07ae18
 /*  f07ae18:	27bdffd8 */ 	addiu	$sp,$sp,-40
 /*  f07ae1c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f07ae20:	0fc1eb7d */ 	jal	heliFromObj
+/*  f07ae20:	0fc1eb7d */ 	jal	chopperFromHovercar
 /*  f07ae24:	afa5002c */ 	sw	$a1,0x2c($sp)
 /*  f07ae28:	00402025 */ 	or	$a0,$v0,$zero
 /*  f07ae2c:	1040003c */ 	beqz	$v0,.L0f07af20
@@ -24605,7 +24605,7 @@ glabel func0f07ae18
 /*  f07ae34:	c444007c */ 	lwc1	$f4,0x7c($v0)
 /*  f07ae38:	a3a00023 */ 	sb	$zero,0x23($sp)
 /*  f07ae3c:	afa20024 */ 	sw	$v0,0x24($sp)
-/*  f07ae40:	0fc1eb6e */ 	jal	heliGetTargetProp
+/*  f07ae40:	0fc1eb6e */ 	jal	chopperGetTargetProp
 /*  f07ae44:	e7a4001c */ 	swc1	$f4,0x1c($sp)
 /*  f07ae48:	8fa40024 */ 	lw	$a0,0x24($sp)
 /*  f07ae4c:	c4480008 */ 	lwc1	$f8,0x8($v0)
@@ -24673,45 +24673,45 @@ glabel func0f07ae18
 /*  f07af30:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-bool heliCheckTargetVisible(struct defaultobj *obj)
+bool chopperCheckTargetVisible(struct chopperobj *obj)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
+	if (chopper) {
 		bool visible = false;
-		struct prop *target = heliGetTargetProp(heli);
+		struct prop *target = chopperGetTargetProp(chopper);
 
 		if (target->type != PROPTYPE_PLAYER || g_Vars.unk000324) {
-			visible = hasLineOfSight(&target->pos, &target->rooms[0], &heli->base.prop->pos, &heli->base.prop->rooms[0], 307, 16);
+			visible = hasLineOfSight(&target->pos, &target->rooms[0], &chopper->base.prop->pos, &chopper->base.prop->rooms[0], 307, 16);
 		}
 
-		heli->targetvisible = visible;
+		chopper->targetvisible = visible;
 		return visible;
 	}
 
 	return false;
 }
 
-void heliSetTarget(struct defaultobj *obj, u32 chrnum)
+void chopperSetTarget(struct chopperobj *obj, u32 chrnum)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
+	if (chopper) {
 		struct chrdata *chr = chrFindById(NULL, chrnum);
 
 		if (chr && chr->prop) {
-			heli->target = chr->prop - g_Vars.props;
+			chopper->target = chr->prop - g_Vars.props;
 		}
 	}
 }
 
-bool heliAttack(struct defaultobj *obj)
+bool chopperAttack(struct chopperobj *obj)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
-		heli->attackmode = 1;
-		heli->patroltimer60 = 240;
+	if (chopper) {
+		chopper->attackmode = 1;
+		chopper->patroltimer60 = 240;
 
 		return true;
 	}
@@ -24719,14 +24719,14 @@ bool heliAttack(struct defaultobj *obj)
 	return false;
 }
 
-bool heliStop(struct defaultobj *obj)
+bool chopperStop(struct chopperobj *obj)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
-		heli->attackmode = 0;
-		heli->patroltimer60 = 120;
-		heli->power = 0;
+	if (chopper) {
+		chopper->attackmode = 0;
+		chopper->patroltimer60 = 120;
+		chopper->power = 0;
 
 		return true;
 	}
@@ -24734,32 +24734,32 @@ bool heliStop(struct defaultobj *obj)
 	return false;
 }
 
-bool heliSetArmed(struct defaultobj *obj, bool armed)
+bool chopperSetArmed(struct chopperobj *obj, bool armed)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
-		heli->weaponsarmed = armed;
+	if (chopper) {
+		chopper->weaponsarmed = armed;
 		return true;
 	}
 
 	return false;
 }
 
-void heliRestartTimer(struct defaultobj *obj)
+void chopperRestartTimer(struct chopperobj *obj)
 {
-	struct heliobj *heli = heliFromObj(obj);
+	struct chopperobj *chopper = chopperFromHovercar(obj);
 
-	if (heli) {
-		heli->timer60 = 0;
+	if (chopper) {
+		chopper->timer60 = 0;
 	}
 }
 
 GLOBAL_ASM(
-glabel heliGetTimer
+glabel chopperGetTimer
 /*  f07b120:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f07b124:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f07b128:	0fc1eb7d */ 	jal	heliFromObj
+/*  f07b128:	0fc1eb7d */ 	jal	chopperFromHovercar
 /*  f07b12c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f07b130:	8c4e00c0 */ 	lw	$t6,0xc0($v0)
 /*  f07b134:	3c017f1b */ 	lui	$at,%hi(var7f1aa5c8)
@@ -24773,9 +24773,9 @@ glabel heliGetTimer
 /*  f07b154:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-void heliSetMaxDamage(struct heliobj *heli, s16 health)
+void chopperSetMaxDamage(struct chopperobj *chopper, s16 health)
 {
-	heli->base.maxdamage = health;
+	chopper->base.maxdamage = health;
 }
 
 GLOBAL_ASM(
@@ -24858,7 +24858,7 @@ glabel func0f07b164
 );
 
 GLOBAL_ASM(
-glabel heliFireRocket
+glabel chopperFireRocket
 /*  f07b290:	27bdff30 */ 	addiu	$sp,$sp,-208
 /*  f07b294:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f07b298:	afb10020 */ 	sw	$s1,0x20($sp)
@@ -24868,7 +24868,7 @@ glabel heliFireRocket
 /*  f07b2a8:	00803025 */ 	or	$a2,$a0,$zero
 /*  f07b2ac:	51c0004c */ 	beqzl	$t6,.L0f07b3e0
 /*  f07b2b0:	8fbf0024 */ 	lw	$ra,0x24($sp)
-/*  f07b2b4:	0fc1eb6e */ 	jal	heliGetTargetProp
+/*  f07b2b4:	0fc1eb6e */ 	jal	chopperGetTargetProp
 /*  f07b2b8:	afa600d0 */ 	sw	$a2,0xd0($sp)
 /*  f07b2bc:	8faf00d4 */ 	lw	$t7,0xd4($sp)
 /*  f07b2c0:	8fa600d0 */ 	lw	$a2,0xd0($sp)
@@ -24978,7 +24978,7 @@ glabel func0f07b3f0
 /*  f07b444:	c44400cc */ 	lwc1	$f4,0xcc($v0)
 /*  f07b448:	e7b00110 */ 	swc1	$f16,0x110($sp)
 /*  f07b44c:	e7b0010c */ 	swc1	$f16,0x10c($sp)
-/*  f07b450:	0fc1eb6e */ 	jal	heliGetTargetProp
+/*  f07b450:	0fc1eb6e */ 	jal	chopperGetTargetProp
 /*  f07b454:	e7a400e0 */ 	swc1	$f4,0xe0($sp)
 /*  f07b458:	afa200dc */ 	sw	$v0,0xdc($sp)
 /*  f07b45c:	afa000d4 */ 	sw	$zero,0xd4($sp)
@@ -26539,7 +26539,7 @@ glabel func0f07cacc
 /*  f07caf4:	afa40170 */ 	sw	$a0,0x170($sp)
 /*  f07caf8:	8c930004 */ 	lw	$s3,0x4($a0)
 /*  f07cafc:	afb30168 */ 	sw	$s3,0x168($sp)
-/*  f07cb00:	0fc1eb6e */ 	jal	heliGetTargetProp
+/*  f07cb00:	0fc1eb6e */ 	jal	chopperGetTargetProp
 /*  f07cb04:	02602025 */ 	or	$a0,$s3,$zero
 /*  f07cb08:	8fa50170 */ 	lw	$a1,0x170($sp)
 /*  f07cb0c:	afa2015c */ 	sw	$v0,0x15c($sp)
@@ -50010,7 +50010,7 @@ glabel func0f0912dc
 /*  f091638:	8fae0200 */ 	lw	$t6,0x200($sp)
 /*  f09163c:	15a1006d */ 	bne	$t5,$at,.L0f0917f4
 /*  f091640:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f091644:	0fc1eb7d */ 	jal	heliFromObj
+/*  f091644:	0fc1eb7d */ 	jal	chopperFromHovercar
 /*  f091648:	8dc40004 */ 	lw	$a0,0x4($t6)
 /*  f09164c:	104001c9 */ 	beqz	$v0,.L0f091d74
 /*  f091650:	3c017f1b */ 	lui	$at,%hi(var7f1ab20c)
diff --git a/src/include/commands.h b/src/include/commands.h
index c02ff2368..e948c25e5 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -1290,11 +1290,11 @@
 	newid,
 
 /**
- * Sets the limit of how much health a chr or heli can take before they die.
+ * Sets the limit of how much health a chr or chopper can take before they die.
  *
  * In most cases the value is assigned to the chr given by the chr argument,
- * however if the command is run by an object (eg. hovercar or heli) it will be
- * assigned to the object itself.
+ * however if the command is run by an object (eg. hovercar or chopper) it will
+ * be assigned to the object itself.
  */
 #define set_chr_maxdamage(chr, value) \
 	mkshort(0x0096), \
@@ -2695,9 +2695,9 @@
 	mkshort(0x013e),
 
 /**
- * Checks if the current heli's weapons are armed.
+ * Checks if the current chopper's weapons are armed.
  */
-#define if_heli_weapons_armed(label) \
+#define if_chopper_weapons_armed(label) \
 	mkshort(0x013f), \
 	label,
 
@@ -2744,19 +2744,19 @@
 	0x00,
 
 /**
- * Sets the current heli's weapons to armed.
+ * Sets the current chopper's weapons to armed.
  *
- * The state of the weapons can be checked with if_heli_weapons_armed.
+ * The state of the weapons can be checked with if_chopper_weapons_armed.
  */
-#define heli_arm_weapons \
+#define chopper_arm_weapons \
 	mkshort(0x0143),
 
 /**
- * Sets the current heli's weapons to unarmed.
+ * Sets the current chopper's weapons to unarmed.
  *
- * The state of the weapons can be checked with if_heli_weapons_armed.
+ * The state of the weapons can be checked with if_chopper_weapons_armed.
  */
-#define heli_unarm_weapons \
+#define chopper_unarm_weapons \
 	mkshort(0x0144), \
 	label,
 
diff --git a/src/include/constants.h b/src/include/constants.h
index 115006a11..589b2d36f 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -692,8 +692,8 @@
 #define OBJTYPE_24               0x24
 #define OBJTYPE_RENAMEOBJ        0x25
 #define OBJTYPE_26               0x26
-#define OBJTYPE_27               0x27
-#define OBJTYPE_28               0x28
+#define OBJTYPE_TRUCK            0x27
+#define OBJTYPE_HELI             0x28
 #define OBJTYPE_29               0x29
 #define OBJTYPE_GLASS            0x2a
 #define OBJTYPE_2B               0x2b
@@ -708,9 +708,9 @@
 #define OBJTYPE_END              0x34
 #define OBJTYPE_HOVERPROP        0x35
 #define OBJTYPE_VENTFAN          0x36
-#define OBJTYPE_HOVERVEHICLE     0x37
+#define OBJTYPE_HOVERCAR         0x37
 #define OBJTYPE_PADEFFECT        0x38
-#define OBJTYPE_HELI             0x39
+#define OBJTYPE_CHOPPER          0x39
 #define OBJTYPE_MINE             0x3a
 #define OBJTYPE_ESCALATOR        0x3b
 
diff --git a/src/include/game/game_066310.h b/src/include/game/game_066310.h
index 175d1c4eb..c8c5a7f64 100644
--- a/src/include/game/game_066310.h
+++ b/src/include/game/game_066310.h
@@ -161,18 +161,18 @@ u32 func0f078c78(void);
 u32 func0f079ca4(void);
 u32 func0f079f1c(void);
 u32 func0f07accc(void);
-struct heliobj *heliFromObj(struct defaultobj *obj);
-u32 func0f07ae18(struct heliobj *heli, u32 arg1);
-bool heliCheckTargetVisible(struct defaultobj *obj);
-void heliSetTarget(struct defaultobj *obj, u32 chrnum);
-bool heliAttack(struct defaultobj *obj);
-bool heliStop(struct defaultobj *obj);
-bool heliSetArmed(struct defaultobj *obj, bool armed);
-void heliRestartTimer(struct defaultobj *obj);
-f32 heliGetTimer(struct heliobj *heli);
-void heliSetMaxDamage(struct heliobj *heli, s16 health);
+struct chopperobj *chopperFromHovercar(struct chopperobj *obj);
+u32 func0f07ae18(struct chopperobj *chopper, u32 arg1);
+bool chopperCheckTargetVisible(struct chopperobj *obj);
+void chopperSetTarget(struct chopperobj *obj, u32 chrnum);
+bool chopperAttack(struct chopperobj *obj);
+bool chopperStop(struct chopperobj *obj);
+bool chopperSetArmed(struct chopperobj *obj, bool armed);
+void chopperRestartTimer(struct chopperobj *obj);
+f32 chopperGetTimer(struct chopperobj *heli);
+void chopperSetMaxDamage(struct chopperobj *obj, s16 health);
 u32 func0f07b164(void);
-u32 heliFireRocket(struct heliobj *heli, u32 arg1);
+u32 chopperFireRocket(struct chopperobj *obj, u32 arg1);
 u32 func0f07b3f0(void);
 u32 func0f07ba38(void);
 u32 func0f07c12c(void);
@@ -395,7 +395,7 @@ u32 func0f0964b4(void);
 u32 func0f0965e4(void);
 u32 func0f096698(void);
 u32 func0f096700(void);
-struct prop *heliGetTargetProp(struct heliobj *heli);
+struct prop *chopperGetTargetProp(struct chopperobj *heli);
 struct defaultobj *objFindByTagId(s32 tag_id);
 struct tag *tagFindById(s32 tag_id);
 
diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h
index cf31c560b..93c13c02f 100644
--- a/src/include/gvars/gvars.h
+++ b/src/include/gvars/gvars.h
@@ -134,9 +134,9 @@ struct g_vars {
 	/*00041c*/ u32 unk00041c;
 	/*000420*/ u32 unk000420;
 	/*000424*/ struct chrdata *chrdata;
-	/*000428*/ struct standardobj *objdata;
-	/*00042c*/ struct standardobj *aicdata;
-	/*000430*/ struct heliobj *hovdata;
+	/*000428*/ struct truckobj *truck;
+	/*00042c*/ struct heliobj *heli;
+	/*000430*/ struct chopperobj *hovercar;
 	/*000434*/ u8 *ailist;
 	/*000438*/ u32 aioffset;
 	/*00043c*/ u32 unk00043c;
diff --git a/src/include/props.h b/src/include/props.h
index 5a1426db5..a473dfaba 100644
--- a/src/include/props.h
+++ b/src/include/props.h
@@ -334,7 +334,7 @@
 	mkword(u20), mkword(u21), mkword(u22), mkword(u23), \
 	mkword(u24), mkword(u25),
 
-#define hover_vehicle(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34) \
+#define hovercar(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25, u26, u27, u28, u29, u30, u31, u32, u33, u34) \
 	mkshort(scale), \
 	mkshort(0x37), \
 	generic_object(model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
diff --git a/src/include/types.h b/src/include/types.h
index 2b0cfdaf5..53ef88b31 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -709,13 +709,6 @@ struct doorobj { // objtype 0x01
 	/*0xc0*/ u32 unkc0;
 };
 
-struct standardobj { // objtype 0x03
-	struct defaultobj base;
-	/*0x5c*/ u8 *ailist;
-	/*0x60*/ u16 aioffset;
-	/*0x62*/ s16 aireturnlist;
-};
-
 struct image {
 	/*0x00*/ u32 unk00;
 	/*0x04*/ u32 unk04;
@@ -807,6 +800,20 @@ struct autogunobj { // objtype 0d
 	/*0xa8*/ u8 autogun_type;
 };
 
+struct truckobj {
+	struct defaultobj base;
+	/*0x5c*/ u8 *ailist;
+	/*0x60*/ u16 aioffset;
+	/*0x62*/ s16 aireturnlist;
+};
+
+struct heliobj {
+	struct defaultobj base;
+	/*0x5c*/ u8 *ailist;
+	/*0x60*/ u16 aioffset;
+	/*0x62*/ s16 aireturnlist;
+};
+
 struct liftobj { // objtype 30
 	struct defaultobj base;
 	/*0x5c*/ u32 unk5c;
@@ -818,7 +825,14 @@ struct liftobj { // objtype 30
 	/*0x74*/ f32 unk74;
 };
 
-struct heliobj {
+struct hovercarobj {
+	struct defaultobj base;
+	/*0x5c*/ u8 *ailist;
+	/*0x60*/ u16 aioffset;
+	/*0x62*/ s16 aireturnlist;
+};
+
+struct chopperobj {
 	struct defaultobj base;
 	/*0x5c*/ u8 *ailist;
 	/*0x60*/ u16 aioffset;