diff --git a/lib/linux64/mathlib_i486.a b/lib/linux64/mathlib.a
similarity index 100%
rename from lib/linux64/mathlib_i486.a
rename to lib/linux64/mathlib.a
diff --git a/lib/linux64/tier1.a b/lib/linux64/tier1.a
index 5ce3b781..e5ef850f 100644
Binary files a/lib/linux64/tier1.a and b/lib/linux64/tier1.a differ
diff --git a/lib/linux64/tier1_i486.a b/lib/linux64/tier1_i486.a
deleted file mode 100644
index e5ef850f..00000000
Binary files a/lib/linux64/tier1_i486.a and /dev/null differ
diff --git a/linux_sdk/Makefile b/linux_sdk/Makefile
index 31ee0388..4b2f77d4 100644
--- a/linux_sdk/Makefile
+++ b/linux_sdk/Makefile
@@ -38,7 +38,7 @@ endif
 USER_CFLAGS =
 
 # link flags for your mod, make sure to include any special libraries here
-LDFLAGS = "-lm -ldl $(LIB_DIR)/particles_i486.a $(LIB_DIR)/dmxloader_i486.a $(LIB_DIR)/mathlib_i486.a tier0_i486.so vstdlib_i486.so $(LIB_DIR)/tier1_i486.a $(LIB_DIR)/tier2_i486.a $(LIB_DIR)/tier3_i486.a $(LIB_DIR)/choreoobjects_i486.a steam_api_i486.so"
+LDFLAGS = "-lm -ldl $(LIB_DIR)/particles.a $(LIB_DIR)/dmxloader.a $(LIB_DIR)/mathlib.a libtier0.so libvstdlib.so $(LIB_DIR)/tier1.a $(LIB_DIR)/tier2.a $(LIB_DIR)/tier3.a $(LIB_DIR)/choreoobjects.a libsteam_api64.so"
 
 # XERCES 2.6.0 or above ( http://xml.apache.org/xerces-c/ ) is used by the vcproj to makefile converter
 # it must be installed before being able to run this makefile
@@ -147,12 +147,12 @@ check:
 	if [ -z "$(CC)" ]; then echo "Compiler not defined."; exit; fi
 	if [ ! -d $(BUILD_DIR) ];then mkdir -p $(BUILD_DIR);fi
 	cd $(BUILD_DIR)
-	if [ ! -e "$(LIB_DIR)/tier1_i486.a" ]; then $(MAKE) tier1;fi
-	if [ ! -e "$(LIB_DIR)/mathlib_i486.a" ]; then $(MAKE) mathlib;fi
-	if [ ! -e "$(LIB_DIR)/interfaces_i486.a" ]; then $(MAKE) interfaces;fi
+	if [ ! -e "$(LIB_DIR)/tier1.a" ]; then $(MAKE) tier1;fi
+	if [ ! -e "$(LIB_DIR)/mathlib.a" ]; then $(MAKE) mathlib;fi
+	if [ ! -e "$(LIB_DIR)/interfaces.a" ]; then $(MAKE) interfaces;fi
 	if [ ! -f "libtier0$(SHLIBSUFFIX).$(SHLIBEXT)" ]; then ln -fs $(LIB_DIR)/libtier0$(SHLIBSUFFIX).$(SHLIBEXT) .; fi
 	if [ ! -f "libvstdlib$(SHLIBSUFFIX).$(SHLIBEXT)" ]; then ln -fs $(LIB_DIR)/libvstdlib$(SHLIBSUFFIX).$(SHLIBEXT) .; fi
-	if [ ! -f "libsteam_api.$(SHLIBEXT)" ]; then ln -fs $(LIB_DIR)/libsteam_api.$(SHLIBEXT) .; fi
+	if [ ! -f "libsteam_api64.$(SHLIBEXT)" ]; then ln -fs $(LIB_DIR)/libsteam64_api.$(SHLIBEXT) .; fi
 
 vcpm: check
 	if [ ! -e "vcpm" ]; then $(MAKE) -f $(MAKE_VCPM) $(BASE_DEFINES);fi
@@ -180,11 +180,11 @@ choreo:
 	$(MAKE) -f $(MAKE_CHOREO) $(BASE_DEFINES)
 
 install:
-	cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME)_$(ARCH).$(SHLIBEXT)
+	cp -f $(NAME).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME).$(SHLIBEXT)
 
 installrelease:
-	cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME)_$(ARCH).$(SHLIBEXT)
-	strip $(GAME_DIR)/bin/$(NAME)_$(ARCH).$(SHLIBEXT)
+	cp -f $(NAME).$(SHLIBEXT) $(GAME_DIR)/bin/$(NAME).$(SHLIBEXT)
+	strip $(GAME_DIR)/bin/$(NAME).$(SHLIBEXT)
 
 clean:
 	$(MAKE) -f $(MAKE_VCPM) $(BASE_DEFINES) clean
diff --git a/linux_sdk/Makefile.interfaces b/linux_sdk/Makefile.interfaces
index b3753b6f..c7d0f653 100644
--- a/linux_sdk/Makefile.interfaces
+++ b/linux_sdk/Makefile.interfaces
@@ -9,7 +9,7 @@ PUBLIC_SRC_DIR = $(SRC_DIR)/public
 TIER0_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier0
 TIER1_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier1
 
-LIB_OBJ_DIR=$(BUILD_OBJ_DIR)/$(NAME)_$(ARCH)
+LIB_OBJ_DIR=$(BUILD_OBJ_DIR)/$(NAME)
 
 # Extension of linux static library
 override SHLIBEXT = a
@@ -31,20 +31,20 @@ DO_CC += -o $@ -c $<
 LIB_OBJS= \
 	$(LIB_OBJ_DIR)/interfaces.o \
 
-all: dirs $(NAME)_$(ARCH).$(SHLIBEXT)
+all: dirs $(NAME).$(SHLIBEXT)
 
 dirs:
 	-mkdir -p $(BUILD_OBJ_DIR)
 	-mkdir -p $(LIB_OBJ_DIR)
 
-$(NAME)_$(ARCH).$(SHLIBEXT): $(LIB_OBJS)
+$(NAME).$(SHLIBEXT): $(LIB_OBJS)
 	$(AR) $(LIB_DIR)/$@ $(LIB_OBJS)
 
 $(LIB_OBJ_DIR)/%.o: $(LIB_SRC_DIR)/%.cpp
 	$(DO_CC)
 
 install:
-	cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(LIB_DIR)/$(NAME)_$(ARCH).$(SHLIBEXT)
+	cp -f $(NAME).$(SHLIBEXT) $(LIB_DIR)/$(NAME).$(SHLIBEXT)
 
 clean:
 	-rm -rf $(LIB_OBJ_DIR)
diff --git a/linux_sdk/Makefile.mathlib b/linux_sdk/Makefile.mathlib
index 638c4df6..d1ff360a 100644
--- a/linux_sdk/Makefile.mathlib
+++ b/linux_sdk/Makefile.mathlib
@@ -10,7 +10,7 @@ TIER0_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier0
 TIER1_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier1
 MATHLIB_PUBLIC_SRC_DIR = $(SRC_DIR)/public/mathlib
 
-LIB_OBJ_DIR = $(BUILD_OBJ_DIR)/$(NAME)_$(ARCH)
+LIB_OBJ_DIR = $(BUILD_OBJ_DIR)/$(NAME)
 
 # Extension of linux static library
 override SHLIBEXT = a
@@ -50,20 +50,20 @@ LIB_OBJS= \
 	$(LIB_OBJ_DIR)/vector.o \
 	$(LIB_OBJ_DIR)/vmatrix.o \
 
-all: dirs $(NAME)_$(ARCH).$(SHLIBEXT)
+all: dirs $(NAME).$(SHLIBEXT)
 
 dirs:
 	-mkdir -p $(BUILD_OBJ_DIR)
 	-mkdir -p $(LIB_OBJ_DIR)
 
-$(NAME)_$(ARCH).$(SHLIBEXT): $(LIB_OBJS)
+$(NAME).$(SHLIBEXT): $(LIB_OBJS)
 	$(AR) $(LIB_DIR)/$@ $(LIB_OBJS)
 
 $(LIB_OBJ_DIR)/%.o: $(LIB_SRC_DIR)/%.cpp
 	$(DO_CC)
 
 install:
-	cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(LIB_DIR)/$(NAME)_$(ARCH).$(SHLIBEXT)
+	cp -f $(NAME).$(SHLIBEXT) $(LIB_DIR)/$(NAME).$(SHLIBEXT)
 
 clean:
 	-rm -rf $(LIB_OBJ_DIR)
diff --git a/linux_sdk/Makefile.tier1 b/linux_sdk/Makefile.tier1
index 1b451ce7..ea80d859 100644
--- a/linux_sdk/Makefile.tier1
+++ b/linux_sdk/Makefile.tier1
@@ -9,7 +9,7 @@ PUBLIC_SRC_DIR = $(SRC_DIR)/public
 TIER0_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier0
 TIER1_PUBLIC_SRC_DIR = $(SRC_DIR)/public/tier1
 
-LIB_OBJ_DIR=$(BUILD_OBJ_DIR)/$(NAME)_$(ARCH)
+LIB_OBJ_DIR=$(BUILD_OBJ_DIR)/$(NAME)
 
 # Extension of linux static library
 override SHLIBEXT = a
@@ -57,20 +57,20 @@ LIB_OBJS= \
 	$(LIB_OBJ_DIR)/utlstring.o \
 	$(LIB_OBJ_DIR)/utlsymbol.o \
 
-all: dirs $(NAME)_$(ARCH).$(SHLIBEXT)
+all: dirs $(NAME).$(SHLIBEXT)
 
 dirs:
 	-mkdir -p $(BUILD_OBJ_DIR)
 	-mkdir -p $(LIB_OBJ_DIR)
 
-$(NAME)_$(ARCH).$(SHLIBEXT): $(LIB_OBJS)
+$(NAME).$(SHLIBEXT): $(LIB_OBJS)
 	$(AR) $(LIB_DIR)/$@ $(LIB_OBJS)
 
 $(LIB_OBJ_DIR)/%.o: $(LIB_SRC_DIR)/%.cpp
 	$(DO_CC)
 
 install:
-	cp -f $(NAME)_$(ARCH).$(SHLIBEXT) $(LIB_DIR)/$(NAME)_$(ARCH).$(SHLIBEXT)
+	cp -f $(NAME).$(SHLIBEXT) $(LIB_DIR)/$(NAME).$(SHLIBEXT)
 
 clean:
 	-rm -rf $(LIB_OBJ_DIR)