diff --git a/th03/cfg_lres.cpp b/th03/cfg_lres.cpp
index c0ffa1d4..cabad0fc 100644
--- a/th03/cfg_lres.cpp
+++ b/th03/cfg_lres.cpp
@@ -2,7 +2,7 @@ extern "C" {
 #include "platform.h"
 #include "master.hpp"
 #include "th03/common.h"
-#include "th03/chars.hpp"
+#include "th03/playchar.hpp"
 #include "th03/score.h"
 #include "th03/resident.hpp"
 #include "th03/formats/cfg.hpp"
diff --git a/th03/op_01.cpp b/th03/op_01.cpp
index acab3e27..8e7219ca 100644
--- a/th03/op_01.cpp
+++ b/th03/op_01.cpp
@@ -8,7 +8,7 @@ extern "C" {
 #include "platform.h"
 #include "master.hpp"
 #include "th03/common.h"
-#include "th03/chars.hpp"
+#include "th03/playchar.hpp"
 #include "th03/score.h"
 #include "th03/resident.hpp"
 #include "th03/formats/cfg.hpp"
diff --git a/th03/chars.hpp b/th03/playchar.hpp
similarity index 69%
rename from th03/chars.hpp
rename to th03/playchar.hpp
index 25243230..bdd53578 100644
--- a/th03/chars.hpp
+++ b/th03/playchar.hpp
@@ -9,9 +9,9 @@ typedef enum {
 	PLAYCHAR_CHIYURI = 7,
 	PLAYCHAR_YUMEMI = 8,
 	PLAYCHAR_COUNT = 9,
-} playchars_t;
+} playchar_t;
 
-// Encodes a playchars_t together with its alternate palette flag.
+// Encodes a playchar_t together with its alternate palette flag.
 struct playchar_paletted_t {
 	unsigned char v;
 
@@ -19,8 +19,8 @@ struct playchar_paletted_t {
 		return (v - 1);
 	}
 
-	playchars_t char_id() const {
-		return static_cast<playchars_t>(filename_id() / 2);
+	playchar_t char_id() const {
+		return static_cast<playchar_t>(filename_id() / 2);
 	}
 };
 
diff --git a/th03/res_yume.cpp b/th03/res_yume.cpp
index ac9d4a0e..2bea9d83 100644
--- a/th03/res_yume.cpp
+++ b/th03/res_yume.cpp
@@ -11,7 +11,7 @@
 #include "th02/snd/snd.h"
 #include "th03/common.h"
 #include "th03/score.h"
-#include "th03/chars.hpp"
+#include "th03/playchar.hpp"
 #include "th03/resident.hpp"
 #include "th03/formats/cfg.hpp"
 
diff --git a/th04/m_char.cpp b/th04/m_char.cpp
index 5f5008b2..dedd9983 100644
--- a/th04/m_char.cpp
+++ b/th04/m_char.cpp
@@ -16,7 +16,7 @@ extern "C" {
 #include "th02/hardware/frmdelay.h"
 #include "th03/formats/pi.hpp"
 #include "th04/common.h"
-#include "th04/chars.h"
+#include "th04/playchar.h"
 #include "th04/formats/scoredat.h"
 #include "th04/resident.hpp"
 #include "th04/hardware/input.h"
@@ -205,7 +205,7 @@ void near raise_bg_allocate_and_snap(void)
 	}
 }
 
-void near pascal raise_bg_put(playchars_t playchar_lowered)
+void near pascal raise_bg_put(playchar_t playchar_lowered)
 {
 	vram_byte_amount_t x;
 	pixel_t y;
@@ -246,7 +246,7 @@ void near raise_bg_free(void)
 
 #include "th04/op/darken.cpp"
 
-void near pascal pic_darken(playchars_t playchar)
+void near pascal pic_darken(playchar_t playchar)
 {
 	vram_offset_t vo;
 	vram_byte_amount_t x;
@@ -315,7 +315,7 @@ void near pascal playchar_title_box_put(int playchar)
 }
 
 inline void pic_put_for(
-	playchars_t playchar_sel,
+	playchar_t playchar_sel,
 	screen_x_t sel_left,
 	vram_y_t sel_top,
 	screen_x_t other_left,
diff --git a/th04/main/dialog/dialog.cpp b/th04/main/dialog/dialog.cpp
index d82dbd67..38b6b485 100644
--- a/th04/main/dialog/dialog.cpp
+++ b/th04/main/dialog/dialog.cpp
@@ -13,7 +13,7 @@ extern "C" {
 #include "th04/sprites/main_cdg.h"
 }
 #include "th04/shiftjis/fns.hpp"
-#include "th04/chars.h"
+#include "th04/playchar.h"
 #include "th04/main/ems.hpp"
 #include "th04/main/dialog/dialog.hpp"
 
diff --git a/th04/main/ems.cpp b/th04/main/ems.cpp
index ac8d222b..139430f7 100644
--- a/th04/main/ems.cpp
+++ b/th04/main/ems.cpp
@@ -19,11 +19,11 @@ extern "C" {
 }
 #if (GAME == 5)
 	#include "th05/resident.hpp"
-	#include "th05/chars.h"
+	#include "th05/playchar.h"
 	#include "th05/shiftjis/fns.hpp"
 #else
 	#include "th04/resident.hpp"
-	#include "th04/chars.h"
+	#include "th04/playchar.h"
 	#include "th04/shiftjis/fns.hpp"
 #endif
 #include "th04/main/ems.hpp"
diff --git a/th04/main/hud/popup.cpp b/th04/main/hud/popup.cpp
index bceb2e71..83606780 100644
--- a/th04/main/hud/popup.cpp
+++ b/th04/main/hud/popup.cpp
@@ -19,7 +19,7 @@
 #include "th04/main/item/item.hpp"
 
 #if (GAME == 4)
-	#include "th04/chars.h"
+	#include "th04/playchar.h"
 #endif
 
 // See tile.hpp for the reason this declaration is necessary
diff --git a/th04/main/player/bombanim.cpp b/th04/main/player/bombanim.cpp
index 9707f9d6..16117573 100644
--- a/th04/main/player/bombanim.cpp
+++ b/th04/main/player/bombanim.cpp
@@ -12,6 +12,6 @@ struct bomb_star_t {
 
 extern bomb_star_t bomb_stars[BOMB_STAR_COUNT];
 
-void pascal near bomb_stars_update_and_render_for(playchars_t playchar)
+void pascal near bomb_stars_update_and_render_for(playchar_t playchar)
 ;
 // --------------
diff --git a/th04/chars.h b/th04/playchar.h
similarity index 53%
rename from th04/chars.h
rename to th04/playchar.h
index 6ea8dfff..ee4706f0 100644
--- a/th04/chars.h
+++ b/th04/playchar.h
@@ -2,7 +2,7 @@ typedef enum {
 	PLAYCHAR_REIMU = 0,
 	PLAYCHAR_MARISA = 1,
 	PLAYCHAR_COUNT = 2
-} playchars_t;
+} playchar_t;
 
 typedef enum {
 	SHOTTYPE_A = 0,
@@ -11,8 +11,8 @@ typedef enum {
 } shottype_t;
 
 // Used way too often...
-inline playchars_t playchar_other(playchars_t playchar) {
-	return static_cast<playchars_t>(PLAYCHAR_MARISA - playchar);
+inline playchar_t playchar_other(playchar_t playchar) {
+	return static_cast<playchar_t>(PLAYCHAR_MARISA - playchar);
 }
 
-extern playchars_t playchar;
+extern playchar_t playchar;
diff --git a/th05/m_char.cpp b/th05/m_char.cpp
index c934bb75..f733879d 100644
--- a/th05/m_char.cpp
+++ b/th05/m_char.cpp
@@ -17,7 +17,7 @@ extern "C" {
 #include "th04/hardware/bgimage.hpp"
 #include "th04/score.h"
 #include "th04/common.h"
-#include "th05/chars.h"
+#include "th05/playchar.h"
 #include "th05/resident.hpp"
 #include "th05/op/op.h"
 #include "th05/sprites/op_cdg.h"
diff --git a/th05/main/dialog/dialog.cpp b/th05/main/dialog/dialog.cpp
index 833b76b4..12df8bc3 100644
--- a/th05/main/dialog/dialog.cpp
+++ b/th05/main/dialog/dialog.cpp
@@ -13,7 +13,7 @@ extern "C" {
 #include "th04/main/stage/stage.hpp"
 #include "th04/sprites/main_cdg.h"
 #include "th04/main/ems.hpp"
-#include "th05/chars.h"
+#include "th05/playchar.h"
 #include "th05/formats/tx2.hpp"
 #include "th05/shiftjis/fns.hpp"
 #include "th05/main/dialog/dialog.hpp"
diff --git a/th05/op010.cpp b/th05/op010.cpp
index 93e05e18..7b917ea2 100644
--- a/th05/op010.cpp
+++ b/th05/op010.cpp
@@ -15,7 +15,7 @@ extern "C" {
 #include "th04/common.h"
 #include "th04/score.h"
 #include "th04/end/end.h"
-#include "th05/chars.h"
+#include "th05/playchar.h"
 #include "th05/op/op.h"
 #include "th05/snd/snd.h"
 #include "th05/resident.hpp"
diff --git a/th05/op011.cpp b/th05/op011.cpp
index dad6340a..863e9718 100644
--- a/th05/op011.cpp
+++ b/th05/op011.cpp
@@ -11,7 +11,7 @@ extern "C" {
 #include "th01/rank.h"
 #include "th04/common.h"
 #include "th04/formats/scoredat.h"
-#include "th05/chars.h"
+#include "th05/playchar.h"
 #include "th05/resident.hpp"
 #include "th05/op/op.h"
 
diff --git a/th05/chars.h b/th05/playchar.h
similarity index 61%
rename from th05/chars.h
rename to th05/playchar.h
index aa81c93d..35af11c2 100644
--- a/th05/chars.h
+++ b/th05/playchar.h
@@ -5,7 +5,7 @@ typedef enum {
 	PLAYCHAR_YUUKA = 3,
 	PLAYCHAR_COUNT = 4,
 
-	_playchars_t_FORCE_UINT8 = 0xFF
-} playchars_t;
+	_playchar_t_FORCE_UINT8 = 0xFF
+} playchar_t;
 
-extern playchars_t playchar;
+extern playchar_t playchar;