diff --git a/src/game/bondbike.c b/src/game/bondbike.c
index c14d758ed..8a656c88c 100644
--- a/src/game/bondbike.c
+++ b/src/game/bondbike.c
@@ -160,9 +160,9 @@ void func0f0d2294(void)
 {
 	struct defaultobj *hoverbike = g_Vars.currentplayer->hoverbike->obj;
 
-	g_Vars.currentplayer->unk1a70 = 0.0f / hoverbike->animdata->unk14;
-	g_Vars.currentplayer->unk1a74 = 80.0f / hoverbike->animdata->unk14;
-	g_Vars.currentplayer->unk1a78 = -50.0f / hoverbike->animdata->unk14;
+	g_Vars.currentplayer->unk1a70 = 0.0f / hoverbike->model->unk14;
+	g_Vars.currentplayer->unk1a74 = 80.0f / hoverbike->model->unk14;
+	g_Vars.currentplayer->unk1a78 = -50.0f / hoverbike->model->unk14;
 }
 
 GLOBAL_ASM(
diff --git a/src/game/bondmove.c b/src/game/bondmove.c
index bfc75693b..d1c026486 100644
--- a/src/game/bondmove.c
+++ b/src/game/bondmove.c
@@ -5433,7 +5433,7 @@ void func0f0cbf50(void)
 	if (g_Vars.currentplayer->prop) {
 		struct chrdata *chr = g_Vars.currentplayer->prop->chr;
 
-		if (chr && chr->animdata) {
+		if (chr && chr->model) {
 			func0f03e538(chr, BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta));
 		}
 	}
diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index b26d53b13..3b5fae671 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -2486,7 +2486,7 @@ void chrInit(struct prop *prop, u8 *ailist)
 	chr->headnum = 0;
 	chr->bodynum = 0;
 	chr->prop = prop;
-	chr->animdata = NULL;
+	chr->model = NULL;
 	chr->numarghs = 0;
 	chr->lastwalk60 = 0;
 	chr->invalidmove = 0;
@@ -2680,7 +2680,7 @@ void chrInit(struct prop *prop, u8 *ailist)
 	chrInitSplats(chr);
 }
 
-struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
+struct prop *func0f020b14(struct prop *prop, struct model *model,
 		struct coord *pos, s16 *rooms, f32 arg4, u8 *ailist)
 {
 	struct chrdata *chr;
@@ -2696,12 +2696,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
 
 	chr = prop->chr;
 
-	func0001e000(animdata, func0f01f378);
-	animdata->chr = chr;
-	animdata->unk01 = 1;
-	chr->animdata = animdata;
+	func0001e000(model, func0f01f378);
+	model->chr = chr;
+	model->unk01 = 1;
+	chr->model = model;
 	func0f03e538(chr, arg4);
-	func0001dfac(animdata, var80062968, 0);
+	func0001dfac(model, var80062968, 0);
 
 	testpos.x = pos->x;
 	testpos.y = pos->y + 100;
@@ -2718,12 +2718,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
 	func0f065c44(prop);
 	roomsCopy(rooms, prop->rooms);
 	func0f0220ac(chr);
-	func0001ad34(animdata, &prop->pos);
+	func0001ad34(model, &prop->pos);
 
-	value = chr->animdata->unk08->unk00->unk00;
+	value = chr->model->unk08->unk00->unk00;
 
 	if ((value & 0xff) == 1) {
-		struct animdata10 *thing = func0001aa1c(chr->animdata, chr->animdata->unk08->unk00);
+		struct model10 *thing = func0001aa1c(chr->model, chr->model->unk08->unk00);
 		thing->ground = ground;
 	}
 
@@ -2736,12 +2736,12 @@ struct prop *func0f020b14(struct prop *prop, struct animdata *animdata,
 	return prop;
 }
 
-struct prop *func0f020cc8(struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist)
+struct prop *func0f020cc8(struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist)
 {
 	struct prop *prop = propAllocate();
 
 	if (prop) {
-		prop = func0f020b14(prop, animdata, pos, rooms, arg3, ailist);
+		prop = func0f020b14(prop, model, pos, rooms, arg3, ailist);
 
 		if (cheatIsActive(CHEAT_ENEMYSHIELDS)) {
 			chrSetShield(prop->chr, 8);
@@ -2950,8 +2950,8 @@ void func0f0211a8(f32 arg0)
 	var80062968 = arg0;
 
 	for (i = 0; i < g_NumChrsA; i++) {
-		if (g_ChrsA[i].animdata) {
-			func0001dfac(g_ChrsA[i].animdata, var80062968, 600);
+		if (g_ChrsA[i].model) {
+			func0001dfac(g_ChrsA[i].model, var80062968, 600);
 		}
 	}
 }
@@ -4971,13 +4971,13 @@ glabel var7f1a87d8
 /*  f023340:	84842972 */ 	lh	$a0,%lo(var80062970+0x2)($a0)
 /*  f023344:	10400025 */ 	beqz	$v0,.L0f0233dc
 /*  f023348:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f02334c:	0c00744f */ 	jal	animGetId
+/*  f02334c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f023350:	8fa40208 */ 	lw	$a0,0x208($sp)
 /*  f023354:	3c038006 */ 	lui	$v1,%hi(var80062970)
 /*  f023358:	8c632970 */ 	lw	$v1,%lo(var80062970)($v1)
 /*  f02335c:	5443000b */ 	bnel	$v0,$v1,.L0f02338c
 /*  f023360:	44800000 */ 	mtc1	$zero,$f0
-/*  f023364:	0c00744f */ 	jal	animGetId
+/*  f023364:	0c00744f */ 	jal	modelGetAnimNum
 /*  f023368:	8fa40208 */ 	lw	$a0,0x208($sp)
 /*  f02336c:	00022400 */ 	sll	$a0,$v0,0x10
 /*  f023370:	00047c03 */ 	sra	$t7,$a0,0x10
@@ -10849,7 +10849,7 @@ glabel var7f1a8948
 //	f32 add = 0.75f;
 //
 //	for (i = 0; i < g_NumChrsA; i++) {
-//		if (g_ChrsA[i].animdata) {
+//		if (g_ChrsA[i].model) {
 //			struct prop *prop = g_ChrsA[i].prop;
 //
 //			if (prop && prop->type == PROPTYPE_CHR &&
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 43f419575..34bf86298 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -157,7 +157,7 @@ glabel func0f02e064
 /*  f02e0a4:	1000001b */ 	beqz	$zero,.L0f02e114
 /*  f02e0a8:	24020001 */ 	addiu	$v0,$zero,0x1
 .L0f02e0ac:
-/*  f02e0ac:	0c00744f */ 	jal	animGetId
+/*  f02e0ac:	0c00744f */ 	jal	modelGetAnimNum
 /*  f02e0b0:	8ca40020 */ 	lw	$a0,0x20($a1)
 /*  f02e0b4:	3c078007 */ 	lui	$a3,%hi(var80068008)
 /*  f02e0b8:	3c088007 */ 	lui	$t0,%hi(var8006801c)
@@ -636,7 +636,7 @@ glabel func0f02e6dc
 .L0f02e71c:
 /*  f02e71c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f02e720:	afa50030 */ 	sw	$a1,0x30($sp)
-/*  f02e724:	0c00744f */ 	jal	animGetId
+/*  f02e724:	0c00744f */ 	jal	modelGetAnimNum
 /*  f02e728:	afa3002c */ 	sw	$v1,0x2c($sp)
 /*  f02e72c:	820e0007 */ 	lb	$t6,0x7($s0)
 /*  f02e730:	2401000f */ 	addiu	$at,$zero,0xf
@@ -830,8 +830,8 @@ void func0f02e9a0(struct chrdata *chr, f32 arg1)
 
 	fsleep = arg1;
 
-	if (chr->animdata->anim->playspeed != 1.0f) {
-		fsleep *= 1.0f / chr->animdata->anim->playspeed;
+	if (chr->model->anim->playspeed != 1.0f) {
+		fsleep *= 1.0f / chr->model->anim->playspeed;
 	}
 
 	if (fsleep > limit) {
@@ -840,7 +840,7 @@ void func0f02e9a0(struct chrdata *chr, f32 arg1)
 
 	chr->sleep = fsleep;
 
-	if (func0001db94(chr->animdata) && !chr->aibot) {
+	if (func0001db94(chr->model) && !chr->aibot) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02e6dc(chr, arg1);
@@ -870,16 +870,16 @@ void chrStand(struct chrdata *chr)
 			chr->act_stand.face_target = false;
 
 			if (chr->aibot == NULL) {
-				if (animGetId(chr->animdata) == ANIM_KNEEL_SHOOT_RIGHT_HAND) {
+				if (modelGetAnimNum(chr->model) == ANIM_KNEEL_SHOOT_RIGHT_HAND) {
 					result = func0f02e15c(chr, 0.5, 0.8);
-					func0001dccc(chr->animdata, ANIM_KNEEL_SHOOT_RIGHT_HAND,
-							chr->animdata->anim->flip, 109, result, 16);
-					func0001de1c(chr->animdata, 140);
+					func0001dccc(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND,
+							chr->model->anim->flip, 109, result, 16);
+					func0001de1c(chr->model, 140);
 				} else {
 					result = func0f02e15c(chr, 0.5, 0.8);
-					func0001dccc(chr->animdata, ANIM_KNEEL_TWO_HANDED_GUN,
-							chr->animdata->anim->flip, 120, result, 16);
-					func0001de1c(chr->animdata, 151);
+					func0001dccc(chr->model, ANIM_KNEEL_TWO_HANDED_GUN,
+							chr->model->anim->flip, 120, result, 16);
+					func0001de1c(chr->model, 151);
 				}
 			}
 		} else if (race == RACE_DRCAROLL || race == RACE_ROBOT) {
@@ -1029,7 +1029,7 @@ void chrKneel(struct chrdata *chr)
 	chr->actiontype = ACT_KNEEL;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02ed88(chr);
@@ -1099,7 +1099,7 @@ void chrStartAlarm(struct chrdata *chr)
 	chr->actiontype = ACT_STARTALARM;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02ef40(chr);
@@ -1259,7 +1259,7 @@ void chrThrowGrenade(struct chrdata *chr, s32 hand, s32 needsequip)
 	chr->act_throwgrenade.needsequip = needsequip;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f070(chr);
@@ -1280,21 +1280,21 @@ void chrDoSurprisedThing(struct chrdata *chr)
 			flip = random() & 1;
 		}
 
-		func0001dccc(chr->animdata, 0x3f, flip, 10, func0f02e15c(chr, 0.6f, 0.96000003f), 16);
-		func0001de1c(chr->animdata, 52);
+		func0001dccc(chr->model, 0x3f, flip, 10, func0f02e15c(chr, 0.6f, 0.96000003f), 16);
+		func0001de1c(chr->model, 52);
 	} else if (chr->act_surprised.type == 2) {
-		func0001dccc(chr->animdata, ANIM_SURRENDER_002E, random() & 1, 0, func0f02e15c(chr, 0.35f, 0.56f), 16);
-		func0001de1c(chr->animdata, 7);
+		func0001dccc(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, func0f02e15c(chr, 0.35f, 0.56f), 16);
+		func0001de1c(chr->model, 7);
 	} else {
 		u32 part = random() % 3;
-		func0001dccc(chr->animdata, 0x40, random() & 1, 17, 0.6f, 16);
+		func0001dccc(chr->model, 0x40, random() & 1, 17, 0.6f, 16);
 
 		if (part == 0) {
-			func0001de1c(chr->animdata, func0f02e15c(chr, 38, 8));
+			func0001de1c(chr->model, func0f02e15c(chr, 38, 8));
 		} else if (part == 1) {
-			func0001de1c(chr->animdata, func0f02e15c(chr, 66, 8));
+			func0001de1c(chr->model, func0f02e15c(chr, 66, 8));
 		} else {
-			func0001de1c(chr->animdata, func0f02e15c(chr, 96, 8));
+			func0001de1c(chr->model, func0f02e15c(chr, 96, 8));
 		}
 	}
 }
@@ -1311,7 +1311,7 @@ void chrDoSurprisedOneHand(struct chrdata *chr)
 		chr->act_surprised.type = 1;
 		chr->sleep = 0;
 
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			chr->hidden |= CHRHFLAG_00200000;
 		} else {
 			chrDoSurprisedThing(chr);
@@ -1329,7 +1329,7 @@ void chrDoSurprisedSurrender(struct chrdata *chr)
 	chr->act_surprised.type = 2;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		chrDoSurprisedThing(chr);
@@ -1344,7 +1344,7 @@ void chrDoSurprisedLookAround(struct chrdata *chr)
 	chr->act_surprised.type = 3;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		chrDoSurprisedThing(chr);
@@ -1358,8 +1358,8 @@ void chrSurrenderStartAnim(struct chrdata *chr)
 	struct prop *gun0 = chrGetEquippedWeaponProp(chr, 0);
 
 	if (gun0 || gun1) {
-		func0001dccc(chr->animdata, ANIM_SURRENDER_002F, random() & 1, 0, 0.5, 16);
-		func0001ddec(chr->animdata, 40, 16);
+		func0001dccc(chr->model, ANIM_SURRENDER_002F, random() & 1, 0, 0.5, 16);
+		func0001ddec(chr->model, 40, 16);
 
 		if (gun1) {
 			propobjSetDropped(gun1, 2);
@@ -1371,8 +1371,8 @@ void chrSurrenderStartAnim(struct chrdata *chr)
 
 		chr->hidden |= CHRHFLAG_00000001;
 	} else {
-		func0001dccc(chr->animdata, ANIM_SURRENDER_002E, random() & 1, 0, 0.5, 16);
-		func0001ddec(chr->animdata, 30, 16);
+		func0001dccc(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, 0.5, 16);
+		func0001ddec(chr->model, 30, 16);
 	}
 
 	chrDropItems(chr);
@@ -1387,7 +1387,7 @@ void chrSurrender(struct chrdata *chr)
 		chr->actiontype = action;
 		chr->sleep = action;
 
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			chr->hidden |= CHRHFLAG_00200000;
 		} else {
 			chrSurrenderStartAnim(chr);
@@ -1615,7 +1615,7 @@ void chrSidestep(struct chrdata *chr, bool side)
 	chr->act_sidestep.side = side;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02f8a4(chr);
@@ -1734,7 +1734,7 @@ void chrJumpOut(struct chrdata *chr, bool side)
 	chr->act_jumpout.side = side;
 	chr->sleep = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02fc2c(chr);
@@ -1922,7 +1922,7 @@ void chrRunToPos(struct chrdata *chr, struct coord *pos)
 	chr->act_runpos.unk038 = 30; // float
 	chr->act_runpos.unk040 = 0;
 
-	if (func0001db94(chr->animdata)) {
+	if (func0001db94(chr->model)) {
 		chr->hidden |= CHRHFLAG_00200000;
 	} else {
 		func0f02fe18(chr);
@@ -3157,28 +3157,28 @@ void func0f03119c(struct chrdata *chr)
 
 void func0f031254(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 	f32 *floats = chr->act_attack.unk02c;
 
 	if (chr->act_attack.entitytype & ENTITYTYPE_AIMONLY) {
 		if (floats[8] >= 0 && floats[8] < floats[6]) {
-			func0001de1c(animdata, floats[8]);
+			func0001de1c(model, floats[8]);
 		} else {
-			func0001de1c(animdata, floats[6]);
+			func0001de1c(model, floats[6]);
 		}
 	} else if (chr->act_attack.unk036) {
 		if (floats[8] >= 0) {
-			func0001de1c(animdata, floats[8]);
+			func0001de1c(model, floats[8]);
 		} else {
-			func0001de1c(animdata, floats[6]);
+			func0001de1c(model, floats[6]);
 		}
 	} else {
 		if (floats[8] >= 0) {
-			func0001de1c(animdata, floats[8]);
+			func0001de1c(model, floats[8]);
 		} else if (floats[5] >= 0) {
-			func0001de1c(animdata, floats[5]);
+			func0001de1c(model, floats[5]);
 		} else {
-			func0001de1c(animdata, -1);
+			func0001de1c(model, -1);
 		}
 	}
 }
@@ -3241,7 +3241,7 @@ glabel var7f1a8d18
 /*  f031430:	a2390007 */ 	sb	$t9,0x7($s1)
 /*  f031434:	24180001 */ 	addiu	$t8,$zero,0x1
 /*  f031438:	a3b80053 */ 	sb	$t8,0x53($sp)
-/*  f03143c:	0c00744f */ 	jal	animGetId
+/*  f03143c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f031440:	8e240020 */ 	lw	$a0,0x20($s1)
 /*  f031444:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f031448:	10410019 */ 	beq	$v0,$at,.L0f0314b0
@@ -4091,7 +4091,7 @@ glabel var7f1a8d44
 /*  f031fd0:	271852b8 */ 	addiu	$t8,$t8,%lo(var800652b8)
 /*  f031fd4:	145801c9 */ 	bne	$v0,$t8,.L0f0326fc
 /*  f031fd8:	3c198006 */ 	lui	$t9,%hi(var80060000)
-/*  f031fdc:	0c00744f */ 	jal	animGetId
+/*  f031fdc:	0c00744f */ 	jal	modelGetAnimNum
 /*  f031fe0:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f031fe4:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f031fe8:	10410006 */ 	beq	$v0,$at,.L0f032004
@@ -4346,7 +4346,7 @@ glabel var7f1a8d44
 /*  f03239c:	1000000f */ 	beqz	$zero,.L0f0323dc
 /*  f0323a0:	8e180018 */ 	lw	$t8,0x18($s0)
 .L0f0323a4:
-/*  f0323a4:	0c008dda */ 	jal	animGetNumFrames
+/*  f0323a4:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f0323a8:	84640000 */ 	lh	$a0,0x0($v1)
 /*  f0323ac:	2459ffff */ 	addiu	$t9,$v0,-1
 /*  f0323b0:	44994000 */ 	mtc1	$t9,$f8
@@ -4867,7 +4867,7 @@ glabel var7f1a8d4c
 /*  f032b00:	afa30140 */ 	sw	$v1,0x140($sp)
 /*  f032b04:	afa60160 */ 	sw	$a2,0x160($sp)
 /*  f032b08:	afa80154 */ 	sw	$t0,0x154($sp)
-/*  f032b0c:	0c00744f */ 	jal	animGetId
+/*  f032b0c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f032b10:	e7ac015c */ 	swc1	$f12,0x15c($sp)
 /*  f032b14:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f032b18:	8fa30140 */ 	lw	$v1,0x140($sp)
@@ -5054,7 +5054,7 @@ glabel var7f1a8d4c
 /*  f032dc8:	1000000f */ 	beqz	$zero,.L0f032e08
 /*  f032dcc:	24080001 */ 	addiu	$t0,$zero,0x1
 .L0f032dd0:
-/*  f032dd0:	0c008dda */ 	jal	animGetNumFrames
+/*  f032dd0:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f032dd4:	85040000 */ 	lh	$a0,0x0($t0)
 /*  f032dd8:	2449ffff */ 	addiu	$t1,$v0,-1
 /*  f032ddc:	44893000 */ 	mtc1	$t1,$f6
@@ -5174,7 +5174,7 @@ glabel var7f1a8d4c
 /*  f032f94:	1000000f */ 	beqz	$zero,.L0f032fd4
 /*  f032f98:	8fbf002c */ 	lw	$ra,0x2c($sp)
 .L0f032f9c:
-/*  f032f9c:	0c008dda */ 	jal	animGetNumFrames
+/*  f032f9c:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f032fa0:	85040000 */ 	lh	$a0,0x0($t0)
 /*  f032fa4:	244dffff */ 	addiu	$t5,$v0,-1
 /*  f032fa8:	448d9000 */ 	mtc1	$t5,$f18
@@ -5213,7 +5213,7 @@ glabel func0f032fe4
 .L0f033010:
 /*  f033010:	afa00038 */ 	sw	$zero,0x38($sp)
 /*  f033014:	8e040020 */ 	lw	$a0,0x20($s0)
-/*  f033018:	0c00744f */ 	jal	animGetId
+/*  f033018:	0c00744f */ 	jal	modelGetAnimNum
 /*  f03301c:	afa3003c */ 	sw	$v1,0x3c($sp)
 /*  f033020:	820e0007 */ 	lb	$t6,0x7($s0)
 /*  f033024:	2401001f */ 	addiu	$at,$zero,0x1f
@@ -5751,7 +5751,7 @@ glabel func0f033728
 .L0f033778:
 /*  f033778:	5440004e */ 	bnezl	$v0,.L0f0338b4
 /*  f03377c:	82180007 */ 	lb	$t8,0x7($s0)
-/*  f033780:	0c00744f */ 	jal	animGetId
+/*  f033780:	0c00744f */ 	jal	modelGetAnimNum
 /*  f033784:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f033788:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f03378c:	10410005 */ 	beq	$v0,$at,.L0f0337a4
@@ -5770,7 +5770,7 @@ glabel func0f033728
 /*  f0337b8:	2401000a */ 	addiu	$at,$zero,0xa
 /*  f0337bc:	55e1003d */ 	bnel	$t7,$at,.L0f0338b4
 /*  f0337c0:	82180007 */ 	lb	$t8,0x7($s0)
-/*  f0337c4:	0c00744f */ 	jal	animGetId
+/*  f0337c4:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0337c8:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f0337cc:	8e03002c */ 	lw	$v1,0x2c($s0)
 /*  f0337d0:	84780000 */ 	lh	$t8,0x0($v1)
@@ -5804,7 +5804,7 @@ glabel func0f033728
 /*  f03383c:	46006086 */ 	mov.s	$f2,$f12
 /*  f033840:	8e040020 */ 	lw	$a0,0x20($s0)
 .L0f033844:
-/*  f033844:	0c00745f */ 	jal	animGetFrame
+/*  f033844:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f033848:	e7a20020 */ 	swc1	$f2,0x20($sp)
 /*  f03384c:	c7a20020 */ 	lwc1	$f2,0x20($sp)
 /*  f033850:	8fac0034 */ 	lw	$t4,0x34($sp)
@@ -5821,7 +5821,7 @@ glabel func0f033728
 /*  f033878:	44814000 */ 	mtc1	$at,$f8
 /*  f03387c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f033880:	46083081 */ 	sub.s	$f2,$f6,$f8
-/*  f033884:	0c00745f */ 	jal	animGetFrame
+/*  f033884:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f033888:	e7a20020 */ 	swc1	$f2,0x20($sp)
 /*  f03388c:	c7a20020 */ 	lwc1	$f2,0x20($sp)
 /*  f033890:	8fae0034 */ 	lw	$t6,0x34($sp)
@@ -6518,7 +6518,7 @@ void func0f034330(struct chrdata *chr, f32 arg1, struct coord *vector, u8 *arg3,
 	s32 sp72 = 0;
 	s32 sp68 = 0;
 
-	if (chrGetShield(chr) >= 0 && chr->animdata) {
+	if (chrGetShield(chr) >= 0 && chr->model) {
 		func0f03ff2c(chr, &chr->prop->pos, vector, &sp76, &arg5, &sp72, &sp68);
 	}
 
@@ -9577,7 +9577,7 @@ glabel var7f1a8da4
 /*  f0370cc:	46000086 */ 	mov.s	$f2,$f0
 /*  f0370d0:	8ca40020 */ 	lw	$a0,0x20($a1)
 .L0f0370d4:
-/*  f0370d4:	0c00744f */ 	jal	animGetId
+/*  f0370d4:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0370d8:	afa50018 */ 	sw	$a1,0x18($sp)
 /*  f0370dc:	00022400 */ 	sll	$a0,$v0,0x10
 /*  f0370e0:	00047c03 */ 	sra	$t7,$a0,0x10
@@ -11390,7 +11390,7 @@ glabel chrGoToPos
 //			func0f036ee4(chr, &chr->act_gopos.unk068, &auStack52[0], &prevpos);
 //		}
 //
-//		if (chr->act_gopos.unk068 != MAX_CHRWAYPOINTS && func0001db94(chr->animdata) != 0 && !chr->aibot) {
+//		if (chr->act_gopos.unk068 != MAX_CHRWAYPOINTS && func0001db94(chr->model) != 0 && !chr->aibot) {
 //			chr->hidden |= CHRHFLAG_00200000;
 //			return true;
 //		} else {
@@ -12350,7 +12350,7 @@ void chrRecordLastHearTargetTime(struct chrdata *chr)
 
 bool chrIsStopped(struct chrdata *chr)
 {
-	u32 anim = animGetId(chr->animdata);
+	u32 anim = modelGetAnimNum(chr->model);
 
 	if (anim == ANIM_SNIPING_0269 || anim == ANIM_SNIPING_026B) {
 		return false;
@@ -12380,8 +12380,8 @@ bool chrIsStopped(struct chrdata *chr)
 
 	if (chr->actiontype == ACT_ANIM) {
 		if (chr->act_anim.unk034
-				|| (func0001d260(chr->animdata) >= 0 && animGetFrame(chr->animdata) >= func0001d1a0(chr->animdata))
-				|| (func0001d260(chr->animdata) < 0 && animGetFrame(chr->animdata) <= 0)) {
+				|| (func0001d260(chr->model) >= 0 && modelGetCurAnimFrame(chr->model) >= func0001d1a0(chr->model))
+				|| (func0001d260(chr->model) < 0 && modelGetCurAnimFrame(chr->model) <= 0)) {
 			return true;
 		}
 	} else if (chr->actiontype == ACT_PATROL) {
@@ -13910,7 +13910,7 @@ bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum)
 	weapon = func0f08b880(modelnum, (u8)weaponnum, chr);
 
 	if (weapon && weapon->base.prop) {
-		func0001af58(weapon->base.animdata, weapon->base.animdata->unk14);
+		func0001af58(weapon->base.model, weapon->base.model->unk14);
 		propReparent(weapon->base.prop, chr->prop);
 		weapon->unk62 = 720;
 		propobjSetDropped(weapon->base.prop, 1);
@@ -14473,12 +14473,12 @@ glabel var7f1a8f08
 /*  f03c17c:	0301c824 */ 	and	$t9,$t8,$at
 /*  f03c180:	ae190014 */ 	sw	$t9,0x14($s0)
 .L0f03c184:
-/*  f03c184:	0c00744f */ 	jal	animGetId
+/*  f03c184:	0c00744f */ 	jal	modelGetAnimNum
 /*  f03c188:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c18c:	2401026b */ 	addiu	$at,$zero,0x26b
 /*  f03c190:	54410011 */ 	bnel	$v0,$at,.L0f03c1d8
 /*  f03c194:	820b0008 */ 	lb	$t3,0x8($s0)
-/*  f03c198:	0c00745f */ 	jal	animGetFrame
+/*  f03c198:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f03c19c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c1a0:	e7a0003c */ 	swc1	$f0,0x3c($sp)
 /*  f03c1a4:	0c007468 */ 	jal	func0001d1a0
@@ -14508,7 +14508,7 @@ glabel var7f1a8f08
 /*  f03c1fc:	8e0c002c */ 	lw	$t4,0x2c($s0)
 /*  f03c200:	51800012 */ 	beqzl	$t4,.L0f03c24c
 /*  f03c204:	8e0202d4 */ 	lw	$v0,0x2d4($s0)
-/*  f03c208:	0c00745f */ 	jal	animGetFrame
+/*  f03c208:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f03c20c:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f03c210:	e7a0003c */ 	swc1	$f0,0x3c($sp)
 /*  f03c214:	0c007468 */ 	jal	func0001d1a0
@@ -14647,7 +14647,7 @@ glabel var7f1a8f08
 /*  f03c404:	e7a80010 */ 	swc1	$f8,0x10($sp)
 /*  f03c408:	0c007733 */ 	jal	func0001dccc
 /*  f03c40c:	e7aa0014 */ 	swc1	$f10,0x14($sp)
-/*  f03c410:	0c008dda */ 	jal	animGetNumFrames
+/*  f03c410:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f03c414:	2404006b */ 	addiu	$a0,$zero,0x6b
 /*  f03c418:	244dffff */ 	addiu	$t5,$v0,-1
 /*  f03c41c:	448d8000 */ 	mtc1	$t5,$f16
@@ -14676,7 +14676,7 @@ glabel var7f1a8f08
 /*  f03c470:	e7b20010 */ 	swc1	$f18,0x10($sp)
 /*  f03c474:	0c007733 */ 	jal	func0001dccc
 /*  f03c478:	e7a40014 */ 	swc1	$f4,0x14($sp)
-/*  f03c47c:	0c008dda */ 	jal	animGetNumFrames
+/*  f03c47c:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f03c480:	24040028 */ 	addiu	$a0,$zero,0x28
 /*  f03c484:	2459ffff */ 	addiu	$t9,$v0,-1
 /*  f03c488:	44993000 */ 	mtc1	$t9,$f6
@@ -14704,7 +14704,7 @@ glabel var7f1a8f08
 /*  f03c4dc:	e7a80010 */ 	swc1	$f8,0x10($sp)
 /*  f03c4e0:	0c007733 */ 	jal	func0001dccc
 /*  f03c4e4:	e7aa0014 */ 	swc1	$f10,0x14($sp)
-/*  f03c4e8:	0c008dda */ 	jal	animGetNumFrames
+/*  f03c4e8:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f03c4ec:	24040392 */ 	addiu	$a0,$zero,0x392
 /*  f03c4f0:	244bffff */ 	addiu	$t3,$v0,-1
 /*  f03c4f4:	448b8000 */ 	mtc1	$t3,$f16
@@ -14979,7 +14979,7 @@ void chrTickKneel(struct chrdata *chr)
 {
 	chr->sleep = 0;
 
-	if ((chr->hidden & CHRHFLAG_00200000) && func0001db94(chr->animdata) == 0) {
+	if ((chr->hidden & CHRHFLAG_00200000) && func0001db94(chr->model) == 0) {
 		func0f02ed88(chr);
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
@@ -14988,33 +14988,33 @@ void chrTickKneel(struct chrdata *chr)
 void chrTickAnim(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
-		func0001dccc(chr->animdata, chr->act_anim.animnum, chr->act_anim.flip,
+		func0001dccc(chr->model, chr->act_anim.animnum, chr->act_anim.flip,
 				chr->act_anim.startframe, chr->act_anim.unk054, chr->act_anim.unk058);
 
 		if (chr->act_anim.unk050 >= 0) {
-			func0001de1c(chr->animdata, chr->act_anim.unk050);
+			func0001de1c(chr->model, chr->act_anim.unk050);
 		}
 
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (chr->act_anim.unk030 == 0 && animGetFrame(chr->animdata) >= func0001d1a0(chr->animdata)) {
+	if (chr->act_anim.unk030 == 0 && modelGetCurAnimFrame(chr->model) >= func0001d1a0(chr->model)) {
 		chrStand(chr);
 	}
 
-	if (chr->act_anim.unk040 != 0 && animGetFrame(chr->animdata) >= (s32)chr->act_anim.unk042) {
+	if (chr->act_anim.unk040 != 0 && modelGetCurAnimFrame(chr->model) >= (s32)chr->act_anim.unk042) {
 		chr->act_anim.unk040 = 0;
 		func0f03ba44(chr, chr->act_anim.unk044, chr->act_anim.unk046, chr->act_anim.unk041);
 	}
 
 	// Play sneezing sound
 	if (CHRRACE(chr) == RACE_HUMAN
-			&& animGetId(chr->animdata) == ANIM_SNEEZE
-			&& animGetFrame(chr->animdata) >= 42
+			&& modelGetAnimNum(chr->model) == ANIM_SNEEZE
+			&& modelGetCurAnimFrame(chr->model) >= 42
 			&& (g_Vars.lvframenum & 1) == 0
 			&& chrGetDistanceToCurrentPlayer(chr) < 800) {
 		func0f0939f8(NULL, chr->prop, 0x37, -1,
@@ -15025,7 +15025,7 @@ void chrTickAnim(struct chrdata *chr)
 		chr->sleep = 14 + (random() % 5);
 	}
 
-	if (animGetId(chr->animdata) == ANIM_RELOAD_0209) {
+	if (modelGetAnimNum(chr->model) == ANIM_RELOAD_0209) {
 		chrSetFiring(chr, 0, false);
 		chrSetFiring(chr, 1, false);
 	}
@@ -15038,7 +15038,7 @@ u32 var800683b8 = 0xbf800000;
 void chrTickSurrender(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -15048,18 +15048,18 @@ void chrTickSurrender(struct chrdata *chr)
 
 	if (chr->sleep <= 0) {
 		if (CHRRACE(chr) == RACE_HUMAN) {
-			struct animdata *animdata = chr->animdata;
+			struct model *model = chr->model;
 			chr->sleep = 16;
 
-			if (animGetId(animdata) == ANIM_SURRENDER_002F && animGetFrame(animdata) >= 80.0f) {
+			if (modelGetAnimNum(model) == ANIM_SURRENDER_002F && modelGetCurAnimFrame(model) >= 80.0f) {
 				struct coord coord = {0, 0, 0};
 				f32 value = func0f03e45c(chr);
 				coord.x = -sinf(value);
 				coord.z = -cosf(value);
 
 				if (!func0f036918(chr->prop, &coord, 20)) {
-					func0001dccc(chr->animdata, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16);
-					func0001ddec(chr->animdata, 30, 16);
+					func0001dccc(chr->model, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16);
+					func0001ddec(chr->model, 30, 16);
 				}
 			}
 		}
@@ -15289,7 +15289,7 @@ glabel var7f1a8f0c
 
 void chrTickDie(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 	u32 race = CHRRACE(chr);
 
 	// Thud noises - probably bodies hitting the floor
@@ -15359,7 +15359,7 @@ void chrTickDie(struct chrdata *chr)
 	}
 
 	// Human or Skedar
-	if (chr->act_die.unk030 >= 0 && animGetFrame(animdata) >= chr->act_die.unk030) {
+	if (chr->act_die.unk030 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.unk030) {
 		if (chr->specialdie == 0) {
 			func0f0939f8(NULL, chr->prop, thuds[animindex], -1,
 					-1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
@@ -15377,7 +15377,7 @@ void chrTickDie(struct chrdata *chr)
 		chr->act_die.unk030 = -1;
 	}
 
-	if (chr->act_die.unk034 >= 0 && animGetFrame(animdata) >= chr->act_die.unk034) {
+	if (chr->act_die.unk034 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.unk034) {
 		if (chr->specialdie < 5) {
 			func0f0939f8(NULL, chr->prop, 0x808e, -1,
 					-1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
@@ -15395,10 +15395,10 @@ void chrTickDie(struct chrdata *chr)
 		chr->act_die.unk034 = -1;
 	}
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
-		if (CHRRACE(chr) == RACE_HUMAN && animGetId(animdata) == ANIM_DEATH_STOMACH_LONG) {
-			func0001dccc(animdata, ANIM_003C, !animIsFlipped(animdata), 50, 0.3, animGetNumFrames(ANIM_003C) - 51.0f);
-			func0001deb0(animdata, 0.5, animGetNumFrames(ANIM_003C) - 51.0f);
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
+		if (CHRRACE(chr) == RACE_HUMAN && modelGetAnimNum(model) == ANIM_DEATH_STOMACH_LONG) {
+			func0001dccc(model, ANIM_003C, !modelIsFlipped(model), 50, 0.3, modelGetNumAnimFrames(ANIM_003C) - 51.0f);
+			func0001deb0(model, 0.5, modelGetNumAnimFrames(ANIM_003C) - 51.0f);
 			return;
 		}
 
@@ -15597,7 +15597,7 @@ glabel chrTickDruggedComingUp
 
 void chrTickDruggedDrop(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
 	u16 thuds[11] = {
 		0x808d,
@@ -15615,7 +15615,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 
 	static s32 index = 0;
 
-	if (chr->act_druggeddrop.unk030 >= 0 && animGetFrame(animdata) >= chr->act_druggeddrop.unk030) {
+	if (chr->act_druggeddrop.unk030 >= 0 && modelGetCurAnimFrame(model) >= chr->act_druggeddrop.unk030) {
 		func0f0939f8(NULL, chr->prop, thuds[index], -1,
 				-1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
 
@@ -15628,7 +15628,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 		chr->act_druggeddrop.unk030 = -1;
 	}
 
-	if (chr->act_druggeddrop.unk034 >= 0 && animGetFrame(animdata) >= chr->act_druggeddrop.unk034) {
+	if (chr->act_druggeddrop.unk034 >= 0 && modelGetCurAnimFrame(model) >= chr->act_druggeddrop.unk034) {
 		func0f0939f8(NULL, chr->prop, thuds[index], -1,
 				-1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
 
@@ -15641,7 +15641,7 @@ void chrTickDruggedDrop(struct chrdata *chr)
 		chr->act_druggeddrop.unk034 = -1;
 	}
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chr->actiontype = ACT_DRUGGEDKO;
 		chr->act_druggedko.unk038 = chr->aibot ? 0 : -1;
 		chr->act_druggedko.unk02c = 0;
@@ -15693,12 +15693,12 @@ void chrTickDruggedKo(struct chrdata *chr)
 
 void chrTickArgh(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chrRecordLastSeeTargetTime(chr);
 
-		if (CHRRACE(chr) == RACE_HUMAN && animGetId(animdata) == ANIM_DEATH_STOMACH_LONG) {
+		if (CHRRACE(chr) == RACE_HUMAN && modelGetAnimNum(model) == ANIM_DEATH_STOMACH_LONG) {
 			func0f02ed28(chr, 26);
 		} else {
 			if (chr->race == RACE_DRCAROLL) {
@@ -15715,9 +15715,9 @@ void chrTickArgh(struct chrdata *chr)
 
 void chrTickPreArgh(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		struct coord pos;
 		pos.x = chr->act_preargh.pos.x;
 		pos.y = chr->act_preargh.pos.y;
@@ -15733,10 +15733,10 @@ void chrTickPreArgh(struct chrdata *chr)
 
 void chrTickSidestep(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -15744,7 +15744,7 @@ void chrTickSidestep(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chrRecordLastSeeTargetTime(chr);
 		func0f02ed28(chr, 10);
 	}
@@ -15752,10 +15752,10 @@ void chrTickSidestep(struct chrdata *chr)
 
 void chrTickJumpOut(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -15763,7 +15763,7 @@ void chrTickJumpOut(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chrRecordLastSeeTargetTime(chr);
 		chrStop(chr);
 	}
@@ -15771,19 +15771,19 @@ void chrTickJumpOut(struct chrdata *chr)
 
 void chrTickTest(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chrStand(chr);
 	}
 }
 
 void chrTickStartAlarm(struct chrdata *chr)
 {
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -15791,11 +15791,11 @@ void chrTickStartAlarm(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	if (animGetFrame(animdata) >= 60) {
+	if (modelGetCurAnimFrame(model) >= 60) {
 		alarmActivate();
 	}
 
-	if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
+	if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
 		chrStop(chr);
 	}
 }
@@ -15803,7 +15803,7 @@ void chrTickStartAlarm(struct chrdata *chr)
 void chrTickSurprised(struct chrdata *chr)
 {
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -15812,12 +15812,12 @@ void chrTickSurprised(struct chrdata *chr)
 	}
 
 	if (CHRRACE(chr) == RACE_HUMAN) {
-		struct animdata *animdata = chr->animdata;
+		struct model *model = chr->model;
 
-		if (animGetFrame(animdata) >= func0001d1a0(animdata)) {
-			if (animGetId(animdata) == 0x2e) {
+		if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
+			if (modelGetAnimNum(model) == 0x2e) {
 				func0f02ed28(chr, 26);
-			} else if (animGetId(animdata) == 0x3f) {
+			} else if (modelGetAnimNum(model) == 0x3f) {
 				func0f02ed28(chr, 26);
 			} else {
 				chrStop(chr);
@@ -16023,7 +16023,7 @@ void func0f03e538(struct chrdata *chr, f32 arg1)
 	if (chr->aibot) {
 		chr->aibot->unk0b0 = arg1;
 	} else {
-		func0001ae90(chr->animdata, arg1);
+		func0001ae90(chr->model, arg1);
 	}
 }
 
@@ -16033,7 +16033,7 @@ f32 func0f03e578(struct chrdata *chr)
 		return chr->aibot->unk0a4;
 	}
 
-	return func0001ae44(chr->animdata);
+	return func0001ae44(chr->model);
 }
 
 void func0f03e5b0(struct chrdata *chr, f32 arg1)
@@ -16041,7 +16041,7 @@ void func0f03e5b0(struct chrdata *chr, f32 arg1)
 	if (chr->aibot) {
 		chr->aibot->unk0a4 = arg1;
 	} else {
-		func0001ae90(chr->animdata, arg1);
+		func0001ae90(chr->model, arg1);
 	}
 }
 
@@ -16199,7 +16199,7 @@ glabel var7f1a8f40
 /*  f03e7a4:	10a1008e */ 	beq	$a1,$at,.L0f03e9e0
 /*  f03e7a8:	afa70044 */ 	sw	$a3,0x44($sp)
 /*  f03e7ac:	8c840020 */ 	lw	$a0,0x20($a0)
-/*  f03e7b0:	0c00745f */ 	jal	animGetFrame
+/*  f03e7b0:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f03e7b4:	afa40034 */ 	sw	$a0,0x34($sp)
 /*  f03e7b8:	e7a00030 */ 	swc1	$f0,0x30($sp)
 /*  f03e7bc:	0fc0f917 */ 	jal	func0f03e45c
@@ -18605,7 +18605,7 @@ glabel var7f1a9184
 /*  f0406d8:	1541000b */ 	bne	$t2,$at,.L0f040708
 /*  f0406dc:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f0406e0:	8de40020 */ 	lw	$a0,0x20($t7)
-/*  f0406e4:	0c00744f */ 	jal	animGetId
+/*  f0406e4:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0406e8:	afa60254 */ 	sw	$a2,0x254($sp)
 /*  f0406ec:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f0406f0:	14410005 */ 	bne	$v0,$at,.L0f040708
@@ -20169,7 +20169,7 @@ glabel func0f041d38
 /*  f041d60:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f041d64:	45000016 */ 	bc1f	.L0f041dc0
 /*  f041d68:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f041d6c:	0c00744f */ 	jal	animGetId
+/*  f041d6c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f041d70:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041d74:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f041d78:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -20191,7 +20191,7 @@ glabel func0f041d38
 /*  f041db8:	10000015 */ 	beqz	$zero,.L0f041e10
 /*  f041dbc:	8e29002c */ 	lw	$t1,0x2c($s1)
 .L0f041dc0:
-/*  f041dc0:	0c00744f */ 	jal	animGetId
+/*  f041dc0:	0c00744f */ 	jal	modelGetAnimNum
 /*  f041dc4:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041dc8:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f041dcc:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -20248,10 +20248,10 @@ glabel var7f1a918c
 /*  f041e68:	f7b40018 */ 	sdc1	$f20,0x18($sp)
 /*  f041e6c:	8c930020 */ 	lw	$s3,0x20($a0)
 /*  f041e70:	00808025 */ 	or	$s0,$a0,$zero
-/*  f041e74:	0c00745f */ 	jal	animGetFrame
+/*  f041e74:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f041e78:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041e7c:	46000506 */ 	mov.s	$f20,$f0
-/*  f041e80:	0c00744f */ 	jal	animGetId
+/*  f041e80:	0c00744f */ 	jal	modelGetAnimNum
 /*  f041e84:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041e88:	24010269 */ 	addiu	$at,$zero,0x269
 /*  f041e8c:	504101de */ 	beql	$v0,$at,.L0f042608
@@ -20298,7 +20298,7 @@ glabel var7f1a918c
 /*  f041f2c:	02002025 */ 	or	$a0,$s0,$zero
 /*  f041f30:	14400023 */ 	bnez	$v0,.L0f041fc0
 /*  f041f34:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f041f38:	0c00744f */ 	jal	animGetId
+/*  f041f38:	0c00744f */ 	jal	modelGetAnimNum
 /*  f041f3c:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041f40:	3c013f00 */ 	lui	$at,0x3f00
 /*  f041f44:	4481c000 */ 	mtc1	$at,$f24
@@ -20342,7 +20342,7 @@ glabel var7f1a918c
 .L0f041fd4:
 /*  f041fd4:	02602025 */ 	or	$a0,$s3,$zero
 /*  f041fd8:	25d80001 */ 	addiu	$t8,$t6,0x1
-/*  f041fdc:	0c00745f */ 	jal	animGetFrame
+/*  f041fdc:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f041fe0:	a2180033 */ 	sb	$t8,0x33($s0)
 /*  f041fe4:	46000506 */ 	mov.s	$f20,$f0
 /*  f041fe8:	3c013f00 */ 	lui	$at,0x3f00
@@ -20355,7 +20355,7 @@ glabel var7f1a918c
 /*  f042000:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f042004:	45000080 */ 	bc1f	.L0f042208
 /*  f042008:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04200c:	0c00744f */ 	jal	animGetId
+/*  f04200c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f042010:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042014:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042018:	50410018 */ 	beql	$v0,$at,.L0f04207c
@@ -20471,7 +20471,7 @@ glabel var7f1a918c
 /*  f0421a8:	a2000031 */ 	sb	$zero,0x31($s0)
 .L0f0421ac:
 /*  f0421ac:	e7ac005c */ 	swc1	$f12,0x5c($sp)
-/*  f0421b0:	0c00744f */ 	jal	animGetId
+/*  f0421b0:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0421b4:	e7a20060 */ 	swc1	$f2,0x60($sp)
 /*  f0421b8:	c7ac005c */ 	lwc1	$f12,0x5c($sp)
 /*  f0421bc:	8e690020 */ 	lw	$t1,0x20($s3)
@@ -20491,11 +20491,11 @@ glabel var7f1a918c
 /*  f0421f4:	0c007787 */ 	jal	func0001de1c
 /*  f0421f8:	02602025 */ 	or	$a0,$s3,$zero
 .L0f0421fc:
-/*  f0421fc:	0c00745f */ 	jal	animGetFrame
+/*  f0421fc:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f042200:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042204:	46000506 */ 	mov.s	$f20,$f0
 .L0f042208:
-/*  f042208:	0c00744f */ 	jal	animGetId
+/*  f042208:	0c00744f */ 	jal	modelGetAnimNum
 /*  f04220c:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042210:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042214:	50410030 */ 	beql	$v0,$at,.L0f0422d8
@@ -20562,7 +20562,7 @@ glabel var7f1a918c
 /*  f0422f8:	45030008 */ 	bc1tl	.L0f04231c
 /*  f0422fc:	3c013f80 */ 	lui	$at,0x3f80
 .L0f042300:
-/*  f042300:	0c00744f */ 	jal	animGetId
+/*  f042300:	0c00744f */ 	jal	modelGetAnimNum
 /*  f042304:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042308:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f04230c:	1441000b */ 	bne	$v0,$at,.L0f04233c
@@ -20593,7 +20593,7 @@ glabel var7f1a918c
 /*  f042360:	824e003a */ 	lb	$t6,0x3a($s2)
 /*  f042364:	15c00066 */ 	bnez	$t6,.L0f042500
 /*  f042368:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04236c:	0c00744f */ 	jal	animGetId
+/*  f04236c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f042370:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042374:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f042378:	1041000c */ 	beq	$v0,$at,.L0f0423ac
@@ -20702,7 +20702,7 @@ glabel var7f1a918c
 /*  f0424f8:	1000003f */ 	beqz	$zero,.L0f0425f8
 /*  f0424fc:	26310001 */ 	addiu	$s1,$s1,0x1
 .L0f042500:
-/*  f042500:	0c00744f */ 	jal	animGetId
+/*  f042500:	0c00744f */ 	jal	modelGetAnimNum
 /*  f042504:	02602025 */ 	or	$a0,$s3,$zero
 /*  f042508:	2401026a */ 	addiu	$at,$zero,0x26a
 /*  f04250c:	10410023 */ 	beq	$v0,$at,.L0f04259c
@@ -20799,7 +20799,7 @@ glabel var7f1a9190
 /*  f042634:	00808825 */ 	or	$s1,$a0,$zero
 /*  f042638:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f04263c:	afb0001c */ 	sw	$s0,0x1c($sp)
-/*  f042640:	0c00745f */ 	jal	animGetFrame
+/*  f042640:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f042644:	8c840020 */ 	lw	$a0,0x20($a0)
 /*  f042648:	e7a00030 */ 	swc1	$f0,0x30($sp)
 /*  f04264c:	8e30002c */ 	lw	$s0,0x2c($s1)
@@ -21509,7 +21509,7 @@ glabel var7f1a91e0
 /*  f043004:	00808025 */ 	or	$s0,$a0,$zero
 /*  f043008:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f04300c:	8c840020 */ 	lw	$a0,0x20($a0)
-/*  f043010:	0c00745f */ 	jal	animGetFrame
+/*  f043010:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f043014:	afa4003c */ 	sw	$a0,0x3c($sp)
 /*  f043018:	e7a00038 */ 	swc1	$f0,0x38($sp)
 /*  f04301c:	8e0e0014 */ 	lw	$t6,0x14($s0)
@@ -21592,7 +21592,7 @@ glabel var7f1a91e0
 /*  f043144:	46000086 */ 	mov.s	$f2,$f0
 /*  f043148:	c442001c */ 	lwc1	$f2,0x1c($v0)
 .L0f04314c:
-/*  f04314c:	0c00744f */ 	jal	animGetId
+/*  f04314c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f043150:	e7a20034 */ 	swc1	$f2,0x34($sp)
 /*  f043154:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043158:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -21719,7 +21719,7 @@ glabel var7f1a91e0
 /*  f043320:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043324:	45000027 */ 	bc1f	.L0f0433c4
 /*  f043328:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f04332c:	0c00744f */ 	jal	animGetId
+/*  f04332c:	0c00744f */ 	jal	modelGetAnimNum
 /*  f043330:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f043334:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043338:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -21797,7 +21797,7 @@ glabel chrTickAttackRoll
 /*  f043434:	1140013d */ 	beqz	$t2,.L0f04392c
 /*  f043438:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f04343c:	8d240020 */ 	lw	$a0,0x20($t1)
-/*  f043440:	0c00745f */ 	jal	animGetFrame
+/*  f043440:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f043444:	afa40044 */ 	sw	$a0,0x44($sp)
 /*  f043448:	8fa70048 */ 	lw	$a3,0x48($sp)
 /*  f04344c:	3c0b8006 */ 	lui	$t3,%hi(var80067548)
@@ -22095,7 +22095,7 @@ glabel chrTickAttackRoll
 /*  f04387c:	00000000 */ 	sll	$zero,$zero,0x0
 /*  f043880:	4500002a */ 	bc1f	.L0f04392c
 /*  f043884:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f043888:	0c00744f */ 	jal	animGetId
+/*  f043888:	0c00744f */ 	jal	modelGetAnimNum
 /*  f04388c:	8fa40044 */ 	lw	$a0,0x44($sp)
 /*  f043890:	3c063f4c */ 	lui	$a2,0x3f4c
 /*  f043894:	34c6cccd */ 	ori	$a2,$a2,0xcccd
@@ -22196,7 +22196,7 @@ void registerDangerousProp(struct prop *prop)
 
 void chrTickThrowGrenade(struct chrdata *chr)
 {
-	struct animdata *animdata;
+	struct model *model;
 	f32 frame;
 	u32 hand;
 	struct prop *weaponprop;
@@ -22205,7 +22205,7 @@ void chrTickThrowGrenade(struct chrdata *chr)
 	f32 frame2;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -22213,35 +22213,35 @@ void chrTickThrowGrenade(struct chrdata *chr)
 		chr->hidden &= ~CHRHFLAG_00200000;
 	}
 
-	animdata = chr->animdata;
-	frame = animGetFrame(animdata);
-	hand = animdata->anim->flip ? 1 : 0;
+	model = chr->model;
+	frame = modelGetCurAnimFrame(model);
+	hand = model->anim->flip ? 1 : 0;
 	weaponprop = chrGetEquippedWeaponProp(chr, hand);
 
-	if ((frame >= 20 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_STANDING) ||
-			(frame >= 1 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_NOPIN) ||
-			(frame >= 1 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_CROUCHING)) {
+	if ((frame >= 20 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) ||
+			(frame >= 1 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) ||
+			(frame >= 1 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING)) {
 		obj = weaponprop->obj;
 		obj->hidden &= ~OBJHFLAG_00000800;
 	}
 
-	if ((frame >= 119 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_STANDING) ||
-			(frame >= 57 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_NOPIN) ||
-			(frame >= 58 && weaponprop && animGetId(animdata) == ANIM_THROWGRENADE_CROUCHING)) {
+	if ((frame >= 119 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) ||
+			(frame >= 57 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) ||
+			(frame >= 58 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING)) {
 		weapon = weaponprop->weapon;
 		propobjSetDropped(weaponprop, 3);
 		chr->hidden |= CHRHFLAG_00000001;
 		weapon->unk62 = 240;
 	}
 
-	frame2 = animGetFrame(animdata);
+	frame2 = modelGetCurAnimFrame(model);
 
-	if (frame2 >= func0001d1a0(animdata)) {
+	if (frame2 >= func0001d1a0(model)) {
 		chrStop(chr);
 	} else {
-		if ((frame >= 87 && frame <= 110 && animGetId(animdata) == ANIM_THROWGRENADE_STANDING) ||
-				(frame >= 5 && frame <= 45 && animGetId(animdata) == ANIM_THROWGRENADE_NOPIN) ||
-				((frame >= 20 && frame <= 45 && animGetId(animdata) == ANIM_THROWGRENADE_CROUCHING))) {
+		if ((frame >= 87 && frame <= 110 && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) ||
+				(frame >= 5 && frame <= 45 && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) ||
+				((frame >= 20 && frame <= 45 && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING))) {
 			f32 value = func0f02e15c(chr, 1, 3.2);
 			func0f03e788(chr, 1, 110, value, 0);
 		}
@@ -22596,7 +22596,7 @@ glabel chrTickAttackWalk
 /*  f0442c0:	50200029 */ 	beqzl	$at,.L0f044368
 /*  f0442c4:	c64a0008 */ 	lwc1	$f10,0x8($s2)
 .L0f0442c8:
-/*  f0442c8:	0c00745f */ 	jal	animGetFrame
+/*  f0442c8:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f0442cc:	02202025 */ 	or	$a0,$s1,$zero
 /*  f0442d0:	e7a00034 */ 	swc1	$f0,0x34($sp)
 /*  f0442d4:	0c007486 */ 	jal	func0001d218
@@ -23017,14 +23017,14 @@ glabel func0f044808
 void chrTickRunPos(struct chrdata *chr)
 {
 	struct prop *prop = chr->prop;
-	struct animdata *animdata = chr->animdata;
+	struct model *model = chr->model;
 	u32 race = CHRRACE(chr);
 	f32 fVar6;
 	f32 zero;
 	f32 fVar7;
 
 	if (chr->hidden & CHRHFLAG_00200000) {
-		if (func0001db94(chr->animdata)) {
+		if (func0001db94(chr->model)) {
 			return;
 		}
 
@@ -23038,30 +23038,30 @@ void chrTickRunPos(struct chrdata *chr)
 			|| g_Vars.lvframe60 - 60 > chr->lastmoveok60
 			|| func0f0446e0(&chr->prevpos, &prop->pos, &chr->act_runpos.pos, chr->act_runpos.unk038)) {
 		if (race == RACE_HUMAN) {
-			animGetId(animdata);
+			modelGetAnimNum(model);
 		}
 
 		zero = 0;
-		fVar7 = animGetFrame(animdata);
+		fVar7 = modelGetCurAnimFrame(model);
 		fVar6 = fVar7 - zero;
 
 		if (fVar7 < 0) {
-			fVar6 += func0001d218(animdata);
+			fVar6 += func0001d218(model);
 		}
 
-		if (func0001d218(animdata) * 0.5f < fVar6) {
+		if (func0001d218(model) * 0.5f < fVar6) {
 			zero = 0;
-			func0001df04(animdata, func0001d218(animdata) - zero, 16);
+			func0001df04(model, func0001d218(model) - zero, 16);
 		} else {
 			zero = 0;
-			fVar7 = func0001d218(animdata) * 0.5f;
+			fVar7 = func0001d218(model) * 0.5f;
 			fVar6 = fVar7 - zero;
 
 			if (fVar7 < 0) {
-				fVar6 += func0001d218(animdata);
+				fVar6 += func0001d218(model);
 			}
 
-			func0001df04(animdata, fVar6, 16);
+			func0001df04(model, fVar6, 16);
 		}
 
 		chrStop(chr);
@@ -23076,7 +23076,7 @@ void chrTickRunPos(struct chrdata *chr)
 		fVar7 = 1;
 
 		if (race == RACE_HUMAN) {
-			if (animGetId(animdata) == ANIM_RUNNING_ONEHANDGUN) {
+			if (modelGetAnimNum(model) == ANIM_RUNNING_ONEHANDGUN) {
 				fVar7 = func0f02dff0(ANIM_RUNNING_ONEHANDGUN);
 			} else {
 				fVar7 = func0f02dff0(ANIM_RUNNING_TWOHANDGUN);
@@ -23085,7 +23085,7 @@ void chrTickRunPos(struct chrdata *chr)
 			fVar7 = func0f02dff0(ANIM_SKEDAR_RUNNING);
 		}
 
-		chr->act_runpos.unk038 += fVar7 * g_Vars.lvupdate240freal * func0001d288(animdata);
+		chr->act_runpos.unk038 += fVar7 * g_Vars.lvupdate240freal * func0001d288(model);
 	}
 }
 
@@ -26192,15 +26192,15 @@ void chrTickSkJump(struct chrdata *chr)
 
 		switch (chr->act_skjump.state) {
 		case SKJUMPSTATE_TAKEOFF:
-			func0001dccc(chr->animdata, ANIM_SKEDAR_JUMPSTART, 0, 0, -1, 8);
-			func0001deb0(chr->animdata, 2.5, 0);
+			func0001dccc(chr->model, ANIM_SKEDAR_JUMPSTART, 0, 0, -1, 8);
+			func0001deb0(chr->model, 2.5, 0);
 			break;
 		case SKJUMPSTATE_AIRBORNE: {
 				u16 sounds[] = { 0x532, 0x533, 0x534 };
 				func0f0939f8(NULL, chr->prop, sounds[random() % 3], -1,
 						-1, 0, 0, 0, 0, -1, 0, -1, -1, -1, -1);
-				func0001dccc(chr->animdata, ANIM_SKEDAR_JUMPAIR, 0, 0, -1, 16);
-				func0001deb0(chr->animdata, 1, 0);
+				func0001dccc(chr->model, ANIM_SKEDAR_JUMPAIR, 0, 0, -1, 16);
+				func0001deb0(chr->model, 1, 0);
 			}
 			break;
 		}
@@ -26218,9 +26218,9 @@ void chrTickSkJump(struct chrdata *chr)
 			fVar6 = func0f03e45c(chr);
 			fVar5 = func0001afe8(fVar6, chr->act_skjump.angle, 0.35);
 			func0f03e538(chr, fVar5);
-			frame = animGetFrame(chr->animdata);
+			frame = modelGetCurAnimFrame(chr->model);
 
-			if (frame >= func0001d1a0(chr->animdata)) {
+			if (frame >= func0001d1a0(chr->model)) {
 				chr->act_skjump.state++;
 				chr->act_skjump.needsnewanim = true;
 			}
@@ -27848,14 +27848,14 @@ bool chrCanSeeTargetWithExtraCheck(struct chrdata *chr)
 		if (target->type == PROPTYPE_PLAYER) {
 			if (g_Vars.unk000324 &&
 					(hasLineOfSight(&target->pos, target->rooms, &chr->prop->pos, chr->prop->rooms, 51, 8))) {
-				struct animdata *animdata = chr->animdata;
+				struct model *model = chr->model;
 				struct coord sp68;
 				struct coord sp56;
 				struct coord sp44;
-				f32 somefloat = func0001af80(animdata) * 0.8f;
+				f32 somefloat = func0001af80(model) * 0.8f;
 
 				func0f0a0c08(&sp68, &sp56);
-				func0001ad0c(animdata, &sp44);
+				func0001ad0c(model, &sp44);
 				func00015b64(currentPlayerGetUnk1740(), &sp44);
 
 				if (func0f06b39c(&sp68, &sp56, &sp44, somefloat)) {
@@ -30699,17 +30699,17 @@ s32 func0f004cd84(s32 arg0, s32 arg1)
 
 void func0f04cf90(struct chrdata *chr, s32 arg1)
 {
-	if (chr && chr->animdata && chr->animdata->unk08) {
-		void *value = func0001a91c(chr->animdata->unk08, arg1);
-		struct animdata10 *animdata10 = NULL;
+	if (chr && chr->model && chr->model->unk08) {
+		void *value = func0001a91c(chr->model->unk08, arg1);
+		struct model10 *model10 = NULL;
 
 		if (value != 0) {
-			animdata10 = func0001aa1c(chr->animdata, value);
+			model10 = func0001aa1c(chr->model, value);
 		}
 
-		if (animdata10) {
-			u32 value = animdata10->unk00;
-			animdata10->unk00 = (value == 0);
+		if (model10) {
+			u32 value = model10->unk00;
+			model10->unk00 = (value == 0);
 		}
 	}
 }
@@ -31035,7 +31035,7 @@ glabel var7f1a9448
 
 bool func0f04d44c(struct chrdata *chr)
 {
-	s32 val = animGetId(chr->animdata);
+	s32 val = modelGetAnimNum(chr->model);
 	chr->chrflags &= ~CHRCFLAG_10000000;
 
 	// Possible @bug or just sloppy code: The flag check below can never pass
diff --git a/src/game/chr/chrai.c b/src/game/chr/chrai.c
index f78302d6b..a09cb0b38 100644
--- a/src/game/chr/chrai.c
+++ b/src/game/chr/chrai.c
@@ -710,7 +710,7 @@ void chraiExecute(void *entity, s32 proptype)
 
 		// Check if the ailist should be switched to a different one
 		if (g_Vars.chrdata && (g_Vars.chrdata->chrflags & CHRCFLAG_00200000)) {
-			u32 animnum = animGetId(g_Vars.chrdata->animdata);
+			u32 animnum = modelGetAnimNum(g_Vars.chrdata->model);
 			if (g_Vars.chrdata->aishotlist >= 0
 					&& g_Vars.chrdata->cshield <= 0
 					&& (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gunprop != NULL)
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index cd7117dd7..0168b97c1 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -413,7 +413,7 @@ bool aiChrDoAnimation(void)
 	if (startframe == 0xffff) {
 		fstartframe = 0;
 	} else if (startframe == 0xfffe) {
-		fstartframe = animGetNumFrames(anim_id) - 1;
+		fstartframe = modelGetNumAnimFrames(anim_id) - 1;
 	} else {
 		fstartframe = startframe;
 	}
@@ -424,7 +424,7 @@ bool aiChrDoAnimation(void)
 		fendframe = endframe;
 	}
 
-	if (chr && chr->animdata) {
+	if (chr && chr->model) {
 		f32 result = 1.0f / (s32)cmd[11];
 
 		if (g_Vars.in_cutscene) {
@@ -519,7 +519,7 @@ bool aiIfChrDead(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->animdata || chrIsDead(chr))) {
+	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->model || chrIsDead(chr))) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -566,7 +566,7 @@ bool aiIfChrKnockedOut(void)
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
 	if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) &&
-			(!chr || !chr->animdata || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) {
+			(!chr || !chr->model || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
 	} else {
 		g_Vars.aioffset += 4;
@@ -2500,8 +2500,8 @@ bool aiObjectMoveToPad(void)
 				-pad.look.x, -pad.look.y, -pad.look.z,
 				pad.up.x, pad.up.y, pad.up.z);
 
-		if (obj->animdata) {
-			func00015f04(obj->animdata->unk14, matrix);
+		if (obj->model) {
+			func00015f04(obj->model->unk14, matrix);
 		}
 
 		rooms[0] = pad.room;
@@ -4419,7 +4419,7 @@ bool aiTryEquipWeapon(void)
 	u32 model = cmd[3] | (cmd[2] << 8);
 	struct prop *prop = NULL;
 
-	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->animdata) {
+	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->model) {
 		if (cheatIsActive(CHEAT_MARQUIS)) {
 			flags &= ~0x10000000;
 			flags |= 0x20000000;
@@ -4495,7 +4495,7 @@ bool aiTryEquipHat(void)
 	u32 thing = cmd[3] | (cmd[2] << 8);
 	bool ok = false;
 
-	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->animdata) {
+	if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->model) {
 		ok = chrTryEquipHat(g_Vars.chrdata, thing, flags);
 	}
 
@@ -5326,7 +5326,7 @@ bool aiObjectDoAnimation(void)
 	if (startframe == 0xffff) {
 		fstartframe = 0;
 	} else if (startframe == 0xfffe) {
-		fstartframe = animGetNumFrames(anim_id) - 2;
+		fstartframe = modelGetNumAnimFrames(anim_id) - 2;
 
 		if (fstartframe < 0) {
 			fstartframe = 0;
@@ -5344,22 +5344,22 @@ bool aiObjectDoAnimation(void)
 	}
 
 	if (obj && obj->prop) {
-		struct anim *anim = obj->animdata->anim;
+		struct anim *anim = obj->model->anim;
 
-		if (obj->animdata->anim == NULL) {
-			obj->animdata->anim = func0f0b32e4();
+		if (obj->model->anim == NULL) {
+			obj->model->anim = func0f0b32e4();
 		}
 
-		if (obj->animdata->anim) {
+		if (obj->model->anim) {
 			thing = 1.0f / (s32)cmd[5];
 
 			if (g_Vars.in_cutscene && startframe != 0xfffe) {
 				fstartframe += var8009de20 * thing * 0.25f;
 			}
 
-			func000230a0(obj->animdata->anim);
-			func0001dccc(obj->animdata, anim_id, 0, fstartframe, thing, 0);
-			func0001af64(obj->animdata, func0f15c888() * obj->animdata->unk14 * 100.0f);
+			func000230a0(obj->model->anim);
+			func0001dccc(obj->model, anim_id, 0, fstartframe, thing, 0);
+			func0001af64(obj->model, func0f15c888() * obj->model->unk14 * 100.0f);
 		}
 	}
 
@@ -5376,7 +5376,7 @@ bool aiShowChr(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->animdata) {
+	if (chr && chr->prop && chr->model) {
 		func0f0604bc(chr->prop);
 		propHide(chr->prop);
 		func0f0220ac(chr);
@@ -5395,7 +5395,7 @@ bool aiHideChr(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->animdata) {
+	if (chr && chr->prop && chr->model) {
 		func0f065c44(chr->prop);
 		func0f0605c4(chr->prop);
 		func0f060300(chr->prop);
@@ -5414,7 +5414,7 @@ bool aiShowObj(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct defaultobj *obj = objFindByTagId(cmd[2]);
 
-	if (obj && obj->prop && obj->animdata) {
+	if (obj && obj->prop && obj->model) {
 		func0f0604bc(obj->prop);
 		propHide(obj->prop);
 
@@ -5440,7 +5440,7 @@ bool aiHideObj(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct defaultobj *obj = objFindByTagId(cmd[2]);
 
-	if (obj && obj->prop && obj->animdata) {
+	if (obj && obj->prop && obj->model) {
 		if (obj->prop->parent) {
 			func0f082f88(obj->prop);
 		} else {
@@ -6422,7 +6422,7 @@ bool aiIfCompareChrPresetsTeam(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
 
-	if (!chr || (!chr->animdata && chr->prop->type != PROPTYPE_PLAYER)) {
+	if (!chr || (!chr->model && chr->prop->type != PROPTYPE_PLAYER)) {
 		chrSetChrPreset(g_Vars.chrdata, CHR_BOND);
 		chr = chrFindById(g_Vars.chrdata, CHR_PRESET);
 	}
@@ -6733,7 +6733,7 @@ glabel var7f1a9d4c
 //	while (*chrnums != -2) {
 //		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 //
-//		if (chr && chr->animdata
+//		if (chr && chr->model
 //				&& !chrIsDead(chr)
 //				&& chr->actiontype != ACT_DEAD
 //				&& chr->alertness > 100 // @bug? I don't think this goes higher than 100
@@ -7271,7 +7271,7 @@ bool aiIfSafetyLessThan(void)
 	while (*chrnums != -2) {
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-		if (chr && chr->animdata
+		if (chr && chr->model
 				&& !chrIsDead(chr)
 				&& chr->actiontype != ACT_DEAD
 				&& g_Vars.chrdata->chrnum != chr->chrnum
@@ -8384,7 +8384,7 @@ glabel aiSayQuip
 //		while (*chrnums != -2) {
 //			loopchr = chrFindByLiteralId(*chrnums);
 //
-//			if (loopchr && loopchr->animdata
+//			if (loopchr && loopchr->model
 //					&& !chrIsDead(loopchr)
 //					&& loopchr->actiontype != ACT_DEAD
 //					&& g_Vars.chrdata->squadron == loopchr->squadron
@@ -8545,7 +8545,7 @@ glabel aiSayQuip
 
 void func0f05abdc(struct prop *prop)
 {
-	if (prop && prop->chr && prop->chr->animdata && prop->chr->propsoundcount > 0) {
+	if (prop && prop->chr && prop->chr->model && prop->chr->propsoundcount > 0) {
 		prop->chr->propsoundcount--;
 	}
 }
@@ -8579,7 +8579,7 @@ bool aiIncreaseSquadronAlertness(void)
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
 		if (chr &&
-				chr->animdata &&
+				chr->model &&
 				!chrIsDead(chr) &&
 				chr->actiontype != ACT_DEAD &&
 				(g_Vars.chrdata->squadron == chr->squadron || g_Vars.chrdata->squadron == 255) &&
@@ -8634,7 +8634,7 @@ bool aiSetTeamOrders(void)
 		while (*chrnums != -2) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->animdata
+			if (chr && chr->model
 					&& !chrIsDead(chr)
 					&& chr->actiontype != ACT_DEAD
 					&& chrCompareTeams(g_Vars.chrdata, chr, true)
@@ -8822,7 +8822,7 @@ bool aiIfChrInSquadronDoingAction(void)
 		for (; *chrnums != -2; chrnums++) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->animdata && chrIsDead(chr) == false &&
+			if (chr && chr->model && chrIsDead(chr) == false &&
 					chr->actiontype != ACT_DEAD &&
 					chrCompareTeams(g_Vars.chrdata, chr, 1) &&
 					g_Vars.chrdata->chrnum != chr->chrnum &&
@@ -8876,7 +8876,7 @@ bool aiSetChrPresetToUnalertedTeammate(void)
 	for (; *chrnums != -2; chrnums++) {
 		struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-		if (cmd[3] == 0 && chr && chr->animdata &&
+		if (cmd[3] == 0 && chr && chr->model &&
 				chrIsDead(chr) == false &&
 				chr->actiontype != ACT_DEAD &&
 				chr->actiontype != ACT_DIE &&
@@ -9213,7 +9213,7 @@ bool aiIfSquadronIsDead(void)
 		while (*chrnums != -2) {
 			struct chrdata *chr = chrFindByLiteralId(*chrnums);
 
-			if (chr && chr->animdata) {
+			if (chr && chr->model) {
 				anyalive = false;
 
 				if (!chrIsDead(chr) && chr->actiontype != ACT_DEAD) {
@@ -9508,7 +9508,7 @@ bool aiIfChrHasGun(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->animdata && chr->gunprop == NULL) {
+	if (chr && chr->model && chr->gunprop == NULL) {
 		g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
 	} else {
 		g_Vars.aioffset += 5;
@@ -9647,7 +9647,7 @@ bool aiChrCopyProperties(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->animdata) {
+	if (chr && chr->model) {
 		g_Vars.chrdata->hearingscale = chr->hearingscale;
 		g_Vars.chrdata->visionrange = chr->visionrange;
 		g_Vars.chrdata->padpreset1 = chr->padpreset1;
@@ -11029,7 +11029,7 @@ bool aiSetChrHudpieceVisible(void)
 	u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
 	struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]);
 
-	if (chr && chr->prop && chr->animdata) {
+	if (chr && chr->prop && chr->model) {
 		chrSetHudpieceVisible(chr, cmd[3]);
 	}
 
diff --git a/src/game/game_000130.c b/src/game/game_000130.c
index 1695be465..93055ac38 100644
--- a/src/game/game_000130.c
+++ b/src/game/game_000130.c
@@ -363,14 +363,14 @@ glabel func0f0005c0
 /*  f0005c0:	27bdffe0 */ 	addiu	$sp,$sp,-32
 /*  f0005c4:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f0005c8:	afa40020 */ 	sw	$a0,0x20($sp)
-/*  f0005cc:	0c008dda */ 	jal	animGetNumFrames
+/*  f0005cc:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f0005d0:	87a40022 */ 	lh	$a0,0x22($sp)
 /*  f0005d4:	87a40022 */ 	lh	$a0,0x22($sp)
 /*  f0005d8:	00002825 */ 	or	$a1,$zero,$zero
 /*  f0005dc:	0fc000d6 */ 	jal	func0f000358
 /*  f0005e0:	2446ffff */ 	addiu	$a2,$v0,-1
 /*  f0005e4:	afa20018 */ 	sw	$v0,0x18($sp)
-/*  f0005e8:	0c008dda */ 	jal	animGetNumFrames
+/*  f0005e8:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f0005ec:	87a40022 */ 	lh	$a0,0x22($sp)
 /*  f0005f0:	8fae0018 */ 	lw	$t6,0x18($sp)
 /*  f0005f4:	44824000 */ 	mtc1	$v0,$f8
diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c
index d9596def0..adfe11579 100644
--- a/src/game/game_005fd0.c
+++ b/src/game/game_005fd0.c
@@ -161,7 +161,7 @@ glabel func0f0061dc
 /*  f0062bc:	e7a0006c */ 	swc1	$f0,0x6c($sp)
 .L0f0062c0:
 /*  f0062c0:	8e240020 */ 	lw	$a0,0x20($s1)
-/*  f0062c4:	0c00744f */ 	jal	animGetId
+/*  f0062c4:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0062c8:	afa30050 */ 	sw	$v1,0x50($sp)
 /*  f0062cc:	8fa30050 */ 	lw	$v1,0x50($sp)
 /*  f0062d0:	24010023 */ 	addiu	$at,$zero,0x23
diff --git a/src/game/game_016100.c b/src/game/game_016100.c
index 9659edf2c..e59bf9622 100644
--- a/src/game/game_016100.c
+++ b/src/game/game_016100.c
@@ -59,12 +59,12 @@ u32 var800624e8 = 0x00000001;
 u32 var800624ec = 0x00000001;
 u32 var800624f0 = 0x00000000;
 u32 var800624f4 = 0x00000001;
-struct animdata *g_TitleModel = NULL;
-struct animdata *g_TitleModel2 = NULL;
+struct model *g_TitleModel = NULL;
+struct model *g_TitleModel2 = NULL;
 u32 var80062500 = 0x00000000;
 u32 var80062504 = 0x00000000;
-struct animdata *var80062508 = NULL;
-struct animdata *var8006250c = NULL;
+struct model *var80062508 = NULL;
+struct model *var8006250c = NULL;
 u32 var80062510 = 0x00000000;
 u32 var80062514 = 0x00000000;
 u32 var80062518 = 0x96969600;
diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c
index 3e443615e..9316fdcd4 100644
--- a/src/game/game_02cde0.c
+++ b/src/game/game_02cde0.c
@@ -958,7 +958,7 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
 	s16 rooms[2];
 	struct prop *prop;
 	struct chrdata *chr;
-	struct animdata *animdata;
+	struct model *model;
 	s32 inlift;
 	struct prop *lift;
 	f32 ground;
@@ -991,10 +991,10 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
 	}
 #endif
 
-	animdata = func0f02d36c(BODY_EYESPY, 0, 0);
+	model = func0f02d36c(BODY_EYESPY, 0, 0);
 
-	if (animdata) {
-		prop = func0f020cc8(animdata, &pad->pos, rooms, 0, ailistFindById(GAILIST_IDLE));
+	if (model) {
+		prop = func0f020cc8(model, &pad->pos, rooms, 0, ailistFindById(GAILIST_IDLE));
 
 		if (prop) {
 			func0f0604bc(prop);
diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index c77a53124..b919feed8 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -751,7 +751,7 @@ glabel func0f09815c
 /*  f098194:	0c007486 */ 	jal	func0001d218
 /*  f098198:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f09819c:	8fa40018 */ 	lw	$a0,0x18($sp)
-/*  f0981a0:	0c00745f */ 	jal	animGetFrame
+/*  f0981a0:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f0981a4:	afa2001c */ 	sw	$v0,0x1c($sp)
 /*  f0981a8:	8fb8001c */ 	lw	$t8,0x1c($sp)
 /*  f0981ac:	44982000 */ 	mtc1	$t8,$f4
@@ -760,7 +760,7 @@ glabel func0f09815c
 /*  f0981b8:	10000007 */ 	beqz	$zero,.L0f0981d8
 /*  f0981bc:	46003001 */ 	sub.s	$f0,$f6,$f0
 .L0f0981c0:
-/*  f0981c0:	0c00745f */ 	jal	animGetFrame
+/*  f0981c0:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f0981c4:	24a40384 */ 	addiu	$a0,$a1,0x384
 /*  f0981c8:	10000004 */ 	beqz	$zero,.L0f0981dc
 /*  f0981cc:	8fbf0014 */ 	lw	$ra,0x14($sp)
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index 38dcd2038..3803b7b47 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -4431,7 +4431,7 @@ void func0f0ba010(void)
 	var8009de2c = -1;
 	var80070764 = 1;
 	func0f11dcb0(1);
-	g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < animGetNumFrames(var8009de18) - 1;
+	g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < modelGetNumAnimFrames(var8009de18) - 1;
 	g_Vars.unk0004e2 = 0;
 }
 
@@ -4506,7 +4506,7 @@ glabel var7f1ad5d8
 /*  f0ba198:	ac24de2c */ 	sw	$a0,%lo(var8009de2c)($at)
 /*  f0ba19c:	afbf0024 */ 	sw	$ra,0x24($sp)
 /*  f0ba1a0:	3c04800a */ 	lui	$a0,%hi(var8009de18)
-/*  f0ba1a4:	0c008dda */ 	jal	animGetNumFrames
+/*  f0ba1a4:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f0ba1a8:	8484de18 */ 	lh	$a0,%lo(var8009de18)($a0)
 /*  f0ba1ac:	244effff */ 	addiu	$t6,$v0,-1
 /*  f0ba1b0:	3c04800a */ 	lui	$a0,%hi(var8009de18)
@@ -4605,7 +4605,7 @@ glabel var7f1ad5dc
 /*  f0ba2fc:	2652de18 */ 	addiu	$s2,$s2,%lo(var8009de18)
 /*  f0ba300:	0c008f4e */ 	jal	func00023d38
 /*  f0ba304:	86440000 */ 	lh	$a0,0x0($s2)
-/*  f0ba308:	0c008dda */ 	jal	animGetNumFrames
+/*  f0ba308:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f0ba30c:	86440000 */ 	lh	$a0,0x0($s2)
 /*  f0ba310:	8e780290 */ 	lw	$t8,0x290($s3)
 /*  f0ba314:	2444ffff */ 	addiu	$a0,$v0,-1
@@ -12801,7 +12801,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
 			}
 		}
 
-		if (animGetFrame(&g_Vars.currentplayer->animdata) >= func0001d1a0(&g_Vars.currentplayer->animdata)
+		if (modelGetCurAnimFrame(&g_Vars.currentplayer->model) >= func0001d1a0(&g_Vars.currentplayer->model)
 				&& g_Vars.currentplayer->redbloodfinished) {
 			if (g_Vars.currentplayer->deathanimfinished == false) {
 				g_Vars.currentplayer->deathanimfinished = true;
@@ -14156,7 +14156,7 @@ glabel var7f1ad710
 /*  f0c2608:	0fc0a209 */ 	jal	chrGetEquippedWeaponProp
 /*  f0c260c:	00002825 */ 	or	$a1,$zero,$zero
 /*  f0c2610:	afa20068 */ 	sw	$v0,0x68($sp)
-/*  f0c2614:	0c00744f */ 	jal	animGetId
+/*  f0c2614:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0c2618:	8e040020 */ 	lw	$a0,0x20($s0)
 /*  f0c261c:	afa20078 */ 	sw	$v0,0x78($sp)
 /*  f0c2620:	0fc331ab */ 	jal	playerGetCrouchPos
@@ -14186,7 +14186,7 @@ glabel var7f1ad710
 /*  f0c267c:	8e040020 */ 	lw	$a0,0x20($s0)
 .L0f0c2680:
 /*  f0c2680:	e7a20070 */ 	swc1	$f2,0x70($sp)
-/*  f0c2684:	0c00744f */ 	jal	animGetId
+/*  f0c2684:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0c2688:	e7a00074 */ 	swc1	$f0,0x74($sp)
 /*  f0c268c:	8fb80078 */ 	lw	$t8,0x78($sp)
 /*  f0c2690:	c7a00074 */ 	lwc1	$f0,0x74($sp)
@@ -14518,7 +14518,7 @@ glabel var7f1ad744
 /*  f0c2ac8:	afa70050 */ 	sw	$a3,0x50($sp)
 /*  f0c2acc:	afa60054 */ 	sw	$a2,0x54($sp)
 /*  f0c2ad0:	afa50058 */ 	sw	$a1,0x58($sp)
-/*  f0c2ad4:	0c00744f */ 	jal	animGetId
+/*  f0c2ad4:	0c00744f */ 	jal	modelGetAnimNum
 /*  f0c2ad8:	afa3005c */ 	sw	$v1,0x5c($sp)
 /*  f0c2adc:	afa20040 */ 	sw	$v0,0x40($sp)
 /*  f0c2ae0:	0fc0e6a5 */ 	jal	chrIsDead
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 8f17dd9ab..695640d72 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -4887,7 +4887,7 @@ glabel var7f1b2948
 /*  f0f4a2c:	0c007486 */ 	jal	func0001d218
 /*  f0f4a30:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a34:	afa2004c */ 	sw	$v0,0x4c($sp)
-/*  f0f4a38:	0c00745f */ 	jal	animGetFrame
+/*  f0f4a38:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f0f4a3c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a40:	8fae004c */ 	lw	$t6,0x4c($sp)
 /*  f0f4a44:	448e3000 */ 	mtc1	$t6,$f6
@@ -4896,7 +4896,7 @@ glabel var7f1b2948
 /*  f0f4a50:	10000004 */ 	beqz	$zero,.L0f0f4a64
 /*  f0f4a54:	46005081 */ 	sub.s	$f2,$f10,$f0
 .L0f0f4a58:
-/*  f0f4a58:	0c00745f */ 	jal	animGetFrame
+/*  f0f4a58:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f0f4a5c:	8fa4003c */ 	lw	$a0,0x3c($sp)
 /*  f0f4a60:	46000086 */ 	mov.s	$f2,$f0
 .L0f0f4a64:
diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c
index 41d54319f..903d3fdcb 100644
--- a/src/game/game_0fd660.c
+++ b/src/game/game_0fd660.c
@@ -574,7 +574,7 @@ s32 activemenuGetFirstBuddyIndex(void)
 			if (chr && chr->actiontype != ACT_DIE
 					&& chr->actiontype != ACT_DEAD
 					&& chr->prop
-					&& chr->animdata) {
+					&& chr->model) {
 				return i;
 			}
 		}
diff --git a/src/game/game_113220.c b/src/game/game_113220.c
index 71f8a3aa3..7f8a28f69 100644
--- a/src/game/game_113220.c
+++ b/src/game/game_113220.c
@@ -53,7 +53,7 @@ u32 var80075c9c = 0x00000000;
 
 void currentPlayerFlipAnimation(void)
 {
-	g_Vars.currentplayer->animdata.anim->flip = !g_Vars.currentplayer->animdata.anim->flip;
+	g_Vars.currentplayer->model.anim->flip = !g_Vars.currentplayer->model.anim->flip;
 }
 
 void currentPlayerUpdateIdleHeadRoll(void)
@@ -751,14 +751,14 @@ glabel func0f1140bc
 
 void func0f11412c(f32 speed)
 {
-	func0001deb0(&g_Vars.currentplayer->animdata, speed * 0.5f, 0);
+	func0001deb0(&g_Vars.currentplayer->model, speed * 0.5f, 0);
 }
 
 f32 func0f11416c(void)
 {
 	if (g_Vars.currentplayer->unk03ac >= 0) {
 		f32 a = g_Vars.currentplayer->unk0198 * 0.012500001f + 0.004166667f;
-		f32 b = func0001d288(&g_Vars.currentplayer->animdata);
+		f32 b = func0001d288(&g_Vars.currentplayer->model);
 
 		if (b > 0) {
 			f32 c = b / (var80075c00[g_Vars.currentplayer->unk03ac].unk08 - var80075c00[g_Vars.currentplayer->unk03ac].unk04);
diff --git a/src/game/game_129900.c b/src/game/game_129900.c
index 03e51944d..33df13406 100644
--- a/src/game/game_129900.c
+++ b/src/game/game_129900.c
@@ -347,7 +347,7 @@ void alertNearbyChrsToNoise(f32 *radius, struct coord *noisepos)
 	s32 i;
 
 	for (i = 0; i < g_NumChrsA; i++) {
-		if (g_ChrsA[i].animdata
+		if (g_ChrsA[i].model
 				&& chrGetTargetProp(&g_ChrsA[i]) == g_Vars.currentplayer->prop
 				&& g_ChrsA[i].prop
 				&& g_ChrsA[i].prop->type == PROPTYPE_CHR
diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c
index 324743446..1b1c40477 100644
--- a/src/game/game_167ae0.c
+++ b/src/game/game_167ae0.c
@@ -2648,7 +2648,7 @@ glabel var7f1b7868
 /*  f16a378:	00008025 */ 	or	$s0,$zero,$zero
 /*  f16a37c:	44800000 */ 	mtc1	$zero,$f0
 /*  f16a380:	8484de18 */ 	lh	$a0,%lo(var8009de18)($a0)
-/*  f16a384:	0c008dda */ 	jal	animGetNumFrames
+/*  f16a384:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*  f16a388:	e7a000c4 */ 	swc1	$f0,0xc4($sp)
 /*  f16a38c:	3c03800a */ 	lui	$v1,%hi(var8009de10)
 /*  f16a390:	8c63de10 */ 	lw	$v1,%lo(var8009de10)($v1)
diff --git a/src/game/game_190260.c b/src/game/game_190260.c
index e7274854a..30b9588bc 100644
--- a/src/game/game_190260.c
+++ b/src/game/game_190260.c
@@ -442,10 +442,10 @@ void mpInitSimulant(struct chrdata *chr, u8 full)
 		thing = scenarioCallback2c(chr->chrwidth, &pos, rooms, chr->prop);
 		chr->hidden |= CHRHFLAG_00100000;
 		chrMoveToPos(chr, &pos, rooms, thing, true);
-		chr->aibot->unk0a4 = func0001ae44(chr->animdata);
+		chr->aibot->unk0a4 = func0001ae44(chr->model);
 		chr->aibot->unk0a8 = 0;
 		chr->aibot->unk0ac = 0;
-		chr->aibot->unk0b0 = func0001ae44(chr->animdata);
+		chr->aibot->unk0b0 = func0001ae44(chr->model);
 		chr->aibot->unk0b4 = 0;
 		chr->aibot->unk0b8 = 0;
 		func0f02e9a0(chr, 0);
diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c
index 6feef6d06..22f1ccd3c 100644
--- a/src/game/game_1999b0.c
+++ b/src/game/game_1999b0.c
@@ -361,7 +361,7 @@ bool aibotDoFarsightThing(struct chrdata *chr, u32 arg1, struct coord *arg2, str
 						&& func0f06b39c(arg3, arg2, &oppprop->pos, func0f0278a4(oppchr))) {
 					func0f0a7d98(sp156, oppprop, -1);
 
-					if (oppchr->animdata && chrGetShield(oppchr) > 0) {
+					if (oppchr->model && chrGetShield(oppchr) > 0) {
 						func0f03ff2c(oppchr, &oppprop->pos, arg2, &sp172, &sp160, &sp168, &sp164);
 					}
 
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index c647e0f75..3638c5574 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -4140,7 +4140,7 @@ void func0f1a0924(struct prop *prop)
 		sp56 = -2;
 		sp60 = -2;
 
-		func0f068018(obj->animdata, &sp56, &sp64, &sp60, &sp68);
+		func0f068018(obj->model, &sp56, &sp64, &sp60, &sp68);
 
 		for (i = 0; i < 4; i++) {
 			if (g_Vars.currentplayer->unk1630[i].prop == prop) {
diff --git a/src/game/propobj.c b/src/game/propobj.c
index fa53919c8..0fe699296 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -28051,7 +28051,7 @@ glabel var7f1aa6ec
 /*  f07ea0c:	24010006 */ 	addiu	$at,$zero,0x6
 /*  f07ea10:	13010016 */ 	beq	$t8,$at,.L0f07ea6c
 /*  f07ea14:	00000000 */ 	sll	$zero,$zero,0x0
-/*  f07ea18:	0c00745f */ 	jal	animGetFrame
+/*  f07ea18:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f07ea1c:	01202025 */ 	or	$a0,$t1,$zero
 /*  f07ea20:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*  f07ea24:	0c007486 */ 	jal	func0001d218
@@ -28421,7 +28421,7 @@ glabel var7f1aa6ec
 /*  f07ef84:	0fc1979d */ 	jal	func0f065e74
 /*  f07ef88:	afa50034 */ 	sw	$a1,0x34($sp)
 .L0f07ef8c:
-/*  f07ef8c:	0c00745f */ 	jal	animGetFrame
+/*  f07ef8c:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f07ef90:	8fa40254 */ 	lw	$a0,0x254($sp)
 /*  f07ef94:	e7a00044 */ 	swc1	$f0,0x44($sp)
 /*  f07ef98:	0c007486 */ 	jal	func0001d218
@@ -37848,7 +37848,7 @@ void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin)
 			*ymin = obj->geo->ymin;
 			*ymax = obj->geo->ymax;
 		} else {
-			*width = func0001af80(obj->animdata);
+			*width = func0001af80(obj->model);
 			*ymin = obj->geo->ymin;
 			*ymax = obj->geo->ymax;
 		}
diff --git a/src/game/splat.c b/src/game/splat.c
index 1b676ddb1..7a118ec9e 100644
--- a/src/game/splat.c
+++ b/src/game/splat.c
@@ -101,7 +101,7 @@ glabel func0f148b80
 /*  f148c6c:	8c640020 */ 	lw	$a0,0x20($v1)
 /*  f148c70:	e7a20038 */ 	swc1	$f2,0x38($sp)
 /*  f148c74:	a3a80043 */ 	sb	$t0,0x43($sp)
-/*  f148c78:	0c00745f */ 	jal	animGetFrame
+/*  f148c78:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f148c7c:	afa3004c */ 	sw	$v1,0x4c($sp)
 /*  f148c80:	c7a20038 */ 	lwc1	$f2,0x38($sp)
 /*  f148c84:	8fa3004c */ 	lw	$v1,0x4c($sp)
@@ -111,7 +111,7 @@ glabel func0f148b80
 /*  f148c94:	45020007 */ 	bc1fl	.L0f148cb4
 /*  f148c98:	946d0336 */ 	lhu	$t5,0x336($v1)
 /*  f148c9c:	8c640020 */ 	lw	$a0,0x20($v1)
-/*  f148ca0:	0c00745f */ 	jal	animGetFrame
+/*  f148ca0:	0c00745f */ 	jal	modelGetCurAnimFrame
 /*  f148ca4:	afa3004c */ 	sw	$v1,0x4c($sp)
 /*  f148ca8:	10000061 */ 	beqz	$zero,.L0f148e30
 /*  f148cac:	8fa3004c */ 	lw	$v1,0x4c($sp)
diff --git a/src/include/game/chr/chr.h b/src/include/game/chr/chr.h
index 7e78e2bac..d46007aad 100644
--- a/src/include/game/chr/chr.h
+++ b/src/include/game/chr/chr.h
@@ -11,7 +11,7 @@ u32 func0f01f264(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg3, bo
 void func0f01f378(void);
 s32 chrsGetNumFree(void);
 s16 getLowestUnusedChrId(void);
-struct prop *func0f020b14(struct prop *prop, struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
+struct prop *func0f020b14(struct prop *prop, struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
 void func0f020d44(struct prop *prop, bool arg1);
 u32 func0f021258(void);
 void func0f02133c(struct chrdata *chr);
@@ -75,7 +75,7 @@ f32 chrGetMaxDamage(struct chrdata *chr);
 void chrAddHealth(struct chrdata *chr, f32 health);
 f32 chrGetArmor(struct chrdata *chr);
 void chrInit(struct prop *prop, u8 *ailist);
-struct prop *func0f020cc8(struct animdata *animdata, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
+struct prop *func0f020cc8(struct model *model, struct coord *pos, s16 *rooms, f32 arg3, u8 *ailist);
 void propClearReferences(s32 propnum);
 void func0f022084(struct chrdata *chr, s16 *room);
 void func0f0220ac(struct chrdata *chr);
diff --git a/src/include/game/data/data_0083d0.h b/src/include/game/data/data_0083d0.h
index 57922737e..350ccb624 100644
--- a/src/include/game/data/data_0083d0.h
+++ b/src/include/game/data/data_0083d0.h
@@ -32,10 +32,10 @@ extern u32 var800624e8;
 extern u32 var800624ec;
 extern u32 var800624f0;
 extern u32 var800624f4;
-extern struct animdata *g_TitleModel;
-extern struct animdata *g_TitleModel2;
-extern struct animdata *var80062508;
-extern struct animdata *var8006250c;
+extern struct model *g_TitleModel;
+extern struct model *g_TitleModel2;
+extern struct model *var80062508;
+extern struct model *var8006250c;
 extern u32 var80062530;
 extern u32 var80062538;
 extern u32 var80062560;
diff --git a/src/include/game/game_02cde0.h b/src/include/game/game_02cde0.h
index a696a0d92..d965e157b 100644
--- a/src/include/game/game_02cde0.h
+++ b/src/include/game/game_02cde0.h
@@ -7,7 +7,7 @@ u32 bodyGetRace(s32 bodynum);
 bool bodyLoad(u32 bodynum);
 u32 func0f02ce8c(void);
 u32 func0f02d338(void);
-struct animdata *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
+struct model *func0f02d36c(u32 bodynum, u32 arg1, u32 arg2);
 u32 func0f02d3f8(void);
 u32 bodyGetHead(u32 bodynum);
 u32 func0f02d4fc(void);
diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h
index f678cf883..32bea2e27 100644
--- a/src/include/game/game_0b28d0.h
+++ b/src/include/game/game_0b28d0.h
@@ -6,9 +6,9 @@
 u32 func0f0b28d0(void);
 void func0f0b2904(void);
 u32 func0f0b2b64(void);
-struct animdata *func0f0b30ac(void *modelfiledata);
-void modelFree(struct animdata *animdata);
-struct animdata *func0f0b3280(void *modelfiledata);
+struct model *func0f0b30ac(void *modelfiledata);
+void modelFree(struct model *model);
+struct model *func0f0b3280(void *modelfiledata);
 u32 func0f0b32a0(void);
 struct anim *func0f0b32e4(void);
 u32 func0f0b3338(void);
diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h
index 9564a18c8..c3a17706a 100644
--- a/src/include/game/propobj.h
+++ b/src/include/game/propobj.h
@@ -49,7 +49,7 @@ u32 func0f0679ac(void);
 u32 func0f067bc4(void);
 u32 func0f067d88(void);
 u32 func0f067dc4(void);
-void func0f068018(struct animdata *animdata, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
+void func0f068018(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4);
 u32 func0f06803c(void);
 struct defaultobj *objFindByPadNum(s32 padnum);
 u32 func0f068218(void);
diff --git a/src/include/lib/lib_1a500.h b/src/include/lib/lib_1a500.h
index 8b2af9303..932c3d0dc 100644
--- a/src/include/lib/lib_1a500.h
+++ b/src/include/lib/lib_1a500.h
@@ -14,20 +14,20 @@ u32 func0001a740(void);
 u32 func0001a784(void);
 u32 func0001a7cc(void);
 u32 func0001a85c(void);
-void *func0001a91c(struct animdata08 *arg0, s32 arg1);
+void *func0001a91c(struct model08 *arg0, s32 arg1);
 struct modelthing *func0001a9bc(void *modelfiledata, s32 arg1);
 u32 func0001a9e8(void);
-struct animdata10 *func0001aa1c(struct animdata *animdata, void *arg1);
+struct model10 *func0001aa1c(struct model *model, void *arg1);
 u32 func0001ab0c(void);
 u32 func0001abc4(void);
-void func0001ad0c(struct animdata *animdata, struct coord *coord);
-void func0001ad34(struct animdata *animdata, struct coord *coord);
+void func0001ad0c(struct model *model, struct coord *coord);
+void func0001ad34(struct model *model, struct coord *coord);
 u32 func0001ad5c(void);
-f32 func0001ae44(struct animdata *animdata);
-void func0001ae90(struct animdata *animdata, f32 arg1);
-void func0001af58(struct animdata *animdata, f32 arg1);
-void func0001af64(struct animdata *animdata, f32 arg1);
-f32 func0001af80(struct animdata *animdata);
+f32 func0001ae44(struct model *model);
+void func0001ae90(struct model *model, f32 arg1);
+void func0001af58(struct model *model, f32 arg1);
+void func0001af64(struct model *model, f32 arg1);
+f32 func0001af80(struct model *model);
 u32 func0001af98(void);
 f32 func0001afe8(f32 arg0, f32 distance, f32 arg2);
 u32 func0001b07c(void);
@@ -50,27 +50,27 @@ u32 func0001cc20(void);
 u32 func0001cd18(void);
 u32 func0001ce64(void);
 u32 func0001cebc(void);
-u32 animGetId(struct animdata *animdata);
-bool animIsFlipped(struct animdata *animdata);
-f32 animGetFrame(struct animdata *animdata);
-f32 func0001d1a0(struct animdata *animdata);
-s32 func0001d218(struct animdata *animdata);
-f32 func0001d260(struct animdata *animdata);
-f32 func0001d288(struct animdata *animdata);
+u32 modelGetAnimNum(struct model *model);
+bool modelIsFlipped(struct model *model);
+f32 modelGetCurAnimFrame(struct model *model);
+f32 func0001d1a0(struct model *model);
+s32 func0001d218(struct model *model);
+f32 func0001d260(struct model *model);
+f32 func0001d288(struct model *model);
 u32 func0001d320(void);
 u32 func0001d4fc(void);
 u32 func0001d62c(void);
-u32 func0001db94(struct animdata *animdata);
-void func0001dbfc(struct animdata *animdata, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
-void func0001dccc(struct animdata *animdata, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
+u32 func0001db94(struct model *model);
+void func0001dbfc(struct model *model, s32 arg1, u32 arg2, f32 arg3, f32 arg4, f32 arg5);
+void func0001dccc(struct model *model, s32 animnum, s32 flip, f32 fstartframe, f32 arg4, f32 arg5);
 u32 func0001dd90(void);
-void func0001ddec(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001de1c(struct animdata *animdata, f32 arg1);
+void func0001ddec(struct model *model, f32 arg1, f32 arg2);
+void func0001de1c(struct model *model, f32 arg1);
 u32 func0001de98(void);
-void func0001deb0(struct animdata *animdata, f32 speed, f32 startframe);
-void func0001df04(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001dfac(struct animdata *animdata, f32 arg1, f32 arg2);
-void func0001e000(struct animdata *animdata, void *callback);
+void func0001deb0(struct model *model, f32 speed, f32 startframe);
+void func0001df04(struct model *model, f32 arg1, f32 arg2);
+void func0001dfac(struct model *model, f32 arg1, f32 arg2);
+void func0001e000(struct model *model, void *callback);
 u32 func0001e018(void);
 u32 func0001e14c(void);
 u32 func0001e29c(void);
diff --git a/src/include/lib/lib_233c0.h b/src/include/lib/lib_233c0.h
index a6fade077..4a7a0ab85 100644
--- a/src/include/lib/lib_233c0.h
+++ b/src/include/lib/lib_233c0.h
@@ -6,7 +6,7 @@
 u32 func000233c0(void);
 u32 func00023640(void);
 void func0002373c(void);
-s32 animGetNumFrames(s16 anim_id);
+s32 modelGetNumAnimFrames(s16 anim_id);
 u32 func00023794(void);
 u32 func000237dc(void);
 u32 func000237e8(void);
diff --git a/src/include/types.h b/src/include/types.h
index ee88b8760..b7d288f1a 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -125,26 +125,26 @@ struct anim {
 	/*0x88*/ u32 animscale;
 };
 
-struct animdata08_00 {
+struct model08_00 {
 	u16 unk00;
 };
 
-struct animdata08 {
-	struct animdata08_00 *unk00;
+struct model08 {
+	struct model08_00 *unk00;
 };
 
-struct animdata10 {
+struct model10 {
 	u32 unk00;
 	f32 ground;
 };
 
-struct animdata {
+struct model {
 	/*0x00*/ u8 unk00;
 	/*0x01*/ u8 unk01;
 	/*0x04*/ struct chrdata *chr;
-	/*0x08*/ struct animdata08 *unk08;
+	/*0x08*/ struct model08 *unk08;
 	/*0x0c*/ u32 unk0c;
-	/*0x10*/ struct animdata10 *unk10;
+	/*0x10*/ struct model10 *unk10;
 	/*0x14*/ f32 unk14;
 	/*0x18*/ u32 unk18;
 	/*0x1c*/ u32 unk1c;
@@ -584,7 +584,7 @@ struct chrdata {
 	/*0x014*/ u32 hidden;
 	/*0x018*/ u32 chrflags;
 	/*0x01c*/ struct prop *prop;
-	/*0x020*/ struct animdata *animdata;
+	/*0x020*/ struct model *model;
 	/*0x024*/ f32 chrwidth;
 	/*0x028*/ f32 chrheight;
 
@@ -864,7 +864,7 @@ struct defaultobj {
 	/*0x0c*/ u32 flags2;
 	/*0x10*/ u32 flags3;
 	/*0x14*/ struct prop *prop;
-	/*0x18*/ struct animdata *animdata;
+	/*0x18*/ struct model *model;
 	/*0x1c*/ f32 realrot[9];
 	/*0x40*/ u32 hidden;
 	/*0x44*/ struct geo *geo;
@@ -1911,7 +1911,7 @@ struct player {
 	/*0x0428*/ struct coord standlook[2];
 	/*0x0440*/ struct coord standup[2];
 	/*0x0458*/ s32 standcnt;
-	/*0x045c*/ struct animdata animdata;
+	/*0x045c*/ struct model model;
 	/*0x0480*/ struct eyespy *eyespy;
 	/*0x0484*/ u32 unk0484;
 	/*0x0488*/ u32 unk0488;
diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c
index cab981765..42cdcb863 100644
--- a/src/lib/lib_1a500.c
+++ b/src/lib/lib_1a500.c
@@ -3551,28 +3551,28 @@ glabel func0001cebc
 /*    1d138:	00000000 */ 	sll	$zero,$zero,0x0
 );
 
-u32 animGetId(struct animdata *animdata)
+u32 modelGetAnimNum(struct model *model)
 {
-	if (animdata->anim) {
-		return animdata->anim->animnum;
+	if (model->anim) {
+		return model->anim->animnum;
 	}
 
 	return 0;
 }
 
-bool animIsFlipped(struct animdata *animdata)
+bool modelIsFlipped(struct model *model)
 {
-	if (animdata->anim) {
-		return animdata->anim->flip;
+	if (model->anim) {
+		return model->anim->flip;
 	}
 
 	return false;
 }
 
-f32 animGetFrame(struct animdata *animdata)
+f32 modelGetCurAnimFrame(struct model *model)
 {
-	if (animdata->anim) {
-		return animdata->anim->frame;
+	if (model->anim) {
+		return model->anim->frame;
 	}
 
 	return 0;
@@ -3597,7 +3597,7 @@ glabel func0001d1a0
 .L0001d1d8:
 /*    1d1d8:	10800007 */ 	beqz	$a0,.L0001d1f8
 /*    1d1dc:	00000000 */ 	sll	$zero,$zero,0x0
-/*    1d1e0:	0c008dda */ 	jal	animGetNumFrames
+/*    1d1e0:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d1e4:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1d1e8:	244effff */ 	addiu	$t6,$v0,-1
 /*    1d1ec:	448e2000 */ 	mtc1	$t6,$f4
@@ -3624,11 +3624,11 @@ glabel func0001d218
 /*    1d224:	00001025 */ 	or	$v0,$zero,$zero
 /*    1d228:	11c00009 */ 	beqz	$t6,.L0001d250
 /*    1d22c:	00000000 */ 	sll	$zero,$zero,0x0
-/*    1d230:	0c00744f */ 	jal	animGetId
+/*    1d230:	0c00744f */ 	jal	modelGetAnimNum
 /*    1d234:	00000000 */ 	sll	$zero,$zero,0x0
 /*    1d238:	00022400 */ 	sll	$a0,$v0,0x10
 /*    1d23c:	00047c03 */ 	sra	$t7,$a0,0x10
-/*    1d240:	0c008dda */ 	jal	animGetNumFrames
+/*    1d240:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d244:	01e02025 */ 	or	$a0,$t7,$zero
 /*    1d248:	10000002 */ 	beqz	$zero,.L0001d254
 /*    1d24c:	8fbf0014 */ 	lw	$ra,0x14($sp)
@@ -3730,13 +3730,13 @@ glabel func0001d320
 /*    1d37c:	00046403 */ 	sra	$t4,$a0,0x10
 /*    1d380:	01802025 */ 	or	$a0,$t4,$zero
 /*    1d384:	a7a50026 */ 	sh	$a1,0x26($sp)
-/*    1d388:	0c008dda */ 	jal	animGetNumFrames
+/*    1d388:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d38c:	afa60020 */ 	sw	$a2,0x20($sp)
 /*    1d390:	87a50026 */ 	lh	$a1,0x26($sp)
 /*    1d394:	afa2001c */ 	sw	$v0,0x1c($sp)
 /*    1d398:	00052400 */ 	sll	$a0,$a1,0x10
 /*    1d39c:	00046c03 */ 	sra	$t5,$a0,0x10
-/*    1d3a0:	0c008dda */ 	jal	animGetNumFrames
+/*    1d3a0:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d3a4:	01a02025 */ 	or	$a0,$t5,$zero
 /*    1d3a8:	8fa60020 */ 	lw	$a2,0x20($sp)
 /*    1d3ac:	8fae001c */ 	lw	$t6,0x1c($sp)
@@ -3780,7 +3780,7 @@ glabel func0001d320
 /*    1d434:	00403025 */ 	or	$a2,$v0,$zero
 /*    1d438:	a7a50026 */ 	sh	$a1,0x26($sp)
 .L0001d43c:
-/*    1d43c:	0c008dda */ 	jal	animGetNumFrames
+/*    1d43c:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d440:	afa60020 */ 	sw	$a2,0x20($sp)
 /*    1d444:	8fa60020 */ 	lw	$a2,0x20($sp)
 /*    1d448:	87a50026 */ 	lh	$a1,0x26($sp)
@@ -3803,7 +3803,7 @@ glabel func0001d320
 .L0001d48c:
 /*    1d48c:	0004c403 */ 	sra	$t8,$a0,0x10
 /*    1d490:	03002025 */ 	or	$a0,$t8,$zero
-/*    1d494:	0c008dda */ 	jal	animGetNumFrames
+/*    1d494:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d498:	afa60020 */ 	sw	$a2,0x20($sp)
 /*    1d49c:	8fa60020 */ 	lw	$a2,0x20($sp)
 /*    1d4a0:	00c2001a */ 	div	$zero,$a2,$v0
@@ -3824,7 +3824,7 @@ glabel func0001d320
 .L0001d4d4:
 /*    1d4d4:	00052400 */ 	sll	$a0,$a1,0x10
 /*    1d4d8:	0004cc03 */ 	sra	$t9,$a0,0x10
-/*    1d4dc:	0c008dda */ 	jal	animGetNumFrames
+/*    1d4dc:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1d4e0:	03202025 */ 	or	$a0,$t9,$zero
 /*    1d4e4:	2446ffff */ 	addiu	$a2,$v0,-1
 .L0001d4e8:
@@ -4484,7 +4484,7 @@ glabel func0001de1c
 /*    1de38:	50800010 */ 	beqzl	$a0,.L0001de7c
 /*    1de3c:	3c01bf80 */ 	lui	$at,0xbf80
 /*    1de40:	afa3001c */ 	sw	$v1,0x1c($sp)
-/*    1de44:	0c008dda */ 	jal	animGetNumFrames
+/*    1de44:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1de48:	e7ac0024 */ 	swc1	$f12,0x24($sp)
 /*    1de4c:	244effff */ 	addiu	$t6,$v0,-1
 /*    1de50:	448e2000 */ 	mtc1	$t6,$f4
@@ -4569,7 +4569,7 @@ glabel func0001df04
 /*    1df40:	e7ae0028 */ 	swc1	$f14,0x28($sp)
 /*    1df44:	e7ac0024 */ 	swc1	$f12,0x24($sp)
 /*    1df48:	afa70020 */ 	sw	$a3,0x20($sp)
-/*    1df4c:	0c008dda */ 	jal	animGetNumFrames
+/*    1df4c:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1df50:	afa3001c */ 	sw	$v1,0x1c($sp)
 /*    1df54:	44822000 */ 	mtc1	$v0,$f4
 /*    1df58:	8fa3001c */ 	lw	$v1,0x1c($sp)
@@ -5798,7 +5798,7 @@ glabel func0001ee18
 /*    1f0a0:	c6140060 */ 	lwc1	$f20,0x60($s0)
 /*    1f0a4:	86040000 */ 	lh	$a0,0x0($s0)
 /*    1f0a8:	e7b20088 */ 	swc1	$f18,0x88($sp)
-/*    1f0ac:	0c008dda */ 	jal	animGetNumFrames
+/*    1f0ac:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1f0b0:	e7b0008c */ 	swc1	$f16,0x8c($sp)
 /*    1f0b4:	2458ffff */ 	addiu	$t8,$v0,-1
 /*    1f0b8:	44985000 */ 	mtc1	$t8,$f10
@@ -5819,7 +5819,7 @@ glabel func0001ee18
 .L0001f0f4:
 /*    1f0f4:	86040000 */ 	lh	$a0,0x0($s0)
 /*    1f0f8:	e7b20088 */ 	swc1	$f18,0x88($sp)
-/*    1f0fc:	0c008dda */ 	jal	animGetNumFrames
+/*    1f0fc:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1f100:	e7b0008c */ 	swc1	$f16,0x8c($sp)
 /*    1f104:	2459ffff */ 	addiu	$t9,$v0,-1
 /*    1f108:	44993000 */ 	mtc1	$t9,$f6
@@ -6138,7 +6138,7 @@ glabel func0001f314
 /*    1f56c:	c6140060 */ 	lwc1	$f20,0x60($s0)
 /*    1f570:	86040000 */ 	lh	$a0,0x0($s0)
 /*    1f574:	e7b20088 */ 	swc1	$f18,0x88($sp)
-/*    1f578:	0c008dda */ 	jal	animGetNumFrames
+/*    1f578:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1f57c:	e7b0008c */ 	swc1	$f16,0x8c($sp)
 /*    1f580:	2458ffff */ 	addiu	$t8,$v0,-1
 /*    1f584:	44983000 */ 	mtc1	$t8,$f6
@@ -6159,7 +6159,7 @@ glabel func0001f314
 .L0001f5c0:
 /*    1f5c0:	86040000 */ 	lh	$a0,0x0($s0)
 /*    1f5c4:	e7b20088 */ 	swc1	$f18,0x88($sp)
-/*    1f5c8:	0c008dda */ 	jal	animGetNumFrames
+/*    1f5c8:	0c008dda */ 	jal	modelGetNumAnimFrames
 /*    1f5cc:	e7b0008c */ 	swc1	$f16,0x8c($sp)
 /*    1f5d0:	2459ffff */ 	addiu	$t9,$v0,-1
 /*    1f5d4:	44994000 */ 	mtc1	$t9,$f8
diff --git a/src/lib/lib_233c0.c b/src/lib/lib_233c0.c
index 47a49b113..87fd2a454 100644
--- a/src/lib/lib_233c0.c
+++ b/src/lib/lib_233c0.c
@@ -287,7 +287,7 @@ glabel func0002373c
 );
 
 GLOBAL_ASM(
-glabel animGetNumFrames
+glabel modelGetNumAnimFrames
 /*    23768:	00047400 */ 	sll	$t6,$a0,0x10
 /*    2376c:	000e7c03 */ 	sra	$t7,$t6,0x10
 /*    23770:	3c188006 */ 	lui	$t8,%hi(var8005f00c)