diff --git a/build/exe.mk b/build/exe.mk
index b283d1a7..62b546ec 100644
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -30,7 +30,7 @@ else
 endif
 NASM        = nasm
 LINK        = $(CC) $(LINKAGE)
-OBJPATH     = $(topdir)/obj
+OBJPATH     = $(topdir)/objs
 BINPATH     = $(OBJPATH)/$(BUILD)/bin
 LIBPATH     = $(OBJPATH)/$(BUILD)/lib
 DEBUG_BINPATH   = $(OBJPATH)/debug/bin
diff --git a/build/lib.mk b/build/lib.mk
index cce311eb..b4e2d02a 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -31,7 +31,7 @@ endif
 AS          = as
 NASM        = nasm
 LINK        = ar cru
-OBJPATH     = $(topdir)/obj
+OBJPATH     = $(topdir)/objs
 LIBPATH     = $(OBJPATH)/$(BUILD)/lib
 DEBUG_LIBPATH     = $(OBJPATH)/debug/lib
 RELEASE_LIBPATH   = $(OBJPATH)/release/lib
diff --git a/examples/c/decode/file/Makefile.lite b/examples/c/decode/file/Makefile.lite
index 35bfa5ca..8b723322 100644
--- a/examples/c/decode/file/Makefile.lite
+++ b/examples/c/decode/file/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_c_decode_file
 
diff --git a/examples/c/encode/file/Makefile.lite b/examples/c/encode/file/Makefile.lite
index 9def573b..37369682 100644
--- a/examples/c/encode/file/Makefile.lite
+++ b/examples/c/encode/file/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_c_encode_file
 
diff --git a/examples/cpp/decode/file/Makefile.lite b/examples/cpp/decode/file/Makefile.lite
index ccf1e638..4f88e922 100644
--- a/examples/cpp/decode/file/Makefile.lite
+++ b/examples/cpp/decode/file/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_cpp_decode_file
 
diff --git a/examples/cpp/encode/file/Makefile.lite b/examples/cpp/encode/file/Makefile.lite
index a6926b9f..a927c1b7 100644
--- a/examples/cpp/encode/file/Makefile.lite
+++ b/examples/cpp/encode/file/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_cpp_encode_file
 
diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index 0e5329fd..7051b97a 100644
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = flac
 
diff --git a/src/flac/Makefile.lite.iffscan b/src/flac/Makefile.lite.iffscan
index cfbed78e..58239948 100644
--- a/src/flac/Makefile.lite.iffscan
+++ b/src/flac/Makefile.lite.iffscan
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = iffscan
 
diff --git a/src/libFLAC++/Makefile.lite b/src/libFLAC++/Makefile.lite
index 209cf740..edbec13a 100644
--- a/src/libFLAC++/Makefile.lite
+++ b/src/libFLAC++/Makefile.lite
@@ -33,7 +33,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 ifeq ($(OS),Darwin)
     EXPLICIT_LIBS = $(libdir)/libFLAC.a $(OGG_EXPLICIT_LIBS) -lm -lstdc++
diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
index 8588d889..ce8a3eef 100644
--- a/src/metaflac/Makefile.lite
+++ b/src/metaflac/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = metaflac
 
diff --git a/src/plugin_xmms/Makefile.lite b/src/plugin_xmms/Makefile.lite
index aff628e3..f4b7e5cd 100644
--- a/src/plugin_xmms/Makefile.lite
+++ b/src/plugin_xmms/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 LIB_NAME  = libxmms-flac
 INCLUDES  = -I./include -I$(topdir)/include -I.. $(shell xmms-config --cflags)
diff --git a/src/share/grabbag/Makefile.lite b/src/share/grabbag/Makefile.lite
index 9fdbdccb..81f7d5c5 100644
--- a/src/share/grabbag/Makefile.lite
+++ b/src/share/grabbag/Makefile.lite
@@ -3,7 +3,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 ifeq ($(OS),Darwin)
     EXPLICIT_LIBS = $(libdir)/libFLAC.a $(libdir)/libreplaygain_analysis.a $(OGG_EXPLICIT_LIBS) -lm
diff --git a/src/share/utf8/Makefile.lite b/src/share/utf8/Makefile.lite
index f090278e..91417353 100644
--- a/src/share/utf8/Makefile.lite
+++ b/src/share/utf8/Makefile.lite
@@ -3,7 +3,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 LIB_NAME = libutf8
 
diff --git a/src/test_grabbag/cuesheet/Makefile.lite b/src/test_grabbag/cuesheet/Makefile.lite
index ae3379b9..111992ee 100644
--- a/src/test_grabbag/cuesheet/Makefile.lite
+++ b/src/test_grabbag/cuesheet/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_cuesheet
 
diff --git a/src/test_grabbag/picture/Makefile.lite b/src/test_grabbag/picture/Makefile.lite
index 4b186a83..0352a537 100644
--- a/src/test_grabbag/picture/Makefile.lite
+++ b/src/test_grabbag/picture/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_picture
 
diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite
index b9ea28f2..6e33a71d 100644
--- a/src/test_libFLAC++/Makefile.lite
+++ b/src/test_libFLAC++/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_libFLAC++
 
diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite
index d2494e56..8cc98843 100644
--- a/src/test_libFLAC/Makefile.lite
+++ b/src/test_libFLAC/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_libFLAC
 
diff --git a/src/test_libs_common/Makefile.lite b/src/test_libs_common/Makefile.lite
index 772422a6..5a047544 100644
--- a/src/test_libs_common/Makefile.lite
+++ b/src/test_libs_common/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 LIB_NAME = libtest_libs_common
 
diff --git a/src/test_seeking/Makefile.lite b/src/test_seeking/Makefile.lite
index 8b9f2dad..9ff78ac9 100644
--- a/src/test_seeking/Makefile.lite
+++ b/src/test_seeking/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_seeking
 
diff --git a/src/test_streams/Makefile.lite b/src/test_streams/Makefile.lite
index 44ea3d5d..b88119a8 100644
--- a/src/test_streams/Makefile.lite
+++ b/src/test_streams/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_streams
 
diff --git a/src/utils/flacdiff/Makefile.lite b/src/utils/flacdiff/Makefile.lite
index bbc891bf..2b4b3cd9 100644
--- a/src/utils/flacdiff/Makefile.lite
+++ b/src/utils/flacdiff/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = flacdiff
 
diff --git a/src/utils/flactimer/Makefile.lite b/src/utils/flactimer/Makefile.lite
index 94fb8058..26159fba 100644
--- a/src/utils/flactimer/Makefile.lite
+++ b/src/utils/flactimer/Makefile.lite
@@ -20,7 +20,7 @@
 #
 
 topdir = ../../..
-libdir = $(topdir)/obj/$(BUILD)/lib
+libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = flactimer
 
diff --git a/test/test_bins.sh b/test/test_bins.sh
index 9b1fa0f5..65ba6e20 100755
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -35,12 +35,12 @@ LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_==$(($RANDOM % 255 + 1))
 PATH=../src/flac:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 BINS_PATH=../../test_files/bins
 
 if [ x"$FLAC__TEST_LEVEL" = x ] ; then
diff --git a/test/test_compression.sh b/test/test_compression.sh
index 6507a448..ed2302b6 100755
--- a/test/test_compression.sh
+++ b/test/test_compression.sh
@@ -23,7 +23,7 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 PATH=`pwd`/../src/flac:$PATH
 
diff --git a/test/test_flac.sh b/test/test_flac.sh
index 7e4a8fd2..10981c0b 100755
--- a/test/test_flac.sh
+++ b/test/test_flac.sh
@@ -49,14 +49,14 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 PATH=`pwd`/../src/flac:$PATH
 PATH=`pwd`/../src/metaflac:$PATH
 PATH=`pwd`/../src/test_streams:$PATH
-PATH=`pwd`/../obj/$BUILD/bin:$PATH
+PATH=`pwd`/../objs/$BUILD/bin:$PATH
 
 flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
 
diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh
index 8f1c5c98..5d9f9d1c 100755
--- a/test/test_grabbag.sh
+++ b/test/test_grabbag.sh
@@ -32,13 +32,13 @@ fi
 LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 PATH=../src/test_grabbag/cuesheet:$PATH
 PATH=../src/test_grabbag/picture:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable"
 test_picture -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_picture executable"
diff --git a/test/test_libFLAC++.sh b/test/test_libFLAC++.sh
index 54205977..419512ea 100755
--- a/test/test_libFLAC++.sh
+++ b/test/test_libFLAC++.sh
@@ -33,12 +33,12 @@ LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
 PATH=../src/test_libFLAC++:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 run_test_libFLACpp ()
 {
diff --git a/test/test_libFLAC.sh b/test/test_libFLAC.sh
index 990ad77c..50f77434 100755
--- a/test/test_libFLAC.sh
+++ b/test/test_libFLAC.sh
@@ -32,13 +32,13 @@ fi
 LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
 
 PATH=../src/test_libFLAC:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 run_test_libFLAC ()
 {
diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh
index 3cc9a8e2..4cf5823e 100755
--- a/test/test_metaflac.sh
+++ b/test/test_metaflac.sh
@@ -44,13 +44,13 @@ LD_LIBRARY_PATH=`pwd`/../src/share/getopt/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH
 LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=`pwd`/../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 PATH=`pwd`/../src/flac:$PATH
 PATH=`pwd`/../src/metaflac:$PATH
-PATH=`pwd`/../obj/$BUILD/bin:$PATH
+PATH=`pwd`/../objs/$BUILD/bin:$PATH
 
 if echo a | (grep -E '(a|b)') >/dev/null 2>&1
 	then EGREP='grep -E'
diff --git a/test/test_seeking.sh b/test/test_seeking.sh
index 14c7c2eb..653c1526 100755
--- a/test/test_seeking.sh
+++ b/test/test_seeking.sh
@@ -30,7 +30,7 @@ else
 fi
 
 LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
@@ -38,7 +38,7 @@ PATH=../src/flac:$PATH
 PATH=../src/metaflac:$PATH
 PATH=../src/test_seeking:$PATH
 PATH=../src/test_streams:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 if [ x"$FLAC__TEST_LEVEL" = x ] ; then
 	FLAC__TEST_LEVEL=1
diff --git a/test/test_streams.sh b/test/test_streams.sh
index aa135115..8fb609f1 100755
--- a/test/test_streams.sh
+++ b/test/test_streams.sh
@@ -29,13 +29,13 @@ else
 	BUILD="$1"
 fi
 
-LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$((RANDOM % 255 + 1))
 PATH=../src/flac:$PATH
 PATH=../src/test_streams:$PATH
-PATH=../obj/$BUILD/bin:$PATH
+PATH=../objs/$BUILD/bin:$PATH
 
 if [ x"$FLAC__TEST_LEVEL" = x ] ; then
 	FLAC__TEST_LEVEL=1