diff --git a/plugins/basevotes.sp b/plugins/basevotes.sp
index c6ad128a..8b0110f3 100644
--- a/plugins/basevotes.sp
+++ b/plugins/basevotes.sp
@@ -60,15 +60,15 @@ ConVar g_Cvar_Limits[3] = {null, ...};
 ConVar g_Cvar_Voteban = null;
 //ConVar g_Cvar_VoteSay = null;
 
-enum voteType
+enum VoteType
 {
-	map,
-	kick,
-	ban,
-	question
+	VoteType_Map,
+	VoteType_Kick,
+	VoteType_Ban,
+	VoteType_Question
 }
 
-voteType g_voteType = question;
+VoteType g_voteType = VoteType_Question;
 
 // Menu API does not provide us with a way to pass multiple peices of data with a single
 // choice, so some globals are used to hold stuff.
@@ -202,7 +202,7 @@ public Action Command_Vote(int client, int args)
 			len += pos;
 		}	
 	}
-	g_voteType = question;
+	g_voteType = VoteType_Question;
 	
 	g_hVoteMenu = new Menu(Handler_VoteCallback, MENU_ACTIONS_ALL);
 	g_hVoteMenu.SetTitle("%s?", g_voteArg);
@@ -239,7 +239,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 	}
 	else if (action == MenuAction_Display)
 	{
-	 	if (g_voteType != question)
+	 	if (g_voteType != VoteType_Question)
 	 	{
 			char title[64];
 			menu.GetTitle(title, sizeof(title));
@@ -288,7 +288,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 		
 		percent = GetVotePercent(votes, totalVotes);
 		
-		if (g_voteType != question)
+		if (g_voteType != VoteType_Question)
 		{
 			limit = g_Cvar_Limits[g_voteType].FloatValue;
 		}
@@ -307,7 +307,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 			
 			switch (g_voteType)
 			{
-				case (question):
+				case VoteType_Question:
 				{
 					if (strcmp(item, VOTE_NO) == 0 || strcmp(item, VOTE_YES) == 0)
 					{
@@ -317,7 +317,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 					PrintToChatAll("[SM] %t", "Vote End", g_voteArg, item);
 				}
 				
-				case (map):
+				case VoteType_Map:
 				{
 					// single-vote items don't use the display item
 					char displayName[PLATFORM_MAX_PATH];
@@ -329,7 +329,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 					dp.WriteString(item);		
 				}
 					
-				case (kick):
+				case VoteType_Kick:
 				{
 					int voteTarget;
 					if((voteTarget = GetClientOfUserId(g_voteTarget)) == 0)
@@ -350,7 +350,7 @@ public int Handler_VoteCallback(Menu menu, MenuAction action, int param1, int pa
 					}
 				}
 					
-				case (ban):
+				case VoteType_Ban:
 				{
 					if (g_voteArg[0] == '\0')
 					{
diff --git a/plugins/basevotes/voteban.sp b/plugins/basevotes/voteban.sp
index 61f2ec5f..78891fe9 100644
--- a/plugins/basevotes/voteban.sp
+++ b/plugins/basevotes/voteban.sp
@@ -42,7 +42,7 @@ void DisplayVoteBanMenu(int client, int target)
 	LogAction(client, target, "\"%L\" initiated a ban vote against \"%L\"", client, target);
 	ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Ban", g_voteInfo[VOTE_NAME]);
 
-	g_voteType = ban;
+	g_voteType = VoteType_Ban;
 	
 	g_hVoteMenu = new Menu(Handler_VoteCallback, MENU_ACTIONS_ALL);
 	g_hVoteMenu.SetTitle("Voteban Player");
diff --git a/plugins/basevotes/votekick.sp b/plugins/basevotes/votekick.sp
index 7864b971..d63d3148 100644
--- a/plugins/basevotes/votekick.sp
+++ b/plugins/basevotes/votekick.sp
@@ -40,7 +40,7 @@ void DisplayVoteKickMenu(int client, int target)
 	LogAction(client, target, "\"%L\" initiated a kick vote against \"%L\"", client, target);
 	ShowActivity(client, "%t", "Initiated Vote Kick", g_voteInfo[VOTE_NAME]);
 	
-	g_voteType = kick;
+	g_voteType = VoteType_Kick;
 	
 	g_hVoteMenu = new Menu(Handler_VoteCallback, MENU_ACTIONS_ALL);
 	g_hVoteMenu.SetTitle("Votekick Player");
diff --git a/plugins/basevotes/votemap.sp b/plugins/basevotes/votemap.sp
index 57e8d2c6..f4f50d6a 100644
--- a/plugins/basevotes/votemap.sp
+++ b/plugins/basevotes/votemap.sp
@@ -51,7 +51,7 @@ void DisplayVoteMapMenu(int client, int mapCount, char[][] maps)
 	LogAction(client, -1, "\"%L\" initiated a map vote for%s.", client, maps_list);
 	ShowActivity2(client, "[SM] ", "%t", "Initiated Vote Map");
 	
-	g_voteType = map;
+	g_voteType = VoteType_Map;
 	
 	g_hVoteMenu = new Menu(Handler_VoteCallback, MENU_ACTIONS_ALL);
 	
diff --git a/sourcepawn b/sourcepawn
index 7cb5bede..5b1ad505 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 7cb5bede74c184b9b1de4dbf6b0bfc2d23c4a17e
+Subproject commit 5b1ad5059f7ddc7fc46065531b5b22a67c79f814