diff --git a/nq/include/client.h b/nq/include/client.h
index 7827a0879..77389382a 100644
--- a/nq/include/client.h
+++ b/nq/include/client.h
@@ -272,7 +272,7 @@ extern cvar_t	*m_yaw;
 extern cvar_t	*m_forward;
 extern cvar_t	*m_side;
 
-extern struct cvar_s *name;
+extern struct cvar_s *cl_name;
 
 #define	MAX_TEMP_ENTITIES	64			// lightning bolts, etc
 #define	MAX_STATIC_ENTITIES	128			// torches, etc
diff --git a/nq/source/gl_sky_clip.c b/nq/source/gl_sky_clip.c
index 8ae69ea98..1bbc9693a 100644
--- a/nq/source/gl_sky_clip.c
+++ b/nq/source/gl_sky_clip.c
@@ -132,7 +132,7 @@ determine_face (vec3_t v)
 		i = 2;
 	}
 	if (!m) {
-		Sys_Error ("%s speared by sky poly edge\n", name->string);
+		Sys_Error ("%s speared by sky poly edge\n", cl_name->string);
 	}
 	if (v[i] < 0)
 		i += 3;
diff --git a/qw/include/client.h b/qw/include/client.h
index d7e6f31f6..a7ae79685 100644
--- a/qw/include/client.h
+++ b/qw/include/client.h
@@ -310,7 +310,7 @@ extern	struct cvar_s	*m_yaw;
 extern	struct cvar_s	*m_forward;
 extern	struct cvar_s	*m_side;
 
-extern	struct cvar_s	*name;
+extern	struct cvar_s	*cl_name;
 
 
 #define	MAX_STATIC_ENTITIES	128			// torches, etc
diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c
index 4213ce4eb..737e3e243 100644
--- a/qw/source/cl_main.c
+++ b/qw/source/cl_main.c
@@ -150,7 +150,7 @@ static qboolean allowremotecmd = true;
 //
 cvar_t     *password;
 cvar_t     *spectator;
-cvar_t     *name;
+cvar_t     *cl_name;
 cvar_t     *team;
 cvar_t     *rate;
 cvar_t     *noaim;
@@ -1296,8 +1296,8 @@ CL_Init_Cvars (void)
 	// 
 	// info mirrors
 	// 
-	name = Cvar_Get ("name", "unnamed", CVAR_ARCHIVE | CVAR_USERINFO, Cvar_Info,
-					 "Player name");
+	cl_name = Cvar_Get ("name", "unnamed", CVAR_ARCHIVE | CVAR_USERINFO,
+						Cvar_Info, "Player name");
 	password = Cvar_Get ("password", "", CVAR_USERINFO, Cvar_Info,
 			"Server password");
 	spectator = Cvar_Get ("spectator", "", CVAR_USERINFO, Cvar_Info,
diff --git a/qw/source/gl_screen.c b/qw/source/gl_screen.c
index cca0ada99..55dd17def 100644
--- a/qw/source/gl_screen.c
+++ b/qw/source/gl_screen.c
@@ -792,7 +792,7 @@ SCR_RSShot_f (void)
 	st[sizeof (st) - 1] = 0;
 	SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 11, w);
 
-	strncpy (st, name->string, sizeof (st));
+	strncpy (st, cl_name->string, sizeof (st));
 	st[sizeof (st) - 1] = 0;
 	SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, h - 21, w);
 
diff --git a/qw/source/gl_sky_clip.c b/qw/source/gl_sky_clip.c
index 8ae69ea98..1bbc9693a 100644
--- a/qw/source/gl_sky_clip.c
+++ b/qw/source/gl_sky_clip.c
@@ -132,7 +132,7 @@ determine_face (vec3_t v)
 		i = 2;
 	}
 	if (!m) {
-		Sys_Error ("%s speared by sky poly edge\n", name->string);
+		Sys_Error ("%s speared by sky poly edge\n", cl_name->string);
 	}
 	if (v[i] < 0)
 		i += 3;
diff --git a/qw/source/screen.c b/qw/source/screen.c
index 0afe09d6b..306df83b8 100644
--- a/qw/source/screen.c
+++ b/qw/source/screen.c
@@ -802,7 +802,7 @@ SCR_RSShot_f (void)
 	st[sizeof (st) - 1] = 0;
 	SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 10, w);
 
-	strncpy (st, name->string, sizeof (st));
+	strncpy (st, cl_name->string, sizeof (st));
 	st[sizeof (st) - 1] = 0;
 	SCR_DrawStringToSnap (st, newbuf, w - strlen (st) * 8, 20, w);