diff --git a/src/f_finale.h b/src/f_finale.h
index 7abbfe430..c79adb893 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -168,9 +168,10 @@ enum
 	wipe_titlescreen_toblack,
 	wipe_timeattack_toblack,
 	wipe_credits_toblack,
+	wipe_blancredits_toblack,
+	wipe_fullcredits_toblack,
 	wipe_evaluation_toblack,
 	wipe_intro_toblack,
-	wipe_ending_toblack,
 	wipe_cutscene_toblack,
 
 	// Specialized wipes
@@ -184,9 +185,10 @@ enum
 	wipe_titlescreen_final,
 	wipe_timeattack_final,
 	wipe_credits_final,
+	wipe_blancredits_final,
+	wipe_fullcredits_final,
 	wipe_evaluation_final,
 	wipe_intro_final,
-	wipe_ending_final,
 	wipe_cutscene_final,
 
 	// custom intermissions
diff --git a/src/f_wipe.c b/src/f_wipe.c
index 61f8303bd..99c37d33e 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -59,9 +59,10 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
 	0,  // wipe_titlescreen_toblack
 	0,  // wipe_timeattack_toblack
 	99, // wipe_credits_toblack
+	99, // wipe_blancredits_toblack
+	99, // wipe_fullcredits_toblack
 	0,  // wipe_evaluation_toblack
 	UINT8_MAX, // wipe_intro_toblack (hardcoded)
-	99, // wipe_ending_toblack (hardcoded)
 	99, // wipe_cutscene_toblack (hardcoded)
 
 	72, // wipe_encore_toinvert
@@ -73,9 +74,10 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
 	0,  // wipe_titlescreen_final
 	0,  // wipe_timeattack_final
 	99, // wipe_credits_final
+	99, // wipe_blancredits_final
+	UINT8_MAX, // wipe_fullcredits_final
 	0,  // wipe_evaluation_final
 	99, // wipe_intro_final (hardcoded)
-	99, // wipe_ending_final (hardcoded)
 	99  // wipe_cutscene_final (hardcoded)
 };
 
diff --git a/src/g_state.h b/src/g_state.h
index ba872cca7..de12f337d 100644
--- a/src/g_state.h
+++ b/src/g_state.h
@@ -34,6 +34,8 @@ typedef enum
 	GS_TIMEATTACK,      // time attack menu
 
 	GS_CREDITS,         // credit sequence
+	GS_BLANCREDITS,		// BlanKart: Credits for BlanKart
+	GS_SECRETCREDITS,   // BlanKart: Secret/full credits
 	GS_EVALUATION,      // Evaluation at the end of a game.
 
 	// Hardcoded fades or other fading methods
@@ -43,10 +45,6 @@ typedef enum
 	// Not fadable
 	GS_DEDICATEDSERVER, // new state for dedicated server
 	GS_WAITINGPLAYERS,   // waiting for players in a net game
-
-	// New
-	GS_BLANCREDITS,		// BlanKart: Credits for BlanKart
-	GS_SECRETCREDITS,   // BlanKart: Secret/full credits
 } gamestate_t;
 
 typedef enum