diff --git a/Dockerfile b/Dockerfile
index dfbd0e8c..369df465 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -155,14 +155,14 @@ RUN cd /opt/mock_overlay && \
     make install
 
 #  ENV setup
-RUN echo "# Load stx-builder configuration" >> /etc/profile.d/TC.sh && \
-    echo "if [[ -r \${HOME}/buildrc ]]; then" >> /etc/profile.d/TC.sh && \
-    echo "    source \${HOME}/buildrc" >> /etc/profile.d/TC.sh && \
-    echo "    export PROJECT SRC_BUILD_ENVIRONMENT MYPROJECTNAME MYUNAME" >> /etc/profile.d/TC.sh && \
-    echo "    export MY_BUILD_CFG MY_BUILD_CFG_RT MY_BUILD_CFG_STD MY_BUILD_DIR MY_BUILD_ENVIRONMENT MY_BUILD_ENVIRONMENT_FILE MY_BUILD_ENVIRONMENT_FILE_RT MY_BUILD_ENVIRONMENT_FILE_STD MY_DEBUG_BUILD_CFG_RT MY_DEBUG_BUILD_CFG_STD MY_LOCAL_DISK MY_MOCK_ROOT MY_REPO MY_REPO_ROOT_DIR MY_SRC_RPM_BUILD_DIR MY_TC_RELEASE MY_WORKSPACE LAYER" >> /etc/profile.d/TC.sh && \
-    echo "fi" >> /etc/profile.d/TC.sh && \
-    echo "export FORMAL_BUILD=0" >> /etc/profile.d/TC.sh && \
-    echo "export PATH=\$MY_REPO/build-tools:\$PATH" >> /etc/profile.d/TC.sh
+RUN echo "# Load stx-builder configuration" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "if [[ -r \${HOME}/buildrc ]]; then" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "    source \${HOME}/buildrc" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "    export PROJECT SRC_BUILD_ENVIRONMENT MYPROJECTNAME MYUNAME" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "    export MY_BUILD_CFG MY_BUILD_CFG_RT MY_BUILD_CFG_STD MY_BUILD_DIR MY_BUILD_ENVIRONMENT MY_BUILD_ENVIRONMENT_FILE MY_BUILD_ENVIRONMENT_FILE_RT MY_BUILD_ENVIRONMENT_FILE_STD MY_DEBUG_BUILD_CFG_RT MY_DEBUG_BUILD_CFG_STD MY_LOCAL_DISK MY_MOCK_ROOT MY_REPO MY_REPO_ROOT_DIR MY_SRC_RPM_BUILD_DIR MY_RELEASE MY_WORKSPACE LAYER" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "fi" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "export FORMAL_BUILD=0" >> /etc/profile.d/stx-builder-conf.sh && \
+    echo "export PATH=\$MY_REPO/build-tools:\$PATH" >> /etc/profile.d/stx-builder-conf.sh
 
 # centos locales are broken. this needs to be run after the last yum install/update
 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
diff --git a/buildrc b/buildrc
index 82cc23fc..e1e0631b 100644
--- a/buildrc
+++ b/buildrc
@@ -1,4 +1,4 @@
-# Common configuration for TC tbuilder
+# Common configuration for StarlingX builder
 
 [[ -z "$_BUILDRC" ]] || return 0
 declare -r -g _BUILDRC=1
@@ -49,8 +49,8 @@ GUEST_LOCALDISK=${GUEST_LOCALDISK%/}
 LOCALDISK=${HOST_PREFIX}/${GUEST_LOCALDISK}
 
 
-# TC vars
-export MY_TC_RELEASE=${MY_TC_RELEASE:-tis-r5-pike}
+# Release Variable
+export MY_RELEASE=${MY_RELEASE:-3.0}
 
 # Default branch to build
 export BRANCH=${BRANCH:-intel_r0}
@@ -62,7 +62,7 @@ export PROJECT=${PROJECT:-test}
 export MYUNAME=${MYUNAME:-builder}
 export MYPROJECTNAME=${PROJECT:-frog1}
 
-export SRC_BUILD_ENVIRONMENT=${SRC_BUILD_ENVIRONMENT:-$MY_TC_RELEASE}
+export SRC_BUILD_ENVIRONMENT=${SRC_BUILD_ENVIRONMENT:-$MY_RELEASE}
 
 # All of the below are dependent on variables defined earlier, right now
 # we are not going to support directly setting them in localrc
@@ -83,4 +83,4 @@ export MY_MOCK_ROOT=$MY_WORKSPACE/mock/root
 export MY_DEBUG_BUILD_CFG_STD=${MY_WORKSPACE}/std/configs/${MY_BUILD_ENVIRONMENT}-std/${MY_BUILD_ENVIRONMENT}-std.b0.cfg
 export MY_DEBUG_BUILD_CFG_RT=${MY_WORKSPACE}/std/configs/${MY_BUILD_ENVIRONMENT}-std/${MY_BUILD_ENVIRONMENT}-rt.b0.cfg
 export LAYER=$LAYER
-export STX_CONFIG_DIR="$STX_CONFIG_DIR"
\ No newline at end of file
+export STX_CONFIG_DIR="$STX_CONFIG_DIR"
diff --git a/tb.sh b/tb.sh
index 24405848..1bb73148 100755
--- a/tb.sh
+++ b/tb.sh
@@ -87,7 +87,7 @@ case $CMD in
         echo "SOURCE_REMOTE_NAME=${SOURCE_REMOTE_NAME}"
         echo "SOURCE_REMOTE_URI=${SOURCE_REMOTE_URI}"
         echo "HOST_MIRROR_DIR=${HOST_MIRROR_DIR}"
-        echo "MY_TC_RELEASE=${MY_TC_RELEASE}"
+        echo "MY_RELEASE=${MY_RELEASE}"
         echo "MY_REPO_ROOT_DIR=${MY_REPO_ROOT_DIR}"
         echo "LAYER=${LAYER}"
         ;;
diff --git a/toCOPY/finishSetup.sh b/toCOPY/finishSetup.sh
index 75072080..82826c5e 100755
--- a/toCOPY/finishSetup.sh
+++ b/toCOPY/finishSetup.sh
@@ -33,7 +33,7 @@ sudo chown root:mock /localdisk/loadbuild/mock-cache
 # 78  mkdir -p $MY_WORKSPACE/rt/rpmbuild/RPMS
 
 # make the place we will clone into
-. /etc/profile.d/TC.sh
+. /etc/profile.d/stx-builder-conf.sh
 echo "MY_REPO=$MY_REPO"
 mkdir -p $MY_REPO
 mkdir -p $MY_WORKSPACE