diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index d660fca7..3a959ac5 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -632,7 +632,7 @@ typedef struct
 cheatvar_t cheatvars[] = {
 	{"timescale", "1"},
 	{"timedemo", "0"},
-	{"gl_drawworld", "1"},
+	{"r_drawworld", "1"},
 	{"cl_testlights", "0"},
 	{"gl_fullbright", "0"},
 	{"gl_drawflat", "0"},
diff --git a/src/client/refresh/gl/header/local.h b/src/client/refresh/gl/header/local.h
index 9126c070..c6af9193 100644
--- a/src/client/refresh/gl/header/local.h
+++ b/src/client/refresh/gl/header/local.h
@@ -168,7 +168,7 @@ extern cvar_t *gl_norefresh;
 extern cvar_t *gl_lefthand;
 extern cvar_t *gl_farsee;
 extern cvar_t *r_drawentities;
-extern cvar_t *gl_drawworld;
+extern cvar_t *r_drawworld;
 extern cvar_t *gl_speeds;
 extern cvar_t *gl_fullbright;
 extern cvar_t *gl_novis;
diff --git a/src/client/refresh/gl/r_main.c b/src/client/refresh/gl/r_main.c
index 05838c4a..4bf354a2 100644
--- a/src/client/refresh/gl/r_main.c
+++ b/src/client/refresh/gl/r_main.c
@@ -71,7 +71,7 @@ unsigned r_rawpalette[256];
 
 cvar_t *gl_norefresh;
 cvar_t *r_drawentities;
-cvar_t *gl_drawworld;
+cvar_t *r_drawworld;
 cvar_t *gl_speeds;
 cvar_t *gl_fullbright;
 cvar_t *gl_novis;
@@ -1203,7 +1203,7 @@ R_Register(void)
 	gl_norefresh = ri.Cvar_Get("gl_norefresh", "0", 0);
 	gl_fullbright = ri.Cvar_Get("gl_fullbright", "0", 0);
 	r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
-	gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
+	r_drawworld = ri.Cvar_Get("r_drawworld", "1", 0);
 	gl_novis = ri.Cvar_Get("gl_novis", "0", 0);
 	gl_lerpmodels = ri.Cvar_Get("gl_lerpmodels", "1", 0);
 	gl_speeds = ri.Cvar_Get("gl_speeds", "0", 0);
diff --git a/src/client/refresh/gl/r_surf.c b/src/client/refresh/gl/r_surf.c
index 0566abdf..83410e84 100644
--- a/src/client/refresh/gl/r_surf.c
+++ b/src/client/refresh/gl/r_surf.c
@@ -934,7 +934,7 @@ R_DrawWorld(void)
 {
 	entity_t ent;
 
-	if (!gl_drawworld->value)
+	if (!r_drawworld->value)
 	{
 		return;
 	}
diff --git a/src/client/refresh/gl3/gl3_main.c b/src/client/refresh/gl3/gl3_main.c
index dc63545f..9c05796a 100644
--- a/src/client/refresh/gl3/gl3_main.c
+++ b/src/client/refresh/gl3/gl3_main.c
@@ -108,7 +108,7 @@ cvar_t *gl3_overbrightbits;
 
 cvar_t *gl_norefresh;
 cvar_t *r_drawentities;
-cvar_t *gl_drawworld;
+cvar_t *r_drawworld;
 cvar_t *gl_nolerp_list;
 cvar_t *gl_nobind;
 cvar_t *gl_lockpvs;
@@ -213,7 +213,7 @@ GL3_Register(void)
 
 	gl_norefresh = ri.Cvar_Get("gl_norefresh", "0", 0);
 	r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
-	gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
+	r_drawworld = ri.Cvar_Get("r_drawworld", "1", 0);
 	gl_fullbright = ri.Cvar_Get("gl_fullbright", "0", 0);
 
 	/* don't bilerp characters and crosshairs */
@@ -252,7 +252,7 @@ GL3_Register(void)
 	//gl_norefresh = ri.Cvar_Get("gl_norefresh", "0", 0);
 	//gl_fullbright = ri.Cvar_Get("gl_fullbright", "0", 0);
 	//r_drawentities = ri.Cvar_Get("r_drawentities", "1", 0);
-	//gl_drawworld = ri.Cvar_Get("gl_drawworld", "1", 0);
+	//r_drawworld = ri.Cvar_Get("r_drawworld", "1", 0);
 	//gl_novis = ri.Cvar_Get("gl_novis", "0", 0);
 	//gl_lerpmodels = ri.Cvar_Get("gl_lerpmodels", "1", 0); NOTE: screw this, it looks horrible without
 	//gl_speeds = ri.Cvar_Get("gl_speeds", "0", 0);
diff --git a/src/client/refresh/gl3/gl3_surf.c b/src/client/refresh/gl3/gl3_surf.c
index 3b240810..b398f5ef 100644
--- a/src/client/refresh/gl3/gl3_surf.c
+++ b/src/client/refresh/gl3/gl3_surf.c
@@ -809,7 +809,7 @@ GL3_DrawWorld(void)
 {
 	entity_t ent;
 
-	if (!gl_drawworld->value)
+	if (!r_drawworld->value)
 	{
 		return;
 	}
diff --git a/src/client/refresh/gl3/header/local.h b/src/client/refresh/gl3/header/local.h
index 5b49be1d..ba83f563 100644
--- a/src/client/refresh/gl3/header/local.h
+++ b/src/client/refresh/gl3/header/local.h
@@ -498,7 +498,7 @@ extern cvar_t *gl_fullbright;
 extern cvar_t *gl_norefresh;
 extern cvar_t *gl_lefthand;
 extern cvar_t *gl_farsee;
-extern cvar_t *gl_drawworld;
+extern cvar_t *r_drawworld;
 
 extern cvar_t *vid_gamma;
 extern cvar_t *gl3_intensity;
diff --git a/src/common/cvar.c b/src/common/cvar.c
index e53434d3..842d37fc 100644
--- a/src/common/cvar.c
+++ b/src/common/cvar.c
@@ -38,7 +38,8 @@ typedef struct
 /* An ugly hack to rewrite CVARs loaded from config.cfg */
 replacement_t replacements[] = {
 	{"cl_drawfps", "cl_showfps"},
-	{"gl_drawentities", "r_drawentities"}
+	{"gl_drawentities", "r_drawentities"},
+	{"gl_drawworld", "r_drawworld"}
 };