diff --git a/config.json b/config.json
index 23105d55a..63034a452 100644
--- a/config.json
+++ b/config.json
@@ -31,9 +31,9 @@
     "LogOutboundMessages": false,
     "LogMessageData": false,
     "MaxHexdumpLength": 256,
-    "DivaEvent": 0,
-    "FestaEvent": -1,
-    "TournamentEvent": 0,
+    "DivaOverride": 0,
+    "FestaOverride": -1,
+    "TournamentOverride": 0,
     "DisableTokenCheck": false,
     "QuestTools": false,
     "ProxyPort": 0,
diff --git a/config/config.go b/config/config.go
index 02c94b030..e1248e1f9 100644
--- a/config/config.go
+++ b/config/config.go
@@ -113,9 +113,9 @@ type DebugOptions struct {
 	LogOutboundMessages bool   // Log all messages sent to the clients
 	LogMessageData      bool   // Log all bytes transferred as a hexdump
 	MaxHexdumpLength    int    // Maximum number of bytes printed when logs are enabled
-	DivaEvent           int    // Diva Defense event status
-	FestaEvent          int    // Hunter's Festa event status
-	TournamentEvent     int    // VS Tournament event status
+	DivaOverride        int    // Diva Defense event status
+	FestaOverride       int    // Hunter's Festa event status
+	TournamentOverride  int    // VS Tournament event status
 	DisableTokenCheck   bool   // Disables checking login token exists in the DB (security risk!)
 	QuestTools          bool   // Enable various quest debug logs
 	ProxyPort           uint16 // Forces the game to connect to a channel server proxy
diff --git a/server/channelserver/handlers_diva.go b/server/channelserver/handlers_diva.go
index d7c60331a..7f5b33992 100644
--- a/server/channelserver/handlers_diva.go
+++ b/server/channelserver/handlers_diva.go
@@ -70,8 +70,8 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
 	}
 
 	var timestamps []uint32
-	if s.server.erupeConfig.DebugOptions.DivaEvent >= 0 {
-		if s.server.erupeConfig.DebugOptions.DivaEvent == 0 {
+	if s.server.erupeConfig.DebugOptions.DivaOverride >= 0 {
+		if s.server.erupeConfig.DebugOptions.DivaOverride == 0 {
 			if s.server.erupeConfig.RealClientMode >= _config.Z2 {
 				doAckBufSucceed(s, pkt.AckHandle, make([]byte, 36))
 			} else {
@@ -79,7 +79,7 @@ func handleMsgMhfGetUdSchedule(s *Session, p mhfpacket.MHFPacket) {
 			}
 			return
 		}
-		timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.DivaEvent), true)
+		timestamps = generateDivaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.DivaOverride), true)
 	} else {
 		timestamps = generateDivaTimestamps(s, start, false)
 	}
diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go
index d200240e4..4fc5370e1 100644
--- a/server/channelserver/handlers_festa.go
+++ b/server/channelserver/handlers_festa.go
@@ -36,7 +36,7 @@ func handleMsgMhfLoadMezfesData(s *Session, p mhfpacket.MHFPacket) {
 func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
 	pkt := p.(*mhfpacket.MsgMhfEnumerateRanking)
 	bf := byteframe.NewByteFrame()
-	state := s.server.erupeConfig.DebugOptions.TournamentEvent
+	state := s.server.erupeConfig.DebugOptions.TournamentOverride
 	// Unk
 	// Unk
 	// Start?
@@ -173,12 +173,12 @@ func handleMsgMhfInfoFesta(s *Session, p mhfpacket.MHFPacket) {
 	}
 
 	var timestamps []uint32
-	if s.server.erupeConfig.DebugOptions.FestaEvent >= 0 {
-		if s.server.erupeConfig.DebugOptions.FestaEvent == 0 {
+	if s.server.erupeConfig.DebugOptions.FestaOverride >= 0 {
+		if s.server.erupeConfig.DebugOptions.FestaOverride == 0 {
 			doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
 			return
 		}
-		timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.FestaEvent), true)
+		timestamps = generateFestaTimestamps(s, uint32(s.server.erupeConfig.DebugOptions.FestaOverride), true)
 	} else {
 		timestamps = generateFestaTimestamps(s, start, false)
 	}