diff --git a/src/game/bg.c b/src/game/bg.c
index ae8302645..28ec90ff8 100644
--- a/src/game/bg.c
+++ b/src/game/bg.c
@@ -2476,7 +2476,7 @@ Gfx *bgRenderSceneInXray(Gfx *gdl)
 		roomnumptr++;
 	}
 
-	gdl = gfxConsiderDisableFog(gdl);
+	gdl = envStopFog(gdl);
 
 	gSPClearGeometryMode(gdl++, G_CULL_BOTH);
 	gSPSetGeometryMode(gdl++, G_SHADE | G_SHADING_SMOOTH);
@@ -2607,7 +2607,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 				|| stagenum == g_Stages[STAGEINDEX_MBR].id
 				|| stagenum == g_Stages[STAGEINDEX_TEST_OLD].id
 				|| stagenum == g_Stages[STAGEINDEX_ATTACKSHIP].id)) {
-		gdl = gfxConsiderDisableFog(gdl);
+		gdl = envStopFog(gdl);
 		gdl = vi0000ab78(gdl);
 
 		roomnum = -1;
@@ -2642,7 +2642,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 			gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1758()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
 			gdl = playerLoadMatrix(gdl);
-			gdl = gfxConsiderDisableFog(gdl);
+			gdl = envStopFog(gdl);
 			gdl = func0f13687c(gdl);
 			gdl = func0f153780(gdl);
 			gdl = vi0000ab78(gdl);
@@ -2697,7 +2697,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 
 		// Render prop opaque components - pre BG pass
 		gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
-		gdl = gfxConsiderDisableFog(gdl);
+		gdl = envStopFog(gdl);
 
 		if (debugIsPropRenderingEnabled() && getVar80084040()) {
 			if (firstroomnum == thing->roomnum) {
@@ -2711,7 +2711,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 		gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1758()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
 		gdl = currentPlayerScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax);
-		gdl = func0f1664a0(gdl, false);
+		gdl = envStartFog(gdl, false);
 
 		if (debugIsBgRenderingEnabled() && getVar80084040()) {
 			if (g_StageIndex != STAGEINDEX_TEST_OLD) {
@@ -2722,7 +2722,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 		// Render prop opaque components - post BG pass
 		gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
-		gdl = gfxConsiderDisableFog(gdl);
+		gdl = envStopFog(gdl);
 
 		if (debugIsPropRenderingEnabled() && getVar80084040()) {
 			if (firstroomnum == thing->roomnum) {
@@ -2733,7 +2733,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 		}
 	}
 
-	gdl = gfxConsiderDisableFog(gdl);
+	gdl = envStopFog(gdl);
 	gdl = currentPlayerScissorToViewport(gdl);
 
 	// Render wall hits
@@ -2762,7 +2762,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 
 		// Render BG alpha components
 		gdl = currentPlayerScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax);
-		gdl = func0f1664a0(gdl, true);
+		gdl = envStartFog(gdl, true);
 
 		if (debugIsBgRenderingEnabled() && getVar80084040()) {
 			gdl = bgRenderRoomAlpha(gdl, thing->roomnum);
@@ -2770,7 +2770,7 @@ Gfx *bgRenderScene(Gfx *gdl)
 
 		gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
-		gdl = gfxConsiderDisableFog(gdl);
+		gdl = envStopFog(gdl);
 
 		// Render prop alpha components
 		if (debugIsPropRenderingEnabled() && getVar80084040()) {
@@ -2963,7 +2963,7 @@ glabel bgRenderScene
 /*  f154fa8:	566b008b */ 	bnel	$s3,$t3,.NB0f1551d8
 /*  f154fac:	02202025 */ 	or	$a0,$s1,$zero
 .NB0f154fb0:
-/*  f154fb0:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f154fb0:	0fc583b2 */ 	jal	envStopFog
 /*  f154fb4:	02202025 */ 	or	$a0,$s1,$zero
 /*  f154fb8:	0c002b3e */ 	jal	vi0000ab78
 /*  f154fbc:	00402025 */ 	or	$a0,$v0,$zero
@@ -3081,7 +3081,7 @@ glabel bgRenderScene
 /*  f155144:	ae020004 */ 	sw	$v0,0x4($s0)
 /*  f155148:	0fc303b1 */ 	jal	playerLoadMatrix
 /*  f15514c:	02202025 */ 	or	$a0,$s1,$zero
-/*  f155150:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f155150:	0fc583b2 */ 	jal	envStopFog
 /*  f155154:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155158:	0fc4c503 */ 	jal	func0f13687c
 /*  f15515c:	00402025 */ 	or	$a0,$v0,$zero
@@ -3203,7 +3203,7 @@ glabel bgRenderScene
 /*  f1552f8:	00402025 */ 	or	$a0,$v0,$zero
 /*  f1552fc:	8fb90084 */ 	lw	$t9,0x84($sp)
 /*  f155300:	02202025 */ 	or	$a0,$s1,$zero
-/*  f155304:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f155304:	0fc583b2 */ 	jal	envStopFog
 /*  f155308:	af220004 */ 	sw	$v0,0x4($t9)
 /*  f15530c:	0fc46640 */ 	jal	debugIsPropRenderingEnabled
 /*  f155310:	00408825 */ 	or	$s1,$v0,$zero
@@ -3259,7 +3259,7 @@ glabel bgRenderScene
 /*  f1553d0:	0fc55ca6 */ 	jal	currentPlayerScissorWithinViewportF
 /*  f1553d4:	e7b00010 */ 	swc1	$f16,0x10($sp)
 /*  f1553d8:	00402025 */ 	or	$a0,$v0,$zero
-/*  f1553dc:	0fc58328 */ 	jal	func0f1664a0
+/*  f1553dc:	0fc58328 */ 	jal	envStartFog
 /*  f1553e0:	00002825 */ 	or	$a1,$zero,$zero
 /*  f1553e4:	0fc4663d */ 	jal	debugIsBgRenderingEnabled
 /*  f1553e8:	00408825 */ 	or	$s1,$v0,$zero
@@ -3290,7 +3290,7 @@ glabel bgRenderScene
 /*  f155444:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155448:	8fad007c */ 	lw	$t5,0x7c($sp)
 /*  f15544c:	02202025 */ 	or	$a0,$s1,$zero
-/*  f155450:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f155450:	0fc583b2 */ 	jal	envStopFog
 /*  f155454:	ada20004 */ 	sw	$v0,0x4($t5)
 /*  f155458:	0fc46640 */ 	jal	debugIsPropRenderingEnabled
 /*  f15545c:	00408825 */ 	or	$s1,$v0,$zero
@@ -3324,7 +3324,7 @@ glabel bgRenderScene
 /*  f1554c4:	1420ff76 */ 	bnez	$at,.NB0f1552a0
 /*  f1554c8:	00000000 */ 	sll	$zero,$zero,0x0
 .NB0f1554cc:
-/*  f1554cc:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f1554cc:	0fc583b2 */ 	jal	envStopFog
 /*  f1554d0:	02202025 */ 	or	$a0,$s1,$zero
 /*  f1554d4:	0fc55c96 */ 	jal	currentPlayerScissorToViewport
 /*  f1554d8:	00402025 */ 	or	$a0,$v0,$zero
@@ -3416,7 +3416,7 @@ glabel bgRenderScene
 /*  f155624:	0fc55ca6 */ 	jal	currentPlayerScissorWithinViewportF
 /*  f155628:	e7aa0010 */ 	swc1	$f10,0x10($sp)
 /*  f15562c:	00402025 */ 	or	$a0,$v0,$zero
-/*  f155630:	0fc58328 */ 	jal	func0f1664a0
+/*  f155630:	0fc58328 */ 	jal	envStartFog
 /*  f155634:	24050001 */ 	addiu	$a1,$zero,0x1
 /*  f155638:	0fc4663d */ 	jal	debugIsBgRenderingEnabled
 /*  f15563c:	00408825 */ 	or	$s1,$v0,$zero
@@ -3442,7 +3442,7 @@ glabel bgRenderScene
 /*  f155684:	00402025 */ 	or	$a0,$v0,$zero
 /*  f155688:	8fb90070 */ 	lw	$t9,0x70($sp)
 /*  f15568c:	02202025 */ 	or	$a0,$s1,$zero
-/*  f155690:	0fc583b2 */ 	jal	gfxConsiderDisableFog
+/*  f155690:	0fc583b2 */ 	jal	envStopFog
 /*  f155694:	af220004 */ 	sw	$v0,0x4($t9)
 /*  f155698:	0fc46640 */ 	jal	debugIsPropRenderingEnabled
 /*  f15569c:	00408825 */ 	or	$s1,$v0,$zero
@@ -5285,7 +5285,7 @@ glabel var7f1b75d0
 /*  f15c7f0:	55c0fff9 */ 	bnezl	$t6,.L0f15c7d8
 /*  f15c7f4:	90590006 */ 	lbu	$t9,0x6($v0)
 .L0f15c7f8:
-/*  f15c7f8:	0fc597b9 */ 	jal	skySetStageNum
+/*  f15c7f8:	0fc597b9 */ 	jal	envSetStageNum
 /*  f15c7fc:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f15c800:	241900c8 */ 	addiu	$t9,$zero,0xc8
 /*  f15c804:	3c018008 */ 	lui	$at,%hi(var8007fc10)
@@ -6347,7 +6347,7 @@ glabel var7f1b75d0
 /*  f15c5ac:	55c0fff9 */ 	bnezl	$t6,.L0f15c594
 /*  f15c5b0:	90590006 */ 	lbu	$t9,0x6($v0)
 .L0f15c5b4:
-/*  f15c5b4:	0fc59729 */ 	jal	skySetStageNum
+/*  f15c5b4:	0fc59729 */ 	jal	envSetStageNum
 /*  f15c5b8:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f15c5bc:	241900c8 */ 	addiu	$t9,$zero,0xc8
 /*  f15c5c0:	3c018008 */ 	lui	$at,%hi(var8007fc10)
@@ -7409,7 +7409,7 @@ glabel var7f1b75d0
 /*  f156f40:	55c0fff9 */ 	bnezl	$t6,.NB0f156f28
 /*  f156f44:	90590006 */ 	lbu	$t9,0x6($v0)
 .NB0f156f48:
-/*  f156f48:	0fc581b9 */ 	jal	skySetStageNum
+/*  f156f48:	0fc581b9 */ 	jal	envSetStageNum
 /*  f156f4c:	8fa40148 */ 	lw	$a0,0x148($sp)
 /*  f156f50:	241900c8 */ 	addiu	$t9,$zero,0xc8
 /*  f156f54:	3c018008 */ 	lui	$at,0x8008
@@ -7843,7 +7843,7 @@ glabel var7f1b75d0
 //	}
 //
 //	// 7f8
-//	skySetStageNum(stagenum);
+//	envSetStageNum(stagenum);
 //
 //	var8007fc10 = 200;
 //
@@ -7973,10 +7973,10 @@ Gfx *bgRender(Gfx *gdl)
 
 	gSPSegment(gdl++, 0x0f, g_BgPrimaryData);
 
-	gdl = func0f1664a0(gdl, 0);
+	gdl = envStartFog(gdl, false);
 	gdl = func0f164150(gdl);
 	gdl = currentPlayerScissorToViewport(gdl);
-	gdl = gfxConsiderDisableFog(gdl);
+	gdl = envStopFog(gdl);
 
 	gSPMatrix(gdl++, var80092870, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
@@ -9174,7 +9174,7 @@ glabel roomLoad
 /*  f15e2a0:	032b1821 */ 	addu	$v1,$t9,$t3
 /*  f15e2a4:	8c730014 */ 	lw	$s3,0x14($v1)
 .L0f15e2a8:
-/*  f15e2a8:	3c18800a */ 	lui	$t8,%hi(g_FogDisabled)
+/*  f15e2a8:	3c18800a */ 	lui	$t8,%hi(g_FogEnabled)
 /*  f15e2ac:	3c0f800a */ 	lui	$t7,%hi(g_Rooms)
 /*  f15e2b0:	8e670000 */ 	lw	$a3,0x0($s3)
 /*  f15e2b4:	26650018 */ 	addiu	$a1,$s3,0x18
@@ -9227,7 +9227,7 @@ glabel roomLoad
 /*  f15e354:	5020ffdd */ 	beqzl	$at,.L0f15e2cc
 /*  f15e358:	90a20000 */ 	lbu	$v0,0x0($a1)
 .L0f15e35c:
-/*  f15e35c:	8f1865e0 */ 	lw	$t8,%lo(g_FogDisabled)($t8)
+/*  f15e35c:	8f1865e0 */ 	lw	$t8,%lo(g_FogEnabled)($t8)
 /*  f15e360:	13000012 */ 	beqz	$t8,.L0f15e3ac
 /*  f15e364:	00000000 */ 	nop
 /*  f15e368:	8def4928 */ 	lw	$t7,%lo(g_Rooms)($t7)
@@ -10102,7 +10102,7 @@ const char var7f1b1a60nb[] = "bg.c";
 //			thing2++;
 //		}
 //
-//		if (g_FogDisabled) {
+//		if (g_FogEnabled) {
 //			gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->unk08, 1);
 //			gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->unk0c, 5);
 //		} else if (var800a65e4 == 0) {
diff --git a/src/game/bgbss.c b/src/game/bgbss.c
index b0c001d1c..35f8e5a92 100644
--- a/src/game/bgbss.c
+++ b/src/game/bgbss.c
@@ -99,6 +99,6 @@ u32 g_PortalDisableParentExec;
 u32 var800a65d4;
 u32 var800a65d8;
 u32 var800a65dc;
-u32 g_FogDisabled;
+u32 g_FogEnabled;
 u32 var800a65e4;
 struct coord *var800a65e8;
diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index a7b664f1a..0108946b1 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -8300,7 +8300,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool withalpha)
 		}
 	}
 
-	sp104 = func0f1667f4(prop, sp108);
+	sp104 = env0f1667f4(prop, sp108);
 
 	if (chr->unk32c_18) {
 		func0f069144(chr->prop, chr->nextcol, chr->floorcol);
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 65d034428..c99928226 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -6898,7 +6898,7 @@ bool chrCheckTargetInSight(struct chrdata *chr)
 			|| (sqdistance < 40000.0f && (angle < 1.9195564985275f || angle > 4.3626284599304f))) {
 		result = false;
 
-		if (sqdistance < func0f1657e4()) {
+		if (sqdistance < env0f1657e4()) {
 			f32 tmp;
 			s32 iVar8 = (sqrtf(sqdistance) * 0.0018749999580905f);
 			s32 tmp2;
@@ -22798,7 +22798,7 @@ bool func0f04aeb0(struct coord *pos, s16 *rooms)
 	bool result = true;
 	s32 i;
 
-	if (func0f1666f8(pos, 0)) {
+	if (env0f1666f8(pos, 0)) {
 		for (i = 0; rooms[i] != -1; i++) {
 			if (roomIsVisibleByAnyPlayer(rooms[i])) {
 				break;
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index d37a95f1d..4e0088c57 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -5976,7 +5976,7 @@ bool aiIfObjInRoom(void)
  */
 bool aiSwitchToAltSky(void)
 {
-	skySetTransitionFrac(1);
+	envApplyTransitionFrac(1);
 	g_Vars.aioffset += 2;
 
 	return false;
diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c
index 5384f05c7..f2683d79c 100644
--- a/src/game/game_11f000.c
+++ b/src/game/game_11f000.c
@@ -85,7 +85,7 @@ void func0f11f000(f32 left, f32 top, struct coord *arg2)
 	f32 pos[2];
 
 	pos[0] = left + currentPlayerGetScreenLeft();
-	pos[1] = top + currentPlayerGetScreenTop() + skyGetCurrent()->unk40;
+	pos[1] = top + currentPlayerGetScreenTop() + envGetCurrent()->unk40;
 
 	func0f0b4c3c(pos, arg2, 100);
 	mtx4RotateVecInPlace(mtx, arg2);
@@ -150,7 +150,7 @@ glabel var7f1b4fe8
 /*  f11f12c:	00000000 */ 	nop
 /*  f11f130:	4500002d */ 	bc1f	.L0f11f1e8
 /*  f11f134:	00000000 */ 	nop
-/*  f11f138:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f11f138:	0fc595f3 */ 	jal	envGetCurrent
 /*  f11f13c:	e7b00024 */ 	swc1	$f16,0x24($sp)
 /*  f11f140:	c4480014 */ 	lwc1	$f8,0x14($v0)
 /*  f11f144:	c62a0004 */ 	lwc1	$f10,0x4($s1)
@@ -264,7 +264,7 @@ glabel var7f1b4ff4
 /*  f11f2b4:	00000000 */ 	nop
 /*  f11f2b8:	4500002d */ 	bc1f	.L0f11f370
 /*  f11f2bc:	00000000 */ 	nop
-/*  f11f2c0:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f11f2c0:	0fc595f3 */ 	jal	envGetCurrent
 /*  f11f2c4:	e7b00024 */ 	swc1	$f16,0x24($sp)
 /*  f11f2c8:	c444002c */ 	lwc1	$f4,0x2c($v0)
 /*  f11f2cc:	c6260004 */ 	lwc1	$f6,0x4($s1)
@@ -363,7 +363,7 @@ glabel var7f1b4ff8
 /*  f11f438:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f11f43c:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f11f440:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f11f444:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f11f444:	0fc595f3 */ 	jal	envGetCurrent
 /*  f11f448:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f11f44c:	904e0008 */ 	lbu	$t6,0x8($v0)
 /*  f11f450:	3c013f80 */ 	lui	$at,0x3f80
@@ -557,7 +557,7 @@ glabel var7f1b4ffc
 /*  f11f6ec:	27bdffe8 */ 	addiu	$sp,$sp,-24
 /*  f11f6f0:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f11f6f4:	afa5001c */ 	sw	$a1,0x1c($sp)
-/*  f11f6f8:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f11f6f8:	0fc595f3 */ 	jal	envGetCurrent
 /*  f11f6fc:	afa40018 */ 	sw	$a0,0x18($sp)
 /*  f11f700:	904e0008 */ 	lbu	$t6,0x8($v0)
 /*  f11f704:	3c013f80 */ 	lui	$at,0x3f80
@@ -850,7 +850,7 @@ glabel var7f1b50c8
 /*  f11f9a0:	f7b60028 */ 	sdc1	$f22,0x28($sp)
 /*  f11f9a4:	f7b40020 */ 	sdc1	$f20,0x20($sp)
 /*  f11f9a8:	afa406b0 */ 	sw	$a0,0x6b0($sp)
-/*  f11f9ac:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f11f9ac:	0fc595f3 */ 	jal	envGetCurrent
 /*  f11f9b0:	afa00430 */ 	sw	$zero,0x430($sp)
 /*  f11f9b4:	904e0010 */ 	lbu	$t6,0x10($v0)
 /*  f11f9b8:	3c11800a */ 	lui	$s1,%hi(g_Vars)
@@ -4140,7 +4140,7 @@ glabel var7f1b50dc
 /*  f122c00:	c7a60064 */ 	lwc1	$f6,0x64($sp)
 /*  f122c04:	e4660024 */ 	swc1	$f6,0x24($v1)
 /*  f122c08:	c7aa0038 */ 	lwc1	$f10,0x38($sp)
-/*  f122c0c:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f122c0c:	0fc595f3 */ 	jal	envGetCurrent
 /*  f122c10:	e46a0028 */ 	swc1	$f10,0x28($v1)
 /*  f122c14:	3c014080 */ 	lui	$at,0x4080
 /*  f122c18:	44819000 */ 	mtc1	$at,$f18
@@ -7290,7 +7290,7 @@ glabel var7f1b5108
 /*  f1265b8:	afa50174 */ 	sw	$a1,0x174($sp)
 /*  f1265bc:	0fc2d70e */ 	jal	currentPlayerGetUnk1754
 /*  f1265c0:	afa2016c */ 	sw	$v0,0x16c($sp)
-/*  f1265c4:	0fc599d3 */ 	jal	skyGetCurrent
+/*  f1265c4:	0fc599d3 */ 	jal	envGetCurrent
 /*  f1265c8:	afa20168 */ 	sw	$v0,0x168($sp)
 /*  f1265cc:	afa20144 */ 	sw	$v0,0x144($sp)
 /*  f1265d0:	904e000b */ 	lbu	$t6,0xb($v0)
@@ -7892,7 +7892,7 @@ glabel var7f1b5108
 /*  f125ab8:	afa50174 */ 	sw	$a1,0x174($sp)
 /*  f125abc:	0fc2d5c6 */ 	jal	currentPlayerGetUnk1754
 /*  f125ac0:	afa2016c */ 	sw	$v0,0x16c($sp)
-/*  f125ac4:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f125ac4:	0fc595f3 */ 	jal	envGetCurrent
 /*  f125ac8:	afa20168 */ 	sw	$v0,0x168($sp)
 /*  f125acc:	afa20144 */ 	sw	$v0,0x144($sp)
 /*  f125ad0:	904e000b */ 	lbu	$t6,0xb($v0)
@@ -9912,7 +9912,7 @@ Gfx *func0f126de8(Gfx *gdl)
  */
 Gfx *func0f12715c(Gfx *gdl)
 {
-	struct sky *sky = skyGetCurrent();
+	struct environment *env = envGetCurrent();
 	struct sun *sun;
 	s32 i;
 
@@ -9921,13 +9921,13 @@ Gfx *func0f12715c(Gfx *gdl)
 		gdl = func0f126de8(gdl);
 	}
 
-	if (sky->numsuns <= 0 || !var800844f0 || g_Vars.mplayerisrunning) {
+	if (env->numsuns <= 0 || !var800844f0 || g_Vars.mplayerisrunning) {
 		return gdl;
 	}
 
-	sun = sky->suns;
+	sun = env->suns;
 
-	for (i = 0; i < sky->numsuns; i++) {
+	for (i = 0; i < env->numsuns; i++) {
 		if (sun->lens_flare && var800a33e8[i][2] > 1) {
 			struct bootbufferthing *thing = bbufGetIndex1Buffer();
 			f32 value = func0f125a1c(thing->unk00[i]);
diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c
index fb14af98d..cc6a96366 100644
--- a/src/game/game_13c510.c
+++ b/src/game/game_13c510.c
@@ -1002,7 +1002,7 @@ glabel func0f13c780
 /*  f13d280:	00000000 */ 	nop
 /*  f13d284:	45020029 */ 	bc1fl	.L0f13d32c
 /*  f13d288:	26f70006 */ 	addiu	$s7,$s7,0x6
-/*  f13d28c:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f13d28c:	0fc595f3 */ 	jal	envGetCurrent
 /*  f13d290:	00000000 */ 	nop
 /*  f13d294:	9044000b */ 	lbu	$a0,0xb($v0)
 /*  f13d298:	8faf00b8 */ 	lw	$t7,0xb8($sp)
@@ -1173,7 +1173,7 @@ glabel func0f13d568
 /*  f13d604:	100002a2 */ 	b	.L0f13e090
 /*  f13d608:	8fa20160 */ 	lw	$v0,0x160($sp)
 .L0f13d60c:
-/*  f13d60c:	0fc595f3 */ 	jal	skyGetCurrent
+/*  f13d60c:	0fc595f3 */ 	jal	envGetCurrent
 /*  f13d610:	afa300a4 */ 	sw	$v1,0xa4($sp)
 /*  f13d614:	9052000b */ 	lbu	$s2,0xb($v0)
 /*  f13d618:	241e0002 */ 	addiu	$s8,$zero,0x2
diff --git a/src/game/game_1657c0.c b/src/game/game_1657c0.c
index b5b90030f..dffd4edd0 100644
--- a/src/game/game_1657c0.c
+++ b/src/game/game_1657c0.c
@@ -15,13 +15,13 @@ u32 var800a65fc;
 struct var800a6600 var800a6600;
 u32 var800a6618;
 u32 var800a661c;
-struct skytype1 *var800a6620;
-struct skytype1 *g_SkyTransitionFrom;
-struct skytype1 *g_SkyTransitionTo;
+struct envtype1 *var800a6620;
+struct envtype1 *g_EnvTransitionFrom;
+struct envtype1 *g_EnvTransitionTo;
 
 f32 var80081050 = MAXFLOAT;
 f32 var80081054 = 0;
-struct sky var80081058 = {900, 1000};
+struct environment g_Env = {900, 1000};
 u32 var800810a8 = 0;
 u32 var800810ac = 0;
 
@@ -36,7 +36,7 @@ struct sun sun_06        = { 1, 0xff, 0xff, 0xff,   400000,  600000,  1000000, 1
 struct sun sun_crashsite = { 1, 0xff, 0xd7, 0xf2,  1900000,  300000, -1400000, 22, 48 };
 struct sun sun_airbase   = { 1, 0xff, 0xd7, 0xf2, -1200000,  200000,   150000, 30, 60 };
 
-struct skytype1 g_SkiesType1[] = {
+struct envtype1 g_EnvironmentsType1[] = {
 	//                                                    |--- fog ----|  |---- sky -----|                     |----------- clouds -----------| |--------------- water ---------------|
 	// stage                near    far    06    08   0a     min     max     r     g     b     sun             e  scale    1c     r     g     b 20 21  scale type   r     g     b    28
 	{ STAGE_CRASHSITE,        15, 10000,    0,    0,   0, 0x03e2, 0x03e8, 0x9b, 0x2d, 0x1e, 1, &sun_crashsite, 1,  1500, 0x00, 0xfa, 0xfa, 0x00, 0, 0, -5000, 0, 0x00, 0x00, 0x00, 0x00 },
@@ -55,7 +55,7 @@ struct skytype1 g_SkiesType1[] = {
 	{ 0,                       0,     0,    0,    0,   0, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0, NULL,           0,     0, 0x00, 0x00, 0x00, 0x00, 0, 0,     0, 0, 0x00, 0x00, 0x00, 0x00 },
 };
 
-struct skytype2 g_SkiesType2[] = {
+struct envtype2 g_EnvironmentsType2[] = {
 	//                                                                            |-------- clouds --------|     |------------ water ------------|
 	// stage             near    far 08 0a 0c     r     g     b     sun           e     r     g     b  scale 20  e     r     g     b   scale  type 30 34
 	{ -1,                  15, 10000, 0, 0, 0, 0x00, 0x10, 0x40, 0, NULL,         0, 0xff, 0xff, 0xff,  5000, 0, 0, 0x00, 0x00, 0x00,      0,    0, 0, 0 },
@@ -117,36 +117,36 @@ struct skytype2 g_SkiesType2[] = {
 	{ 0 },
 };
 
-void func0f1657c0(s32 arg0, s32 arg1)
+void env0f1657c0(s32 arg0, s32 arg1)
 {
 	// empty
 }
 
-struct sky *skyGetCurrent(void)
+struct environment *envGetCurrent(void)
 {
-	return &var80081058;
+	return &g_Env;
 }
 
-f32 func0f1657d8(void)
+f32 env0f1657d8(void)
 {
 	return var80081050;
 }
 
-f32 func0f1657e4(void)
+f32 env0f1657e4(void)
 {
 	return var80081050 * var80081050;
 }
 
 GLOBAL_ASM(
-glabel func0f1657f8
+glabel env0f1657f8
 .late_rodata
 glabel var7f1b76e0
 .word 0x3a83126f
 glabel var7f1b76e4
 .word 0x3a83126f
 .text
-/*  f1657f8:	3c0e800a */ 	lui	$t6,%hi(g_FogDisabled)
-/*  f1657fc:	8dce65e0 */ 	lw	$t6,%lo(g_FogDisabled)($t6)
+/*  f1657f8:	3c0e800a */ 	lui	$t6,%hi(g_FogEnabled)
+/*  f1657fc:	8dce65e0 */ 	lw	$t6,%lo(g_FogEnabled)($t6)
 /*  f165800:	27bdffc0 */ 	addiu	$sp,$sp,-64
 /*  f165804:	afbf0014 */ 	sw	$ra,0x14($sp)
 /*  f165808:	51c0005d */ 	beqzl	$t6,.L0f165980
@@ -155,8 +155,8 @@ glabel var7f1b76e4
 /*  f165814:	27a40038 */ 	addiu	$a0,$sp,0x38
 /*  f165818:	0fc5722e */ 	jal	currentPlayerGetScaleBg2Gfx
 /*  f16581c:	00000000 */ 	nop
-/*  f165820:	3c048008 */ 	lui	$a0,%hi(var80081058)
-/*  f165824:	24841058 */ 	addiu	$a0,$a0,%lo(var80081058)
+/*  f165820:	3c048008 */ 	lui	$a0,%hi(g_Env)
+/*  f165824:	24841058 */ 	addiu	$a0,$a0,%lo(g_Env)
 /*  f165828:	8c8f0000 */ 	lw	$t7,0x0($a0)
 /*  f16582c:	c7a20038 */ 	lwc1	$f2,0x38($sp)
 /*  f165830:	c7b0003c */ 	lwc1	$f16,0x3c($sp)
@@ -249,200 +249,200 @@ glabel var7f1b76e4
 /*  f165988:	00000000 */ 	nop
 );
 
-void skyApplyType1(struct skytype1 *sky)
+void envApplyType1(struct envtype1 *env)
 {
-	g_FogDisabled = true;
+	g_FogEnabled = true;
 	var800a65e4 = 0;
 
-	viSetZRange(sky->near, sky->far);
+	viSetZRange(env->near, env->far);
 
-	var80081058.fogmin = sky->fogmin;
-	var80081058.fogmax = sky->fogmax;
+	g_Env.fogmin = env->fogmin;
+	g_Env.fogmax = env->fogmax;
 
-	var80081058.sky_r = sky->sky_r;
-	var80081058.sky_g = sky->sky_g;
-	var80081058.sky_b = sky->sky_b;
-	var80081058.skyredfrac = var80081058.sky_r / 255.0f;
-	var80081058.skygreenfrac = var80081058.sky_g / 255.0f;
-	var80081058.skybluefrac = var80081058.sky_b / 255.0f;
+	g_Env.sky_r = env->sky_r;
+	g_Env.sky_g = env->sky_g;
+	g_Env.sky_b = env->sky_b;
+	g_Env.skyredfrac = g_Env.sky_r / 255.0f;
+	g_Env.skygreenfrac = g_Env.sky_g / 255.0f;
+	g_Env.skybluefrac = g_Env.sky_b / 255.0f;
 
-	var80081058.numsuns = sky->numsuns;
-	var80081058.suns = sky->suns;
+	g_Env.numsuns = env->numsuns;
+	g_Env.suns = env->suns;
 
-	var80081058.clouds_enabled = sky->clouds_enabled;
-	var80081058.clouds_scale = sky->clouds_scale;
-	var80081058.unk18 = sky->unk1c;
-	var80081058.clouds_r = sky->clouds_r;
-	var80081058.clouds_g = sky->clouds_g;
-	var80081058.clouds_b = sky->clouds_b;
+	g_Env.clouds_enabled = env->clouds_enabled;
+	g_Env.clouds_scale = env->clouds_scale;
+	g_Env.unk18 = env->unk1c;
+	g_Env.clouds_r = env->clouds_r;
+	g_Env.clouds_g = env->clouds_g;
+	g_Env.clouds_b = env->clouds_b;
 
-	var80081058.water_enabled = sky->water_enabled;
-	var80081058.water_scale = sky->water_scale;
-	var80081058.water_type = sky->water_type;
-	var80081058.water_r = sky->water_r;
-	var80081058.water_g = sky->water_g;
-	var80081058.water_b = sky->water_b;
-	var80081058.unk40 = sky->unk28;
+	g_Env.water_enabled = env->water_enabled;
+	g_Env.water_scale = env->water_scale;
+	g_Env.water_type = env->water_type;
+	g_Env.water_r = env->water_r;
+	g_Env.water_g = env->water_g;
+	g_Env.water_b = env->water_b;
+	g_Env.unk40 = env->unk28;
 
-	if (!sky->unk06) {
+	if (!env->unk06) {
 		var800a65e8 = NULL;
 	} else {
-		var800a65f0.x = sky->unk06;
-		var800a65f0.y = sky->unk08;
-		var800a65f0.z = sky->unk0a;
+		var800a65f0.x = env->unk06;
+		var800a65f0.y = env->unk08;
+		var800a65f0.z = env->unk0a;
 		var800a65e8 = &var800a65f0;
 	}
 
-	func0f1657f8();
+	env0f1657f8();
 }
 
-void skyApplyType2(struct skytype2 *sky)
+void envApplyType2(struct envtype2 *env)
 {
 	struct zrange zrange;
 
-	viSetZRange(sky->near, sky->far);
+	viSetZRange(env->near, env->far);
 
-	var80081058.sky_r = sky->sky_r;
-	var80081058.sky_g = sky->sky_g;
-	var80081058.sky_b = sky->sky_b;
+	g_Env.sky_r = env->sky_r;
+	g_Env.sky_g = env->sky_g;
+	g_Env.sky_b = env->sky_b;
 
-	var80081058.skyredfrac = var80081058.sky_r / 255.0f;
-	var80081058.skygreenfrac = var80081058.sky_g / 255.0f;
-	var80081058.skybluefrac = var80081058.sky_b / 255.0f;
+	g_Env.skyredfrac = g_Env.sky_r / 255.0f;
+	g_Env.skygreenfrac = g_Env.sky_g / 255.0f;
+	g_Env.skybluefrac = g_Env.sky_b / 255.0f;
 
-	var80081058.numsuns = sky->numsuns;
-	var80081058.suns = sky->suns;
-	var80081058.clouds_enabled = sky->clouds_enabled;
-	var80081058.clouds_scale = sky->clouds_scale;
-	var80081058.unk18 = sky->unk20;
+	g_Env.numsuns = env->numsuns;
+	g_Env.suns = env->suns;
+	g_Env.clouds_enabled = env->clouds_enabled;
+	g_Env.clouds_scale = env->clouds_scale;
+	g_Env.unk18 = env->unk20;
 
-	var80081058.clouds_r = sky->clouds_r;
-	var80081058.clouds_g = sky->clouds_g;
-	var80081058.clouds_b = sky->clouds_b;
+	g_Env.clouds_r = env->clouds_r;
+	g_Env.clouds_g = env->clouds_g;
+	g_Env.clouds_b = env->clouds_b;
 
-	var80081058.water_enabled = sky->water_enabled;
-	var80081058.water_scale = sky->water_scale;
-	var80081058.water_type = sky->water_type;
+	g_Env.water_enabled = env->water_enabled;
+	g_Env.water_scale = env->water_scale;
+	g_Env.water_type = env->water_type;
 
-	var80081058.water_r = sky->water_r;
-	var80081058.water_g = sky->water_g;
-	var80081058.water_b = sky->water_b;
-	var80081058.unk40 = sky->unk30;
+	g_Env.water_r = env->water_r;
+	g_Env.water_g = env->water_g;
+	g_Env.water_b = env->water_b;
+	g_Env.unk40 = env->unk30;
 
-	if (!sky->unk08) {
+	if (!env->unk08) {
 		var800a65e8 = NULL;
 	} else {
-		var800a65f0.x = sky->unk08;
-		var800a65f0.y = sky->unk0a;
-		var800a65f0.z = sky->unk0c;
+		var800a65f0.x = env->unk08;
+		var800a65f0.y = env->unk0a;
+		var800a65f0.z = env->unk0c;
 		var800a65e8 = &var800a65f0;
 	}
 
-	g_FogDisabled = false;
+	g_FogEnabled = false;
 
-	var800a65e4 = sky->unk34;
+	var800a65e4 = env->unk34;
 }
 
-void skyDisable(void)
+void envDisableSky(void)
 {
-	var80081058.sky_r = 0;
-	var80081058.sky_g = 0;
-	var80081058.sky_b = 0;
+	g_Env.sky_r = 0;
+	g_Env.sky_g = 0;
+	g_Env.sky_b = 0;
 
-	var80081058.skyredfrac = 0;
-	var80081058.skygreenfrac = 0;
-	var80081058.skybluefrac = 0;
+	g_Env.skyredfrac = 0;
+	g_Env.skygreenfrac = 0;
+	g_Env.skybluefrac = 0;
 }
 
-void skySetStageNum(s32 stagenum)
+void envSetStageNum(s32 stagenum)
 {
 	// empty
 }
 
-void skyChooseAndApply(s32 stagenum, bool arg1)
+void envChooseAndApply(s32 stagenum, bool allowoverride)
 {
-	struct skytype2 *finalsky = NULL;
-	struct skytype2 *sky2;
-	struct skytype1 *sky1;
+	struct envtype2 *finalenv = NULL;
+	struct envtype2 *env2;
+	struct envtype1 *env1;
 
 	if (PLAYERCOUNT());
 
 	var80081050 = MAXFLOAT;
 	var80081054 = 0;
 
-	if (arg1) {
-		for (sky1 = &g_SkiesType1[0]; sky1->stage != 0; sky1++) {
-			if (sky1->stage == stagenum + 900) {
-				var800a6620 = sky1;
-				g_SkyTransitionFrom = sky1;
-				g_SkyTransitionTo = sky1 + 1;
-				skyApplyType1(var800a6620);
+	if (allowoverride) {
+		for (env1 = &g_EnvironmentsType1[0]; env1->stage != 0; env1++) {
+			if (env1->stage == stagenum + 900) {
+				var800a6620 = env1;
+				g_EnvTransitionFrom = env1;
+				g_EnvTransitionTo = env1 + 1;
+				envApplyType1(var800a6620);
 				return;
 			}
 		}
 	}
 
-	for (sky1 = &g_SkiesType1[0]; sky1->stage != 0; sky1++) {
-		if (sky1->stage == stagenum) {
-			var800a6620 = sky1;
-			g_SkyTransitionFrom = sky1;
-			g_SkyTransitionTo = sky1 + 1;
-			skyApplyType1(var800a6620);
+	for (env1 = &g_EnvironmentsType1[0]; env1->stage != 0; env1++) {
+		if (env1->stage == stagenum) {
+			var800a6620 = env1;
+			g_EnvTransitionFrom = env1;
+			g_EnvTransitionTo = env1 + 1;
+			envApplyType1(var800a6620);
 			return;
 		}
 	}
 
-	for (sky2 = &g_SkiesType2[0]; sky2->stage != 0; sky2++) {
-		if (sky2->stage == stagenum) {
-			finalsky = sky2;
+	for (env2 = &g_EnvironmentsType2[0]; env2->stage != 0; env2++) {
+		if (env2->stage == stagenum) {
+			finalenv = env2;
 		}
 	}
 
-	if (sky2);
+	if (env2);
 
-	if (finalsky == NULL) {
-		finalsky = &g_SkiesType2[0];
+	if (finalenv == NULL) {
+		finalenv = &g_EnvironmentsType2[0];
 	}
 
-	skyApplyType2(finalsky);
+	envApplyType2(finalenv);
 
 	var800a6620 = NULL;
 }
 
-void skySetTransitionFrac(f32 frac)
+void envApplyTransitionFrac(f32 frac)
 {
-	static struct skytype1 tmp;
+	static struct envtype1 tmp;
 
-	tmp = *g_SkyTransitionFrom;
+	tmp = *g_EnvTransitionFrom;
 
-	tmp.near = g_SkyTransitionFrom->near + frac * ((f32)g_SkyTransitionTo->near - (f32)g_SkyTransitionFrom->near);
-	tmp.far = g_SkyTransitionFrom->far + frac * ((f32)g_SkyTransitionTo->far - (f32)g_SkyTransitionFrom->far);
-	tmp.fogmin = g_SkyTransitionFrom->fogmin + frac * ((f32)g_SkyTransitionTo->fogmin - (f32)g_SkyTransitionFrom->fogmin);
-	tmp.fogmax = g_SkyTransitionFrom->fogmax + frac * ((f32)g_SkyTransitionTo->fogmax - (f32)g_SkyTransitionFrom->fogmax);
+	tmp.near = g_EnvTransitionFrom->near + frac * ((f32)g_EnvTransitionTo->near - (f32)g_EnvTransitionFrom->near);
+	tmp.far = g_EnvTransitionFrom->far + frac * ((f32)g_EnvTransitionTo->far - (f32)g_EnvTransitionFrom->far);
+	tmp.fogmin = g_EnvTransitionFrom->fogmin + frac * ((f32)g_EnvTransitionTo->fogmin - (f32)g_EnvTransitionFrom->fogmin);
+	tmp.fogmax = g_EnvTransitionFrom->fogmax + frac * ((f32)g_EnvTransitionTo->fogmax - (f32)g_EnvTransitionFrom->fogmax);
 
-	tmp.sky_r = g_SkyTransitionFrom->sky_r + frac * ((f32)g_SkyTransitionTo->sky_r - (f32)g_SkyTransitionFrom->sky_r);
-	tmp.sky_g = g_SkyTransitionFrom->sky_g + frac * ((f32)g_SkyTransitionTo->sky_g - (f32)g_SkyTransitionFrom->sky_g);
-	tmp.sky_b = g_SkyTransitionFrom->sky_b + frac * ((f32)g_SkyTransitionTo->sky_b - (f32)g_SkyTransitionFrom->sky_b);
+	tmp.sky_r = g_EnvTransitionFrom->sky_r + frac * ((f32)g_EnvTransitionTo->sky_r - (f32)g_EnvTransitionFrom->sky_r);
+	tmp.sky_g = g_EnvTransitionFrom->sky_g + frac * ((f32)g_EnvTransitionTo->sky_g - (f32)g_EnvTransitionFrom->sky_g);
+	tmp.sky_b = g_EnvTransitionFrom->sky_b + frac * ((f32)g_EnvTransitionTo->sky_b - (f32)g_EnvTransitionFrom->sky_b);
 
 	tmp.sky_r &= 0xf8;
 	tmp.sky_g &= 0xf8;
 	tmp.sky_b &= 0xf8;
 
-	skyApplyType1(&tmp);
+	envApplyType1(&tmp);
 }
 
-Gfx *func0f1664a0(Gfx *gdl, bool arg1)
+Gfx *envStartFog(Gfx *gdl, bool withalpha)
 {
-	if (!g_FogDisabled) {
+	if (!g_FogEnabled) {
 		return gdl;
 	}
 
-	if (arg1) {
-		gDPSetFogColor(gdl++, var80081058.sky_r, var80081058.sky_g, var80081058.sky_b, 0xff);
-		gSPFogPosition(gdl++, var80081058.fogmin, var80081058.fogmax);
+	if (withalpha) {
+		gDPSetFogColor(gdl++, g_Env.sky_r, g_Env.sky_g, g_Env.sky_b, 0xff);
+		gSPFogPosition(gdl++, g_Env.fogmin, g_Env.fogmax);
 	} else {
-		gDPSetFogColor(gdl++, var80081058.sky_r, var80081058.sky_g, var80081058.sky_b, 0xff);
-		gSPFogPosition(gdl++, var80081058.fogmin, var80081058.fogmax);
+		gDPSetFogColor(gdl++, g_Env.sky_r, g_Env.sky_g, g_Env.sky_b, 0xff);
+		gSPFogPosition(gdl++, g_Env.fogmin, g_Env.fogmax);
 	}
 
 	gSPSetGeometryMode(gdl++, G_FOG);
@@ -451,9 +451,9 @@ Gfx *func0f1664a0(Gfx *gdl, bool arg1)
 	return gdl;
 }
 
-Gfx *gfxConsiderDisableFog(Gfx *gdl)
+Gfx *envStopFog(Gfx *gdl)
 {
-	if (!g_FogDisabled) {
+	if (!g_FogEnabled) {
 		return gdl;
 	}
 
@@ -462,14 +462,14 @@ Gfx *gfxConsiderDisableFog(Gfx *gdl)
 	return gdl;
 }
 
-bool func0f1666f8(struct coord *pos, f32 arg1)
+bool env0f1666f8(struct coord *pos, f32 arg1)
 {
 	struct coord sp24;
 	Mtxf *mtx;
 	struct coord *campos;
 	f32 tmp;
 
-	if (!g_FogDisabled) {
+	if (!g_FogEnabled) {
 		return true;
 	}
 
@@ -494,14 +494,14 @@ bool func0f1666f8(struct coord *pos, f32 arg1)
 	return true;
 }
 
-struct coord *func0f1667e8(void)
+struct coord *env0f1667e8(void)
 {
 	return var800a65e8;
 }
 
-s32 func0f1667f4(struct prop *prop, f32 *arg1)
+s32 env0f1667f4(struct prop *prop, f32 *arg1)
 {
-	if (!g_FogDisabled) {
+	if (!g_FogEnabled) {
 		return 2;
 	}
 
@@ -513,9 +513,9 @@ s32 func0f1667f4(struct prop *prop, f32 *arg1)
 		return 2;
 	}
 
-	arg1[0] = var80081058.skyredfrac;
-	arg1[1] = var80081058.skygreenfrac;
-	arg1[2] = var80081058.skybluefrac;
+	arg1[0] = g_Env.skyredfrac;
+	arg1[1] = g_Env.skygreenfrac;
+	arg1[2] = g_Env.skybluefrac;
 	arg1[3] = var800a6600.unk14 + var800a6600.unk10 / prop->z;
 
 	if (arg1[3] < 0.0f) {
diff --git a/src/game/lv.c b/src/game/lv.c
index 0b11b2a26..e20293a78 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -1154,7 +1154,7 @@ Gfx *lvRender(Gfx *gdl)
 			viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
 					g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
 			mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx);
-			func0f1657f8();
+			env0f1657f8();
 			func0f176298();
 			gdl = vi0000b280(gdl);
 			gdl = vi0000b1d0(gdl);
diff --git a/src/game/player.c b/src/game/player.c
index ac712e2a3..76f2a8e77 100644
--- a/src/game/player.c
+++ b/src/game/player.c
@@ -1557,7 +1557,7 @@ void playersBeginMpSwirl(void)
 	g_MpSwirlForwardSpeed = 0;
 	g_MpSwirlDistance = 80;
 
-	skyChooseAndApply(mainGetStageNum(), false);
+	envChooseAndApply(mainGetStageNum(), false);
 }
 
 void playerTickMpSwirl(void)
@@ -1640,7 +1640,7 @@ void player0f0b9a20(void)
 		playerSetFadeFrac(60, 0);
 	}
 
-	skyChooseAndApply(mainGetStageNum(), false);
+	envChooseAndApply(mainGetStageNum(), false);
 	bgunEquipWeapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]);
 	bgunEquipWeapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]);
 	var8007074c = 0;
diff --git a/src/game/propobj.c b/src/game/propobj.c
index 462dc9704..0264a1a76 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -52205,7 +52205,7 @@ glabel var7f1aa82c
 /*  f081364:	27a500e8 */ 	addiu	$a1,$sp,0xe8
 /*  f081368:	adc10000 */ 	sw	$at,0x0($t6)
 /*  f08136c:	afa8007c */ 	sw	$t0,0x7c($sp)
-/*  f081370:	0fc599fd */ 	jal	func0f1667f4
+/*  f081370:	0fc599fd */ 	jal	env0f1667f4
 /*  f081374:	afa400f8 */ 	sw	$a0,0xf8($sp)
 /*  f081378:	8fa8007c */ 	lw	$t0,0x7c($sp)
 /*  f08137c:	14400003 */ 	bnez	$v0,.L0f08138c
@@ -52840,7 +52840,7 @@ glabel var7f1aa82c
 /*  f081364:	27a500e8 */ 	addiu	$a1,$sp,0xe8
 /*  f081368:	adc10000 */ 	sw	$at,0x0($t6)
 /*  f08136c:	afa8007c */ 	sw	$t0,0x7c($sp)
-/*  f081370:	0fc599fd */ 	jal	func0f1667f4
+/*  f081370:	0fc599fd */ 	jal	env0f1667f4
 /*  f081374:	afa400f8 */ 	sw	$a0,0xf8($sp)
 /*  f081378:	8fa8007c */ 	lw	$t0,0x7c($sp)
 /*  f08137c:	14400003 */ 	bnez	$v0,.L0f08138c
@@ -53472,7 +53472,7 @@ glabel var7f1aa82c
 //	struct colour *newcolours;
 //	f32 objdist;
 //
-//	spe4 = func0f1667f4(prop, &spe8);
+//	spe4 = env0f1667f4(prop, &spe8);
 //
 //	if (spe4 == 0) {
 //		return gdl;
@@ -68263,7 +68263,7 @@ s32 func0f08e5a8(s16 *rooms2, struct screenbox *box)
 f32 func0f08e6bc(struct prop *prop, f32 arg1)
 {
 	f32 result = 1;
-	struct coord *coord = func0f1667e8();
+	struct coord *coord = env0f1667e8();
 
 	if (coord != NULL && coord->z < prop->z) {
 		f32 scalez = currentPlayerGetLodScaleZ();
@@ -68282,7 +68282,7 @@ f32 func0f08e6bc(struct prop *prop, f32 arg1)
 bool func0f08e794(struct coord *coord, f32 arg1)
 {
 	bool result = true;
-	struct coord *ptr = func0f1667e8();
+	struct coord *ptr = env0f1667e8();
 	struct coord tmp;
 	f32 sp20;
 
@@ -68321,7 +68321,7 @@ u32 func0f08e8ac(struct prop *prop, struct coord *coord, f32 arg2, bool arg3)
 
 	while (roomnum != -1) {
 		if (g_Rooms[roomnum].flags & ROOMFLAG_VISIBLEBYPLAYER) {
-			if (func0f1666f8(coord, arg2) && (!arg3 || func0f08e794(coord, arg2))) {
+			if (env0f1666f8(coord, arg2) && (!arg3 || func0f08e794(coord, arg2))) {
 				result = func0f0b6260(prop->rooms, coord, arg2);
 
 				if (result) {
@@ -69409,7 +69409,7 @@ void gasTick(void)
 	}
 
 	if (g_GasReleaseTimer240 > 0 && !g_PlayerInvincible) {
-		skySetTransitionFrac(g_GasReleaseTimer240 / g_GasReleaseTimerMax240);
+		envApplyTransitionFrac(g_GasReleaseTimer240 / g_GasReleaseTimerMax240);
 
 		if (g_GasEnableDamage) {
 			if (g_GasLastCough60 < g_Vars.lvframe60 - PALDOWN(225)) {
diff --git a/src/include/bss.h b/src/include/bss.h
index 82016cf12..2087cfaf8 100644
--- a/src/include/bss.h
+++ b/src/include/bss.h
@@ -232,7 +232,7 @@ extern u32 var800a65b8;
 extern struct screenbox var800a65c0;
 extern struct screenbox var800a65c8;
 extern u32 g_PortalDisableParentExec;
-extern u32 g_FogDisabled;
+extern u32 g_FogEnabled;
 extern u32 var800a65e4;
 extern struct coord *var800a65e8;
 extern u8 *var800a6660;
diff --git a/src/include/commands.h b/src/include/commands.h
index 1bfbc06fa..eb698325a 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -2205,7 +2205,7 @@
 /**
  * Switch to the stage's alternative sky/fog settings. The switch is instant.
  *
- * The stage must use a type 1 sky (in the g_SkiesType1 table) and the
+ * The stage must use a type 1 sky (in the g_EnvironmentsType1 table) and the
  * alternative sky must be placed immediately after it.
  */
 #define switch_to_alt_sky \
diff --git a/src/include/game/game_1657c0.h b/src/include/game/game_1657c0.h
index 7a1406f63..a14421dbd 100644
--- a/src/include/game/game_1657c0.h
+++ b/src/include/game/game_1657c0.h
@@ -4,18 +4,18 @@
 #include "data.h"
 #include "types.h"
 
-struct sky *skyGetCurrent(void);
-f32 func0f1657e4(void);
-void func0f1657f8(void);
-void skyApplyType1(struct skytype1 *sky);
-void skyApplyType2(struct skytype2 *sky);
-void skySetStageNum(s32 stagenum);
-void skyChooseAndApply(s32 stagenum, bool arg1);
-void skySetTransitionFrac(f32 arg0);
-Gfx *func0f1664a0(Gfx *gdl, bool arg1);
-Gfx *gfxConsiderDisableFog(Gfx *gdl);
-bool func0f1666f8(struct coord *pos, f32 arg1);
-struct coord *func0f1667e8(void);
-s32 func0f1667f4(struct prop *prop, f32 *arg1);
+struct environment *envGetCurrent(void);
+f32 env0f1657e4(void);
+void env0f1657f8(void);
+void envApplyType1(struct envtype1 *sky);
+void envApplyType2(struct envtype2 *sky);
+void envSetStageNum(s32 stagenum);
+void envChooseAndApply(s32 stagenum, bool allowoverride);
+void envApplyTransitionFrac(f32 arg0);
+Gfx *envStartFog(Gfx *gdl, bool withalpha);
+Gfx *envStopFog(Gfx *gdl);
+bool env0f1666f8(struct coord *pos, f32 arg1);
+struct coord *env0f1667e8(void);
+s32 env0f1667f4(struct prop *prop, f32 *arg1);
 
 #endif
diff --git a/src/include/types.h b/src/include/types.h
index ef09050a4..0b8666912 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -3303,7 +3303,7 @@ struct var800a6600 {
 	f32 unk14;
 };
 
-struct sky {
+struct environment {
 	/*0x00*/ s32 fogmin;
 	/*0x04*/ s32 fogmax;
 	/*0x08*/ u8 sky_r;
@@ -3341,7 +3341,7 @@ struct sun {
 	s16 orb_size;
 };
 
-struct skytype1 {
+struct envtype1 {
 	/*0x00*/ s16 stage;
 	/*0x02*/ s16 near;
 	/*0x04*/ s16 far;
@@ -3371,7 +3371,7 @@ struct skytype1 {
 	/*0x28*/ u8 unk28;
 };
 
-struct skytype2 {
+struct envtype2 {
 	/*0x00*/ s32 stage;
 	/*0x04*/ s16 near;
 	/*0x06*/ s16 far;