diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 47a5391..56fb791 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -52,7 +52,7 @@ IMAGE_LINGUAS ?= '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)
 
 
 # set feed path variables
-FEED_BASEPATH = "feeds/core/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/core/${ANGSTROM_PKG_FORMAT}/${TCLIBC}/"
 
 # Uncomment this to fetch packaged-staging packages from the central angstrom server
 #PSTAGE_MIRROR = "${ANGSTROM_URI}/${FEED_BASEPATH}packaged-staging"
diff --git a/conf/distro/include/angstrom-core-tweaks.inc b/conf/distro/include/angstrom-core-tweaks.inc
index 1d17c6d..c6c5b70 100644
--- a/conf/distro/include/angstrom-core-tweaks.inc
+++ b/conf/distro/include/angstrom-core-tweaks.inc
@@ -13,9 +13,9 @@ TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/bin/${BASE_PACKAGE_ARCH
 TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
 
 # Angstrom cares for uclibc and eglibc
-STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}-${ANGSTROMLIBC}"
-STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}-${ANGSTROMLIBC}"
-SSTATE_MANIFESTS = "${TMPDIR}/sstate-control-${ANGSTROMLIBC}"
+STAGING_DIR_TARGET = "${STAGING_DIR}/${MACHINE}-${TCLIBC}"
+STAGING_DIR_HOST = "${STAGING_DIR}/${MACHINE}-${TCLIBC}"
+SSTATE_MANIFESTS = "${TMPDIR}/sstate-control-${TCLIBC}"
 # Image.bbclass stuff:
 
 #
@@ -50,5 +50,5 @@ IMAGE_INSTALL += "${IMAGE_BOOT}"
 
 
 # SDK stuff
-SDK_NAME = "${DISTRO}-${DISTRO_VERSION}-${SDK_ARCH}-${BASE_PACKAGE_ARCH}-${TARGET_OS}-${ANGSTROMLIBC}"
+SDK_NAME = "${DISTRO}-${DISTRO_VERSION}-${SDK_ARCH}-${BASE_PACKAGE_ARCH}-${TARGET_OS}-${TCLIBC}"
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 2037f17..76b75bd 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -26,26 +26,26 @@ OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}"
 SRC_DIST_LOCAL ?= "symlink"
 
 # Can be "glibc", "eglibc" or "uclibc"
-ANGSTROMLIBC ?= "eglibc"
-LIBC ?= "${ANGSTROMLIBC}"
-PSTAGE_EXTRAPATH = "${LIBC}"
+TCLIBC ?= "eglibc"
+TCLIBC ?= "${TCLIBC}"
+PSTAGE_EXTRAPATH = "${TCLIBC}"
 
-CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}"
-DEPLOY_DIR = "${TMPDIR}/deploy/${LIBC}"
+CACHE = "${TMPDIR}/cache/${TCLIBC}/${MACHINE}"
+DEPLOY_DIR = "${TMPDIR}/deploy/${TCLIBC}"
 
 # The things *libc can provide.
-PREFERRED_PROVIDER_virtual/libc = "${ANGSTROMLIBC}"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${ANGSTROMLIBC}-initial"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${ANGSTROMLIBC}"
+PREFERRED_PROVIDER_virtual/libc = "${TCLIBC}"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}"
 
 # And the same as above for the nativesdk
-PREFERRED_PROVIDER_virtual/libc-nativesdk = "${ANGSTROMLIBC}-nativesdk"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${ANGSTROMLIBC}-initial-nativesdk"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${ANGSTROMLIBC}-nativesdk"
+PREFERRED_PROVIDER_virtual/libc-nativesdk = "${TCLIBC}-nativesdk"
+PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-initial-nativesdk = "${TCLIBC}-initial-nativesdk"
+PREFERRED_PROVIDER_virtual/${SDK_PREFIX}libc-for-gcc-nativesdk = "${TCLIBC}-nativesdk"
 
 PREFERRED_PROVIDER_linux-libc-headers-nativesdk = "linux-libc-headers-nativesdk"
 
-require conf/distro/include/angstrom-${LIBC}.inc
+require conf/distro/include/angstrom-${TCLIBC}.inc
 
 # Set some java bits
 require conf/distro/include/angstrom-java.inc
@@ -170,7 +170,7 @@ FEED_ARCH ?= "${BASE_PACKAGE_ARCH}"
 FEED_ARCH_bfin          = "blackfin"
 
 #Name the generated images in a sane way
-IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${TCLIBC}-${ANGSTROM_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
@@ -182,7 +182,7 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi
 # in their local.conf 
 
 #Name of the client
-TINDER_MACHINE  = "${MACHINE}-${LIBC}-build-image"
+TINDER_MACHINE  = "${MACHINE}-${TCLIBC}-build-image"
 
 # Which lof file to write to, which tree to report to
 TINDER_LOG        = "${TMPDIR}/tinder.log"
diff --git a/contrib/build-feeds.sh b/contrib/build-feeds.sh
index 89df1ed..a81b452 100755
--- a/contrib/build-feeds.sh
+++ b/contrib/build-feeds.sh
@@ -25,12 +25,12 @@ do_build() {
                 
                 if [ "$BUILD_CLEAN" != "" ]
                 then
-                        ANGSTROMLIBC=uclibc MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN
+                        TCLIBC=uclibc MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN
                 fi
                 
                 for target in $BUILD_TARGETS
                 do
-                        ANGSTROMLIBC=uclibc MACHINE=$BUILD_MACHINE bitbake $target && do_report_success
+                        TCLIBC=uclibc MACHINE=$BUILD_MACHINE bitbake $target && do_report_success
                 done
         fi
 }
diff --git a/contrib/build-release.sh b/contrib/build-release.sh
index a4a2626..1f3c65a 100755
--- a/contrib/build-release.sh
+++ b/contrib/build-release.sh
@@ -6,7 +6,7 @@ do_build() {
         if [ $DO_UCLIBC = 1 ]
         then
                 BUILD_MODE="uclibc"
-                echo 'ANGSTROMLIBC = "uclibc"' > conf/auto.conf
+                echo 'TCLIBC = "uclibc"' > conf/auto.conf
 
                 if [ "$BUILD_CLEAN" != "" ]
                 then
@@ -20,7 +20,7 @@ do_build() {
         fi
 
 	BUILD_MODE="glibc"
-        echo 'ANGSTROMLIBC = "glibc"' > conf/auto.conf
+        echo 'TCLIBC = "glibc"' > conf/auto.conf
 
 	if [ "$BUILD_CLEAN" != "" ]
 	then