diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 3d596571..a39ea40f 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -515,7 +515,7 @@ CL_InitLocal(void)
 	rcon_client_password = Cvar_Get("rcon_password", "", 0);
 	rcon_address = Cvar_Get("rcon_address", "", 0);
 
-	cl_lightlevel = Cvar_Get("gl_lightlevel", "0", 0);
+	cl_lightlevel = Cvar_Get("r_lightlevel", "0", 0);
 
 	/* userinfo */
 	name = Cvar_Get("name", "unnamed", CVAR_USERINFO | CVAR_ARCHIVE);
diff --git a/src/client/refresh/gl/header/local.h b/src/client/refresh/gl/header/local.h
index 68773e53..82c3f4f1 100644
--- a/src/client/refresh/gl/header/local.h
+++ b/src/client/refresh/gl/header/local.h
@@ -174,7 +174,7 @@ extern cvar_t *r_fullbright;
 extern cvar_t *gl_novis;
 extern cvar_t *r_lerpmodels;
 
-extern cvar_t *gl_lightlevel;
+extern cvar_t *r_lightlevel;
 extern cvar_t *gl_overbrightbits;
 
 extern cvar_t *gl_palettedtexture;
diff --git a/src/client/refresh/gl/r_main.c b/src/client/refresh/gl/r_main.c
index 4d73ebf1..0c8672b6 100644
--- a/src/client/refresh/gl/r_main.c
+++ b/src/client/refresh/gl/r_main.c
@@ -79,7 +79,7 @@ cvar_t *r_lerpmodels;
 cvar_t *gl_lefthand;
 cvar_t *gl_farsee;
 
-cvar_t *gl_lightlevel;
+cvar_t *r_lightlevel;
 cvar_t *gl_overbrightbits;
 
 cvar_t *gl_particle_min_size;
@@ -1167,22 +1167,22 @@ R_SetLightLevel(void)
 	{
 		if (shadelight[0] > shadelight[2])
 		{
-			gl_lightlevel->value = 150 * shadelight[0];
+			r_lightlevel->value = 150 * shadelight[0];
 		}
 		else
 		{
-			gl_lightlevel->value = 150 * shadelight[2];
+			r_lightlevel->value = 150 * shadelight[2];
 		}
 	}
 	else
 	{
 		if (shadelight[1] > shadelight[2])
 		{
-			gl_lightlevel->value = 150 * shadelight[1];
+			r_lightlevel->value = 150 * shadelight[1];
 		}
 		else
 		{
-			gl_lightlevel->value = 150 * shadelight[2];
+			r_lightlevel->value = 150 * shadelight[2];
 		}
 	}
 }
@@ -1208,7 +1208,7 @@ R_Register(void)
 	r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0);
 	gl_speeds = ri.Cvar_Get("gl_speeds", "0", 0);
 
-	gl_lightlevel = ri.Cvar_Get("gl_lightlevel", "0", 0);
+	r_lightlevel = ri.Cvar_Get("r_lightlevel", "0", 0);
 	gl_overbrightbits = ri.Cvar_Get("gl_overbrightbits", "0", CVAR_ARCHIVE);
 
 	gl_particle_min_size = ri.Cvar_Get("gl_particle_min_size", "2", CVAR_ARCHIVE);
diff --git a/src/client/refresh/gl/r_mesh.c b/src/client/refresh/gl/r_mesh.c
index c8ddf235..38c507ef 100644
--- a/src/client/refresh/gl/r_mesh.c
+++ b/src/client/refresh/gl/r_mesh.c
@@ -564,22 +564,22 @@ R_DrawAliasModel(entity_t *e)
 			{
 				if (shadelight[0] > shadelight[2])
 				{
-					gl_lightlevel->value = 150 * shadelight[0];
+					r_lightlevel->value = 150 * shadelight[0];
 				}
 				else
 				{
-					gl_lightlevel->value = 150 * shadelight[2];
+					r_lightlevel->value = 150 * shadelight[2];
 				}
 			}
 			else
 			{
 				if (shadelight[1] > shadelight[2])
 				{
-					gl_lightlevel->value = 150 * shadelight[1];
+					r_lightlevel->value = 150 * shadelight[1];
 				}
 				else
 				{
-					gl_lightlevel->value = 150 * shadelight[2];
+					r_lightlevel->value = 150 * shadelight[2];
 				}
 			}
 		}
diff --git a/src/client/refresh/gl3/gl3_main.c b/src/client/refresh/gl3/gl3_main.c
index 41e24af2..0d2679e8 100644
--- a/src/client/refresh/gl3/gl3_main.c
+++ b/src/client/refresh/gl3/gl3_main.c
@@ -103,7 +103,7 @@ cvar_t *gl_farsee;
 
 cvar_t *gl3_intensity;
 cvar_t *gl3_intensity_2D;
-cvar_t *gl_lightlevel;
+cvar_t *r_lightlevel;
 cvar_t *gl3_overbrightbits;
 
 cvar_t *gl_norefresh;
@@ -228,7 +228,7 @@ GL3_Register(void)
 	gl3_intensity = ri.Cvar_Get("gl3_intensity", "1.5", CVAR_ARCHIVE);
 	gl3_intensity_2D = ri.Cvar_Get("gl3_intensity_2D", "1.5", CVAR_ARCHIVE);
 
-	gl_lightlevel = ri.Cvar_Get("gl_lightlevel", "0", 0);
+	r_lightlevel = ri.Cvar_Get("r_lightlevel", "0", 0);
 	gl3_overbrightbits = ri.Cvar_Get("gl3_overbrightbits", "1.3", CVAR_ARCHIVE);
 
 	gl_lightmap = ri.Cvar_Get("gl_lightmap", "0", 0);
@@ -257,7 +257,7 @@ GL3_Register(void)
 	//r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0); NOTE: screw this, it looks horrible without
 	//gl_speeds = ri.Cvar_Get("gl_speeds", "0", 0);
 
-	//gl_lightlevel = ri.Cvar_Get("gl_lightlevel", "0", 0);
+	//r_lightlevel = ri.Cvar_Get("r_lightlevel", "0", 0);
 	//gl_overbrightbits = ri.Cvar_Get("gl_overbrightbits", "0", CVAR_ARCHIVE);
 
 	gl_particle_min_size = ri.Cvar_Get("gl_particle_min_size", "2", CVAR_ARCHIVE);
@@ -1525,22 +1525,22 @@ GL3_SetLightLevel(void)
 	{
 		if (shadelight[0] > shadelight[2])
 		{
-			gl_lightlevel->value = 150 * shadelight[0];
+			r_lightlevel->value = 150 * shadelight[0];
 		}
 		else
 		{
-			gl_lightlevel->value = 150 * shadelight[2];
+			r_lightlevel->value = 150 * shadelight[2];
 		}
 	}
 	else
 	{
 		if (shadelight[1] > shadelight[2])
 		{
-			gl_lightlevel->value = 150 * shadelight[1];
+			r_lightlevel->value = 150 * shadelight[1];
 		}
 		else
 		{
-			gl_lightlevel->value = 150 * shadelight[2];
+			r_lightlevel->value = 150 * shadelight[2];
 		}
 	}
 }
diff --git a/src/client/refresh/gl3/gl3_mesh.c b/src/client/refresh/gl3/gl3_mesh.c
index 79f04dab..34729881 100644
--- a/src/client/refresh/gl3/gl3_mesh.c
+++ b/src/client/refresh/gl3/gl3_mesh.c
@@ -724,22 +724,22 @@ GL3_DrawAliasModel(entity_t *entity)
 			{
 				if (shadelight[0] > shadelight[2])
 				{
-					gl_lightlevel->value = 150 * shadelight[0];
+					r_lightlevel->value = 150 * shadelight[0];
 				}
 				else
 				{
-					gl_lightlevel->value = 150 * shadelight[2];
+					r_lightlevel->value = 150 * shadelight[2];
 				}
 			}
 			else
 			{
 				if (shadelight[1] > shadelight[2])
 				{
-					gl_lightlevel->value = 150 * shadelight[1];
+					r_lightlevel->value = 150 * shadelight[1];
 				}
 				else
 				{
-					gl_lightlevel->value = 150 * shadelight[2];
+					r_lightlevel->value = 150 * shadelight[2];
 				}
 			}
 		}
diff --git a/src/client/refresh/gl3/header/local.h b/src/client/refresh/gl3/header/local.h
index 678be43a..04949d40 100644
--- a/src/client/refresh/gl3/header/local.h
+++ b/src/client/refresh/gl3/header/local.h
@@ -505,7 +505,7 @@ extern cvar_t *gl3_intensity;
 extern cvar_t *gl3_intensity_2D;
 extern cvar_t *gl_anisotropic;
 
-extern cvar_t *gl_lightlevel;
+extern cvar_t *r_lightlevel;
 extern cvar_t *gl3_overbrightbits;
 extern cvar_t *gl3_particle_fade_factor;
 extern cvar_t *gl3_particle_square;
diff --git a/src/common/cvar.c b/src/common/cvar.c
index e0f998e4..2a566913 100644
--- a/src/common/cvar.c
+++ b/src/common/cvar.c
@@ -40,7 +40,9 @@ replacement_t replacements[] = {
 	{"cl_drawfps", "cl_showfps"},
 	{"gl_drawentities", "r_drawentities"},
 	{"gl_drawworld", "r_drawworld"},
-	{"gl_fullbright", "r_fullbright"}
+	{"gl_fullbright", "r_fullbright"},
+	{"gl_lerpmodels", "r_lerpmodels"},
+	{"gl_lightlevel", "r_lightlevel"}
 };