Index: binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs
===================================================================
--- binary-improvements/MapRendering/Commands/EnableOpenIDDebug.cs	(revision 372)
+++ 	(revision )
@@ -1,25 +1,0 @@
-using System;
-using System.Collections.Generic;
-using AllocsFixes.NetConnections.Servers.Web;
-
-namespace AllocsFixes.CustomCommands {
-	public class EnableOpenIDDebug : ConsoleCmdAbstract {
-		public override string GetDescription () {
-			return "enable/disable OpenID debugging";
-		}
-
-		public override string[] GetCommands () {
-			return new[] {"openiddebug"};
-		}
-
-		public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-			if (_params.Count != 1) {
-				SdtdConsole.Instance.Output ("Current state: " + OpenID.debugOpenId);
-				return;
-			}
-
-			OpenID.debugOpenId = _params [0].Equals ("1");
-			SdtdConsole.Instance.Output ("Set OpenID debugging to " + _params [0].Equals ("1"));
-		}
-	}
-}
Index: binary-improvements/MapRendering/Commands/EnableRendering.cs
===================================================================
--- binary-improvements/MapRendering/Commands/EnableRendering.cs	(revision 372)
+++ 	(revision )
@@ -1,24 +1,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace AllocsFixes.CustomCommands {
-	public class EnableRendering : ConsoleCmdAbstract {
-		public override string GetDescription () {
-			return "enable/disable live map rendering";
-		}
-
-		public override string[] GetCommands () {
-			return new[] {"enablerendering"};
-		}
-
-		public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-			if (_params.Count != 1) {
-				SdtdConsole.Instance.Output ("Current state: " + MapRendering.MapRendering.renderingEnabled);
-				return;
-			}
-
-			MapRendering.MapRendering.renderingEnabled = _params [0].Equals ("1");
-			SdtdConsole.Instance.Output ("Set live map rendering to " + _params [0].Equals ("1"));
-		}
-	}
-}
Index: binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs
===================================================================
--- binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs	(revision 372)
+++ binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs	(revision 420)
@@ -5,10 +5,10 @@
 namespace AllocsFixes.CustomCommands {
 	public class ReloadWebPermissions : ConsoleCmdAbstract {
-		public override string GetDescription () {
+		protected override string getDescription () {
 			return "force reload of web permissions file";
 		}
 
-		public override string[] GetCommands () {
-			return new[] {"reloadwebpermissions"};
+		protected override string[] getCommands () {
+			return new[] {"reloadwebpermissions_legacy"};
 		}
 
Index: binary-improvements/MapRendering/Commands/RenderMap.cs
===================================================================
--- binary-improvements/MapRendering/Commands/RenderMap.cs	(revision 372)
+++ 	(revision )
@@ -1,20 +1,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace AllocsFixes.CustomCommands {
-	public class RenderMap : ConsoleCmdAbstract {
-		public override string GetDescription () {
-			return "render the current map to a file";
-		}
-
-		public override string[] GetCommands () {
-			return new[] {"rendermap"};
-		}
-
-		public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-			MapRendering.MapRendering.Instance.RenderFullMap ();
-
-			SdtdConsole.Instance.Output ("Render map done");
-		}
-	}
-}
Index: binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs
===================================================================
--- binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs	(revision 372)
+++ binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs	(revision 420)
@@ -4,19 +4,19 @@
 namespace AllocsFixes.CustomCommands {
 	public class WebPermissionsCmd : ConsoleCmdAbstract {
-		public override string[] GetCommands () {
-			return new[] {"webpermission"};
+		protected override string[] getCommands () {
+			return new[] {"webpermission_legacy"};
 		}
 
-		public override string GetDescription () {
+		protected override string getDescription () {
 			return "Manage web permission levels";
 		}
 
-		public override string GetHelp () {
+		protected override string getHelp () {
 			return "Set/get permission levels required to access a given web functionality. Default\n" +
 			       "level required for functions that are not explicitly specified is 0.\n" +
 			       "Usage:\n" +
-			       "   webpermission add <webfunction> <level>\n" +
-			       "   webpermission remove <webfunction>\n" +
-			       "   webpermission list";
+			       "   webpermission_legacy add <webfunction> <level>\n" +
+			       "   webpermission_legacy remove <webfunction>\n" +
+			       "   webpermission_legacy list";
 		}
 
Index: binary-improvements/MapRendering/Commands/WebTokens.cs
===================================================================
--- binary-improvements/MapRendering/Commands/WebTokens.cs	(revision 372)
+++ binary-improvements/MapRendering/Commands/WebTokens.cs	(revision 420)
@@ -7,18 +7,18 @@
 		private static readonly Regex validNameTokenMatcher = new Regex (@"^\w+$");
 
-		public override string[] GetCommands () {
-			return new[] {"webtokens"};
+		protected override string[] getCommands () {
+			return new[] {"webtokens_legacy"};
 		}
 
-		public override string GetDescription () {
+		protected override string getDescription () {
 			return "Manage web tokens";
 		}
 
-		public override string GetHelp () {
+		protected override string getHelp () {
 			return "Set/get webtoken permission levels. A level of 0 is maximum permission.\n" +
 			       "Usage:\n" +
-			       "   webtokens add <username> <usertoken> <level>\n" +
-			       "   webtokens remove <username>\n" +
-			       "   webtokens list";
+			       "   webtokens_legacy add <username> <usertoken> <level>\n" +
+			       "   webtokens_legacy remove <username>\n" +
+			       "   webtokens_legacy list";
 		}
 
Index: binary-improvements/MapRendering/Commands/webstat.cs
===================================================================
--- binary-improvements/MapRendering/Commands/webstat.cs	(revision 372)
+++ binary-improvements/MapRendering/Commands/webstat.cs	(revision 420)
@@ -5,10 +5,10 @@
 namespace AllocsFixes.CustomCommands {
 	public class webstat : ConsoleCmdAbstract {
-		public override string GetDescription () {
+		protected override string getDescription () {
 			return "DEBUG PURPOSES ONLY";
 		}
 
-		public override string[] GetCommands () {
-			return new[] {"webstat"};
+		protected override string[] getCommands () {
+			return new[] {"webstat_legacy"};
 		}