diff --git a/core/Makefile b/core/Makefile
index d6f26bc..979a359 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -37,7 +37,7 @@ ifeq "$(ENGINE)" "orangebox"
 	HL2LIB = $(HL2SDK_OB)/lib/linux
 	INCLUDE += -I$(HL2SDK_OB)/public/game/server
 	SRCDS = $(SRCDS_BASE)/orangebox
-	BINARY = metamodsource.2.so
+	BINARY = metamod.2.ep2.so
 	override ENGSET = true
 endif
 ifeq "$(ENGINE)" "left4dead"
@@ -46,7 +46,7 @@ ifeq "$(ENGINE)" "left4dead"
 	HL2LIB = $(HL2SDK_L4D)/lib/linux
 	INCLUDE += -I$(HL2SDK_L4D)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d_demo
-	BINARY = metamodsource.3.so
+	BINARY = metamod2.l4d.so
 	override ENGSET = true
 endif
 
diff --git a/core/provider/msvc8/sourcemm.sln b/core/msvc8/sourcemm.sln
similarity index 100%
rename from core/provider/msvc8/sourcemm.sln
rename to core/msvc8/sourcemm.sln
diff --git a/core/provider/msvc8/sourcemm.vcproj b/core/msvc8/sourcemm.vcproj
similarity index 100%
rename from core/provider/msvc8/sourcemm.vcproj
rename to core/msvc8/sourcemm.vcproj
diff --git a/core/provider/msvc9/sourcemm.sln b/core/msvc9/sourcemm.sln
similarity index 100%
rename from core/provider/msvc9/sourcemm.sln
rename to core/msvc9/sourcemm.sln
diff --git a/core/provider/msvc9/sourcemm.vcproj b/core/msvc9/sourcemm.vcproj
similarity index 100%
rename from core/provider/msvc9/sourcemm.vcproj
rename to core/msvc9/sourcemm.vcproj