diff --git a/main/presetcfgs/AV/competitive.cfg b/main/presetcfgs/AV/competitive.cfg
index 44398ca2..b802eb96 100644
--- a/main/presetcfgs/AV/competitive.cfg
+++ b/main/presetcfgs/AV/competitive.cfg
@@ -27,7 +27,6 @@ hud_style "2"
 hud_mapstyle "3"
 //hud_mapnames "5"
 cl_hudmapzoom "2"
-hud_waypointblinking "0"
 
 // New crosshairs
 crosshair "0"
diff --git a/main/presetcfgs/AV/newdefault.cfg b/main/presetcfgs/AV/newdefault.cfg
index 09fec488..fccb3fae 100644
--- a/main/presetcfgs/AV/newdefault.cfg
+++ b/main/presetcfgs/AV/newdefault.cfg
@@ -27,7 +27,6 @@ hud_style "1"
 hud_mapstyle "3"
 //hud_mapnames "5"
 cl_hudmapzoom "2"
-hud_waypointblinking "1"
 
 // New crosshairs
 crosshair "0"
diff --git a/main/presetcfgs/AV/ns32.cfg b/main/presetcfgs/AV/ns32.cfg
index 66c19dff..0b4bb649 100644
--- a/main/presetcfgs/AV/ns32.cfg
+++ b/main/presetcfgs/AV/ns32.cfg
@@ -27,7 +27,6 @@ hud_style "0"
 hud_mapstyle "1"
 //hud_mapnames "0"
 cl_hudmapzoom "3"
-hud_waypointblinking "2"
 
 // Legacy sprite crosshairs
 crosshair "1"
diff --git a/main/source/cl_dll/hud.cpp b/main/source/cl_dll/hud.cpp
index 3bbda729..bc656e38 100644
--- a/main/source/cl_dll/hud.cpp
+++ b/main/source/cl_dll/hud.cpp
@@ -228,8 +228,8 @@ void CHud :: Init( void )
 	CVAR_CREATE("hud_mapnamesGreen", "255", FCVAR_ARCHIVE);
 	CVAR_CREATE("hud_mapnamesBlue", "255", FCVAR_ARCHIVE);
 	CVAR_CREATE("hud_nameinfo", "1", FCVAR_ARCHIVE);
-	CVAR_CREATE("hud_drawwaypoints", "2", FCVAR_ARCHIVE);
-	CVAR_CREATE("hud_waypointblinking", "1", FCVAR_ARCHIVE);
+	CVAR_CREATE("hud_waypoint_draw", "2", FCVAR_ARCHIVE);
+	CVAR_CREATE("hud_waypoint_blink", "2", FCVAR_ARCHIVE);
 	m_pCvarWidescreen = gEngfuncs.pfnGetCvarPointer("gl_widescreen_yfov");
 
 	m_pSpriteList = NULL;
diff --git a/main/source/mod/AvHHud.cpp b/main/source/mod/AvHHud.cpp
index 757b29d6..0d2bf110 100644
--- a/main/source/mod/AvHHud.cpp
+++ b/main/source/mod/AvHHud.cpp
@@ -2825,7 +2825,7 @@ int	AvHHud::MsgFunc_SetOrder(const char* pszName, int iSize, void* pbuf)
 	// Check if it's the same order as the last one before setting the acknowledgement bool. Happens when respawning.
 	Vector newOrderLocation;
 	theNewOrder.GetLocation(newOrderLocation);
-	if (CVAR_GET_FLOAT("hud_drawwaypoints") == 2.0f)
+	if (CVAR_GET_FLOAT("hud_waypoint_draw") == 2.0f)
 	{
 		if ((newOrderLocation != this->mLastOrderLocation && theNewOrder.GetTargetIndex() == -1) || theNewOrder.GetTargetIndex() != this->mLastOrderIndex)
 		{
diff --git a/main/source/mod/AvHHudRender.cpp b/main/source/mod/AvHHudRender.cpp
index 0736dc7e..b0db9faf 100644
--- a/main/source/mod/AvHHudRender.cpp
+++ b/main/source/mod/AvHHudRender.cpp
@@ -1342,7 +1342,7 @@ void AvHHud::DrawOrders()
 	{
 		// Draw them blinking for soldiers, but always for commanders
 		float theFractionalLastUpdate = this->mTimeOfLastUpdate - (int)this->mTimeOfLastUpdate;
-		if ((theFractionalLastUpdate > .25f || CVAR_GET_FLOAT("hud_waypointblinking") <= 1.0f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
+		if ((theFractionalLastUpdate > .25f || CVAR_GET_FLOAT("hud_waypoint_blink") != 1.0f) || (this->GetHUDUser3() == AVH_USER3_COMMANDER_PLAYER))
 		{
 			OrderListType theOrders = this->GetOrderList();
 			
@@ -2903,7 +2903,7 @@ void AvHHud::RenderCommonUI()
         DrawInfoLocationText();
         DrawHUDStructureNotification();
 
-		if (CVAR_GET_FLOAT("hud_drawwaypoints") == 1 || (CVAR_GET_FLOAT("hud_drawwaypoints") == 2.0f && this->GetDrawOrderOverlay())) {
+		if (CVAR_GET_FLOAT("hud_waypoint_draw") == 1.0f || (CVAR_GET_FLOAT("hud_waypoint_draw") == 2.0f && this->GetDrawOrderOverlay())) {
 			this->DrawOrders();
 		}
         this->DrawHelpIcons();
diff --git a/main/source/mod/AvHOverviewMap.cpp b/main/source/mod/AvHOverviewMap.cpp
index 15312234..f0acfab5 100644
--- a/main/source/mod/AvHOverviewMap.cpp
+++ b/main/source/mod/AvHOverviewMap.cpp
@@ -399,7 +399,7 @@ void AvHOverviewMap::DrawMiniMapEntity(const DrawInfo& inDrawInfo, const Drawabl
                 
             float theFractionalLastUpdate = mLastUpdateTime - (int)mLastUpdateTime;
         
-			if (theFractionalLastUpdate < .25f && CVAR_GET_FLOAT("hud_waypointblinking") >= 1.0f)
+			if (theFractionalLastUpdate < .25f && CVAR_GET_FLOAT("hud_waypoint_blink") >= 1.0f)
             {
     	        return;
             }
diff --git a/main/user.scr b/main/user.scr
index e67c523a..ab644dcd 100644
--- a/main/user.scr
+++ b/main/user.scr
@@ -225,7 +225,7 @@ DESCRIPTION INFO_OPTIONS
 		{ "2.000000" }
 	}
 
-	"hud_drawwaypoints"
+	"hud_waypoint_draw"
 	{
 		"Show waypoints on HUD"
 		{
@@ -237,16 +237,16 @@ DESCRIPTION INFO_OPTIONS
 		{ "2.000000" }
 	}
 
-	"hud_waypointblinking"
+	"hud_waypoint_blink"
 	{
 		"Waypoint blinking"
 		{
 			LIST
 			"Never" "0"
-			"On map only" "1"
-			"On map and HUD" "2"
+			"Always" "1"
+			"On minimap only" "2"
 		}
-		{ "1.000000" }
+		{ "2.000000" }
 	}
 	
 	"hud_teamhealthalert"