diff --git a/src/dehacked.c b/src/dehacked.c
index 77a5396369763d73dbeb9a41342f056b00e9be46..6109808122a589198ec00405fade6bee59c76004 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -392,7 +392,7 @@ static void readPlayer(MYFILE *f, INT32 num)
 				// It works down here, though.
 				{
 					INT32 numline = 0;
-					for (i = 0; i < MAXLINELEN-1; i++)
+					for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
 					{
 						if (numline < 20 && description[num].notes[i] == '\n')
 							numline++;
@@ -1174,7 +1174,7 @@ static void readgametype(MYFILE *f, char *gtname)
 				// It works down here, though.
 				{
 					INT32 numline = 0;
-					for (i = 0; i < MAXLINELEN-1; i++)
+					for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++)
 					{
 						if (numline < 20 && gtdescription[i] == '\n')
 							numline++;
@@ -8007,9 +8007,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
 	"S_GFZDEBRIS",
 	"S_BRICKDEBRIS",
 	"S_WOODDEBRIS",
-	"S_COLOREDBRICKDEBRISA",
-	"S_COLOREDBRICKDEBRISB",
-	"S_COLOREDBRICKDEBRISC",
+	"S_REDBRICKDEBRIS",
+	"S_BLUEBRICKDEBRIS",
+	"S_YELLOWBRICKDEBRIS",
 
 #ifdef SEENAMES
 	"S_NAMECHECK",
@@ -8790,9 +8790,9 @@ static const char *const MOBJTYPE_LIST[] = {  // array length left dynamic for s
 	"MT_GFZDEBRIS",
 	"MT_BRICKDEBRIS",
 	"MT_WOODDEBRIS",
-	"MT_COLOREDBRICKDEBRISA",
-	"MT_COLOREDBRICKDEBRISB",
-	"MT_COLOREDBRICKDEBRISC",
+	"MT_REDBRICKDEBRIS",
+	"MT_BLUEBRICKDEBRIS",
+	"MT_YELLOWBRICKDEBRIS",
 
 #ifdef SEENAMES
 	"MT_NAMECHECK",
diff --git a/src/info.c b/src/info.c
index a0f91cbb4f3e638b768555ab35d1e00d7c3de7d8..ef31af9a678cc616f8baa633b5cc4201cc6f8007 100644
--- a/src/info.c
+++ b/src/info.c
@@ -3913,9 +3913,9 @@ state_t states[NUMSTATES] =
 	{SPR_GFZD, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_GFZDEBRIS
 	{SPR_BRIC, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_BRICKDEBRIS
 	{SPR_WDDB, FF_ANIMATE, -1, {A_DebrisRandom}, 7, 2, S_NULL}, // S_WOODDEBRIS
-	{SPR_BRIR, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISA
-	{SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISB
-	{SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_COLOREDBRICKDEBRISC
+	{SPR_BRIR, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_REDBRICKDEBRIS
+	{SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_BLUEBRICKDEBRIS
+	{SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_YELLOWBRICKDEBRIS
 
 #ifdef SEENAMES
 	{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
@@ -21592,9 +21592,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
-	{           // MT_COLOREDBRICKDEBRISA
+	{           // MT_REDBRICKDEBRIS
 		-1,             // doomednum
-		S_COLOREDBRICKDEBRISA,    // spawnstate
+		S_REDBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
 		S_NULL,         // seestate
 		sfx_None,       // seesound
@@ -21619,9 +21619,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
-	{           // MT_COLOREDBRICKDEBRISB
+	{           // MT_BLUEBRICKDEBRIS
 		-1,             // doomednum
-		S_COLOREDBRICKDEBRISB,    // spawnstate
+		S_BLUEBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
 		S_NULL,         // seestate
 		sfx_None,       // seesound
@@ -21646,9 +21646,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
 		S_NULL          // raisestate
 	},
 
-	{           // MT_COLOREDBRICKDEBRISC
+	{           // MT_YELLOWBRICKDEBRIS
 		-1,             // doomednum
-		S_COLOREDBRICKDEBRISC,    // spawnstate
+		S_YELLOWBRICKDEBRIS,    // spawnstate
 		1,              // spawnhealth
 		S_NULL,         // seestate
 		sfx_None,       // seesound
diff --git a/src/info.h b/src/info.h
index 67f4e1610f0d7b3bb3b20a3a5477b06ece155600..fac690693c8f738626e130834f0b754d9ffb2cc6 100644
--- a/src/info.h
+++ b/src/info.h
@@ -4001,9 +4001,9 @@ typedef enum state
 	S_GFZDEBRIS,
 	S_BRICKDEBRIS,
 	S_WOODDEBRIS,
-	S_COLOREDBRICKDEBRISA, // for CEZ3
-	S_COLOREDBRICKDEBRISB, // for CEZ3
-	S_COLOREDBRICKDEBRISC, // for CEZ3
+	S_REDBRICKDEBRIS, // for CEZ3
+	S_BLUEBRICKDEBRIS, // for CEZ3
+	S_YELLOWBRICKDEBRIS, // for CEZ3
 
 #ifdef SEENAMES
 	S_NAMECHECK,
@@ -4804,9 +4804,9 @@ typedef enum mobj_type
 	MT_GFZDEBRIS,
 	MT_BRICKDEBRIS,
 	MT_WOODDEBRIS,
-	MT_COLOREDBRICKDEBRISA, // for CEZ3
-	MT_COLOREDBRICKDEBRISB, // for CEZ3
-	MT_COLOREDBRICKDEBRISC, // for CEZ3
+	MT_REDBRICKDEBRIS, // for CEZ3
+	MT_BLUEBRICKDEBRIS, // for CEZ3
+	MT_YELLOWBRICKDEBRIS, // for CEZ3
 
 #ifdef SEENAMES
 	MT_NAMECHECK,