diff --git a/extras/conf/udb/Includes/Game_RingRacers.cfg b/extras/conf/udb/Includes/Game_RingRacers.cfg
index 1bb7c2827..c78a250ac 100644
--- a/extras/conf/udb/Includes/Game_RingRacers.cfg
+++ b/extras/conf/udb/Includes/Game_RingRacers.cfg
@@ -1,5 +1,5 @@
 // Default lump name for new map
-defaultlumpname = "MAPNAME";
+defaultlumpname = "WADNAME";
 
 //GZDB specific. Don't try to load lumps that don't exist.
 basegame = "Doom";
diff --git a/extras/conf/udb/Includes/RingRacers_common.cfg b/extras/conf/udb/Includes/RingRacers_common.cfg
index 7e662e55e..2be3d9af4 100644
--- a/extras/conf/udb/Includes/RingRacers_common.cfg
+++ b/extras/conf/udb/Includes/RingRacers_common.cfg
@@ -40,6 +40,8 @@ common
 	defaultflatscale = 1.0f;
 	scaledtextureoffsets = true;
 
+	maxcolormapalpha = 25;
+
 	// Thing number for start position in 3D Mode
 	start3dmode = 3328;
 
@@ -80,7 +82,7 @@ mapformat_udmf
 	defaulttestcompiler = "zdbsp_udmf_fast";
 
 	// Determines the textmap namespace
-	engine = "ringracers";
+	engine = "srb2";
 
 	maplumpnames
 	{
@@ -97,6 +99,8 @@ mapformat_udmf
 
 	// When this is set to true, sectors with the same tag will light up when a line is highlighted
 	linetagindicatesectors = false;
+	localsidedeftextureoffsets = false;
+	distinctfloorandceilingbrightness = true;
 
 	// Special linedefs
 	include("RingRacers_misc.cfg", "speciallinedefs_udmf");
diff --git a/extras/conf/udb/Includes/RingRacers_misc.cfg b/extras/conf/udb/Includes/RingRacers_misc.cfg
index a5c23f671..8484dea68 100644
--- a/extras/conf/udb/Includes/RingRacers_misc.cfg
+++ b/extras/conf/udb/Includes/RingRacers_misc.cfg
@@ -14,7 +14,7 @@ linedefflags
 	2048 = "[11] Netgame Only";
 	4096 = "[12] No Netgame";
 	8192 = "[13] Block Enemies";
-	16384 = "[14] Don't Bump";
+	16384 = "[14] Don't Bounce";
 	32768 = "[15] FOF Transfer";
 }
 
@@ -164,6 +164,8 @@ sectorbrightness
 	0;
 }
 
+numbrightnesslevels = 32;
+
 /*
 TEXTURES AND FLAT SOURCES
 This tells Doom Builder where to find the information for textures
@@ -214,151 +216,18 @@ universalfields
 {
 	sector
 	{
-		lightalpha
-		{
-			type = 0;
-			default = 25;
-		}
-
-		fadealpha
-		{
-			type = 0;
-			default = 25;
-		}
-
-		fadestart
-		{
-			type = 0;
-			default = 0;
-		}
-
-		fadeend
-		{
-			type = 0;
-			default = 33;
-		}
-
-		foglighting
-		{
-			type = 3;
-			default = false;
-		}
-
-		friction
-		{
-			type = 1;
-			default = 0.90625;
-		}
-
-		triggertag
-		{
-			type = 15;
-			default = 0;
-		}
-
-		triggerer
-		{
-			type = 0;
-			default = 0;
-			enum
-			{
-				0 = "Player";
-				1 = "All players";
-				2 = "Object";
-			}
-		}
 	}
 
 	linedef
 	{
-		arg5
-		{
-			type = 0;
-			default = 0;
-		}
-		arg6
-		{
-			type = 0;
-			default = 0;
-		}
-		arg7
-		{
-			type = 0;
-			default = 0;
-		}
-		arg8
-		{
-			type = 0;
-			default = 0;
-		}
-		arg9
-		{
-			type = 0;
-			default = 0;
-		}
-		stringarg0
-		{
-			type = 2;
-			default = "";
-		}
-		stringarg1
-		{
-			type = 2;
-			default = "";
-		}
-		executordelay
-		{
-			type = 0;
-			default = 0;
-		}
 	}
 
 	sidedef
 	{
-		repeatcnt
-		{
-			type = 0;
-			default = 0;
-		}
 	}
 
 	thing
 	{
-		arg5
-		{
-			type = 0;
-			default = 0;
-		}
-		arg6
-		{
-			type = 0;
-			default = 0;
-		}
-		arg7
-		{
-			type = 0;
-			default = 0;
-		}
-		arg8
-		{
-			type = 0;
-			default = 0;
-		}
-		arg9
-		{
-			type = 0;
-			default = 0;
-		}
-		stringarg0
-		{
-			type = 2;
-			default = "";
-		}
-		stringarg1
-		{
-			type = 2;
-			default = "";
-		}
 	}
 }
 
@@ -442,22 +311,7 @@ doommaplumpnames
 		nodebuild = true;
 		allowempty = false;
 	}
-}
 
-udmfmaplumpnames
-{
-	ZNODES
-	{
-		required = false;
-		nodebuild = true;
-		allowempty = false;
-	}
-}
-
-// Because Ring Racers has a versatile virtual resource
-// system, we can separate these out a bit more.
-sharedmaplumpnames
-{
 	REJECT
 	{
 		required = false;
@@ -471,7 +325,36 @@ sharedmaplumpnames
 		nodebuild = true;
 		allowempty = true;
 	}
+}
 
+udmfmaplumpnames
+{
+	ZNODES
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	REJECT
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = false;
+	}
+
+	BLOCKMAP
+	{
+		required = false;
+		nodebuild = true;
+		allowempty = true;
+	}
+}
+
+// Because Ring Racers has a versatile virtual resource
+// system, we can separate these out a bit more.
+sharedmaplumpnames
+{
 	BEHAVIOR
 	{
 		required = false;
diff --git a/src/p_setup.c b/src/p_setup.c
index f1cf5db69..73b10a0e9 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1261,8 +1261,8 @@ static boolean TextmapCount(size_t size)
 
 	// Check if namespace is valid.
 	tkn = M_TokenizerRead(0);
-	if (!fastcmp(tkn, "ringracers"))
-		CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'ringracers' is supported.\n", tkn);
+	if (!fastcmp(tkn, "srb2")) // Would like to use "ringracers", but it turns off features in UZB.
+		CONS_Alert(CONS_WARNING, "Invalid namespace '%s', only 'srb2' is supported.\n", tkn);
 
 	while ((tkn = M_TokenizerRead(0)) && M_TokenizerGetEndPos() < size)
 	{