diff --git a/core-legacy/concommands.cpp b/core-legacy/concommands.cpp
index 477a740..7a79e37 100644
--- a/core-legacy/concommands.cpp
+++ b/core-legacy/concommands.cpp
@@ -105,7 +105,7 @@ void SMConVarAccessor::Unregister(ConCommandBase *pCommand)
 	}
 }
 
-ConVar metamod_version("metamod_version", SVN_FULL_VERSION, FCVAR_SPONLY | FCVAR_NOTIFY, "Metamod:Source Version");
+ConVar metamod_version("metamod_version", MMS_FULL_VERSION, FCVAR_SPONLY | FCVAR_NOTIFY, "Metamod:Source Version");
 #ifdef OS_WIN32
 ConVar mm_pluginsfile("mm_pluginsfile", "addons\\metamod\\metaplugins.ini", FCVAR_SPONLY, "Metamod:Source Plugins File");
 ConVar mm_basedir("mm_basedir", "addons\\metamod", FCVAR_SPONLY, "Metamod:Source base folder");
@@ -140,7 +140,7 @@ CON_COMMAND(meta, "Metamod:Source Menu")
 			
 			return;
 		} else if (strcmp(command, "version") == 0) {
-			CONMSG("Metamod:Source version %s\n", SVN_FULL_VERSION);
+			CONMSG("Metamod:Source version %s\n", MMS_FULL_VERSION);
 			CONMSG("Build ID: %s\n", MMS_BUILD_UNIQUEID);
 			if (g_bIsBridgedAsVsp)
 			{
@@ -662,7 +662,7 @@ void ClientCommand_handler(edict_t *client)
 
 				RETURN_META(MRES_SUPERCEDE);
 			} else if(strcmp(subcmd, "version") == 0) {
-				CLIENT_CONMSG(client, "Metamod:Source version %s\n", SVN_FULL_VERSION);
+				CLIENT_CONMSG(client, "Metamod:Source version %s\n", MMS_FULL_VERSION);
 				CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
 				CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
 				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
diff --git a/core-legacy/version.h b/core-legacy/version.h
index 6482f61..e0da05a 100644
--- a/core-legacy/version.h
+++ b/core-legacy/version.h
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "-dev"
-#define MMS_BUILD_UNIQUEID   "556:b37a142ba881" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    1,7,0,0
+#define MMS_BUILD_UNIQUEID   "598:54ab41264c82" MMS_BUILD_STRING
+#define MMS_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    1,7,0,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_
 
diff --git a/core-legacy/version.rc b/core-legacy/version.rc
index 4b610ae..eaab10a 100755
--- a/core-legacy/version.rc
+++ b/core-legacy/version.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION MMS_FILE_VERSION
+ PRODUCTVERSION MMS_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Metamod: Source"
             VALUE "FileDescription", "Metamod: Source"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", MMS_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", MMS_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"
diff --git a/core-legacy/version.tpl b/core-legacy/version.tpl
index 903ac50..e06da56 100644
--- a/core-legacy/version.tpl
+++ b/core-legacy/version.tpl
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "$BUILD_STRING$"
 #define MMS_BUILD_UNIQUEID   "$BUILD_ID$" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
+#define MMS_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_
 
diff --git a/core-legacy/vsp_bridge.cpp b/core-legacy/vsp_bridge.cpp
index dda5014..b64828f 100644
--- a/core-legacy/vsp_bridge.cpp
+++ b/core-legacy/vsp_bridge.cpp
@@ -1,69 +1,69 @@
-#include <assert.h>
-#include "sourcemm.h"
-#include "concommands.h"
-#include <loader_bridge.h>
-
-SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
-
-ConCommand *g_plugin_unload = NULL;
-bool g_bIsTryingToUnload;
-bool g_bIsBridgedAsVsp;
-
-void InterceptPluginUnloads()
-{
-	g_bIsTryingToUnload = true;
-}
-
-void InterceptPluginUnloads_Post()
-{
-	g_bIsTryingToUnload = false;
-}
-
-class VspBridge : public IVspBridge
-{
-	virtual bool Load(const vsp_bridge_info *info, char *error, size_t maxlength)
-	{
-		assert(!g_GameDll.loaded && !g_bIsBridgedAsVsp);
-
-		CreateInterfaceFn engineFactory = (CreateInterfaceFn)info->engineFactory;
-		CreateInterfaceFn gsFactory = (CreateInterfaceFn)info->gsFactory;
-
-		if (!AlternatelyLoadMetamod(engineFactory, gsFactory))
-			return false;
-
-		ConCommandBase *pBase = g_Engine.icvar->GetCommands();
-		while (pBase != NULL)
-		{
-			if (pBase->IsCommand() && strcmp(pBase->GetName(), "plugin_unload") == 0)
-			{
-				g_plugin_unload = (ConCommand *)pBase;
-				break;
-			}
-			pBase = const_cast<ConCommandBase *>(pBase->GetNext());
-		}
-
-		if (g_plugin_unload != NULL)
-		{
-			SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false);
-			SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true);
-		}
-
-		extern ConVar metamod_version;
-		char buffer[255];
-
-		UTIL_Format(buffer, sizeof(buffer), "%sV", metamod_version.GetString());
-		metamod_version.SetValue(buffer);
-
-		g_bIsBridgedAsVsp = true;
-		g_pRealVspCallbacks = info->vsp_callbacks;
-
-		g_PluginMngr.SetVSPAsLoaded();
-
-		return true;
-	}
-
-	virtual void Unload()
-	{
+#include <assert.h>
+#include "sourcemm.h"
+#include "concommands.h"
+#include <loader_bridge.h>
+
+SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+
+ConCommand *g_plugin_unload = NULL;
+bool g_bIsTryingToUnload;
+bool g_bIsBridgedAsVsp;
+
+void InterceptPluginUnloads()
+{
+	g_bIsTryingToUnload = true;
+}
+
+void InterceptPluginUnloads_Post()
+{
+	g_bIsTryingToUnload = false;
+}
+
+class VspBridge : public IVspBridge
+{
+	virtual bool Load(const vsp_bridge_info *info, char *error, size_t maxlength)
+	{
+		assert(!g_GameDll.loaded && !g_bIsBridgedAsVsp);
+
+		CreateInterfaceFn engineFactory = (CreateInterfaceFn)info->engineFactory;
+		CreateInterfaceFn gsFactory = (CreateInterfaceFn)info->gsFactory;
+
+		if (!AlternatelyLoadMetamod(engineFactory, gsFactory))
+			return false;
+
+		ConCommandBase *pBase = g_Engine.icvar->GetCommands();
+		while (pBase != NULL)
+		{
+			if (pBase->IsCommand() && strcmp(pBase->GetName(), "plugin_unload") == 0)
+			{
+				g_plugin_unload = (ConCommand *)pBase;
+				break;
+			}
+			pBase = const_cast<ConCommandBase *>(pBase->GetNext());
+		}
+
+		if (g_plugin_unload != NULL)
+		{
+			SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false);
+			SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true);
+		}
+
+		extern ConVar metamod_version;
+		char buffer[255];
+
+		UTIL_Format(buffer, sizeof(buffer), "%sV", metamod_version.GetString());
+		metamod_version.SetValue(buffer);
+
+		g_bIsBridgedAsVsp = true;
+		g_pRealVspCallbacks = info->vsp_callbacks;
+
+		g_PluginMngr.SetVSPAsLoaded();
+
+		return true;
+	}
+
+	virtual void Unload()
+	{
 		if (g_bIsTryingToUnload)
 		{
 			Error("Metamod:Source cannot be unloaded from VSP mode.  Use \"meta unload\" to unload specific plugins.\n");
@@ -74,21 +74,21 @@ class VspBridge : public IVspBridge
 			SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false);
 			SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads_Post, true);
 			g_plugin_unload = NULL;
-		}
-		g_SMConVarAccessor.UnloadMetamodCommands();
-		UnloadMetamod(false);
-	}
-
-	virtual const char *GetDescription()
-	{
-		return "Metamod:Source " SVN_FULL_VERSION;
-	}
-};
-
-VspBridge mm14_vsp_bridge;
-
-SMM_API IVspBridge *
-GetVspBridge()
-{
-	return &mm14_vsp_bridge;
-}
+		}
+		g_SMConVarAccessor.UnloadMetamodCommands();
+		UnloadMetamod(false);
+	}
+
+	virtual const char *GetDescription()
+	{
+		return "Metamod:Source " MMS_FULL_VERSION;
+	}
+};
+
+VspBridge mm14_vsp_bridge;
+
+SMM_API IVspBridge *
+GetVspBridge()
+{
+	return &mm14_vsp_bridge;
+}
diff --git a/core-legacy/vsp_listener.cpp b/core-legacy/vsp_listener.cpp
index 64d39f6..79a5250 100644
--- a/core-legacy/vsp_listener.cpp
+++ b/core-legacy/vsp_listener.cpp
@@ -58,7 +58,7 @@ void VSPListener::GameFrame(bool simulating)
 
 const char *VSPListener::GetPluginDescription()
 {
-	return "Metamod:Source Interface " SVN_FULL_VERSION;
+	return "Metamod:Source Interface " MMS_FULL_VERSION;
 }
 
 bool VSPListener::IsLoaded()
diff --git a/core/metamod.cpp b/core/metamod.cpp
index 6c72fce..5ee0a54 100644
--- a/core/metamod.cpp
+++ b/core/metamod.cpp
@@ -493,11 +493,11 @@ mm_StartupMetamod(bool is_vsp_load)
 	UTIL_Format(buffer,
 		sizeof(buffer),
 		"%s%s",
-		SVN_FULL_VERSION,
+		MMS_FULL_VERSION,
 		is_vsp_load ? "V" : "");
 
 	metamod_version = provider->CreateConVar("metamod_version", 
-		SVN_FULL_VERSION, 
+		MMS_FULL_VERSION, 
 		"Metamod:Source Version",
 		ConVarFlag_Notify|ConVarFlag_SpOnly);
 
diff --git a/core/metamod_console.cpp b/core/metamod_console.cpp
index 66c1a4b..2f9168c 100644
--- a/core/metamod_console.cpp
+++ b/core/metamod_console.cpp
@@ -70,7 +70,7 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 		}
 		else if (strcmp(command, "version") == 0)
 		{
-			CONMSG("Metamod:Source version %s\n", SVN_FULL_VERSION);
+			CONMSG("Metamod:Source version %s\n", MMS_FULL_VERSION);
 			CONMSG("Build ID: %s\n", MMS_BUILD_UNIQUEID);
 
 			if (g_Metamod.IsLoadedAsGameDLL())
@@ -696,7 +696,7 @@ bool Command_ClientMeta(edict_t *client, IMetamodSourceCommandInfo *info)
 			}
 			else if(strcmp(subcmd, "version") == 0)
 			{
-				CLIENT_CONMSG(client, "Metamod:Source version %s\n", SVN_FULL_VERSION);
+				CLIENT_CONMSG(client, "Metamod:Source version %s\n", MMS_FULL_VERSION);
 				CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
 				CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", METAMOD_PLAPI_VERSION, PLAPI_MIN_VERSION);
 				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
diff --git a/core/provider/vsp_listener.cpp b/core/provider/vsp_listener.cpp
index 1c7ac7a..0204497 100644
--- a/core/provider/vsp_listener.cpp
+++ b/core/provider/vsp_listener.cpp
@@ -80,7 +80,7 @@ void VSPListener::GameFrame(bool simulating)
 
 const char *VSPListener::GetPluginDescription()
 {
-	return "Metamod:Source Interface " SVN_FULL_VERSION;
+	return "Metamod:Source Interface " MMS_FULL_VERSION;
 }
 
 bool VSPListener::IsLoaded()
diff --git a/core/version.h b/core/version.h
index 6482f61..e0da05a 100644
--- a/core/version.h
+++ b/core/version.h
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "-dev"
-#define MMS_BUILD_UNIQUEID   "556:b37a142ba881" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    1,7,0,0
+#define MMS_BUILD_UNIQUEID   "598:54ab41264c82" MMS_BUILD_STRING
+#define MMS_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    1,7,0,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_
 
diff --git a/core/version.rc b/core/version.rc
index 41fb316..e36eb14 100755
--- a/core/version.rc
+++ b/core/version.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION MMS_FILE_VERSION
+ PRODUCTVERSION MMS_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Metamod: Source"
             VALUE "FileDescription", "Metamod: Source"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", MMS_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", MMS_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"
diff --git a/core/version.tpl b/core/version.tpl
index 903ac50..e06da56 100644
--- a/core/version.tpl
+++ b/core/version.tpl
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "$BUILD_STRING$"
 #define MMS_BUILD_UNIQUEID   "$BUILD_ID$" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
+#define MMS_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_
 
diff --git a/core/vsp_bridge.cpp b/core/vsp_bridge.cpp
index d837812..9919633 100644
--- a/core/vsp_bridge.cpp
+++ b/core/vsp_bridge.cpp
@@ -109,7 +109,7 @@ public:
 
 	virtual const char *GetDescription()
 	{
-		return "Metamod:Source " SVN_FULL_VERSION;
+		return "Metamod:Source " MMS_FULL_VERSION;
 	}
 };
 
diff --git a/loader/version.h b/loader/version.h
index 6482f61..e0da05a 100644
--- a/loader/version.h
+++ b/loader/version.h
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "-dev"
-#define MMS_BUILD_UNIQUEID   "556:b37a142ba881" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    1,7,0,0
+#define MMS_BUILD_UNIQUEID   "598:54ab41264c82" MMS_BUILD_STRING
+#define MMS_FULL_VERSION    "1.7.0" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    1,7,0,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_
 
diff --git a/loader/version.rc b/loader/version.rc
index bc5f2c7..f31dfbc 100644
--- a/loader/version.rc
+++ b/loader/version.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION SVN_FILE_VERSION
- PRODUCTVERSION SVN_FILE_VERSION
+ FILEVERSION MMS_FILE_VERSION
+ PRODUCTVERSION MMS_FILE_VERSION
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "Metamod: Source Loader"
             VALUE "FileDescription", "Metamod: Source Loader"
-            VALUE "FileVersion", SVN_FULL_VERSION
+            VALUE "FileVersion", MMS_FULL_VERSION
             VALUE "InternalName", "mmsource"
             VALUE "LegalCopyright", "Copyright (c) 2004-2008, Metamod: Source Development Team"
             VALUE "OriginalFilename", BINARY_NAME
             VALUE "ProductName", "Metamod:Source Loader"
-            VALUE "ProductVersion", SVN_FULL_VERSION
+            VALUE "ProductVersion", MMS_FULL_VERSION
         END
     END
     BLOCK "VarFileInfo"
diff --git a/loader/version.tpl b/loader/version.tpl
index 903ac50..e06da56 100644
--- a/loader/version.tpl
+++ b/loader/version.tpl
@@ -1,12 +1,12 @@
 /** This file is autogenerated by build scripts */
 
-#ifndef _INCLUDE_SVN_VERSION_H_
-#define _INCLUDE_SVN_VERSION_H_
+#ifndef _INCLUDE_MMS_VERSION_H_
+#define _INCLUDE_MMS_VERSION_H_
 
 #define MMS_BUILD_STRING     "$BUILD_STRING$"
 #define MMS_BUILD_UNIQUEID   "$BUILD_ID$" MMS_BUILD_STRING
-#define SVN_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
-#define SVN_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
+#define MMS_FULL_VERSION    "$PMAJOR$.$PMINOR$.$PREVISION$" MMS_BUILD_STRING
+#define MMS_FILE_VERSION    $PMAJOR$,$PMINOR$,$PREVISION$,0
 
-#endif //_INCLUDE_SVN_VERSION_H_
+#endif //_INCLUDE_MMS_VERSION_H_