diff --git a/.gitignore b/.gitignore
index daad1f8..274f172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.tar.gz
 a53
 CommonLibs
+NodeManager
 openbts
 RRLP
 smqueue
diff --git a/clone.sh b/clone.sh
index 1b9c49e..ed9a9fe 100755
--- a/clone.sh
+++ b/clone.sh
@@ -26,7 +26,7 @@ sayAndDo () {
 	fi
 }
 
-for component in a53 CommonLibs openbts RRLP smqueue sqlite3 subscriberRegistry
+for component in a53 CommonLibs NodeManager openbts RRLP smqueue sqlite3 subscriberRegistry
 do
 	if [ ! -d $component ]; then
 		echo "# cloning $component"
diff --git a/pull.sh b/pull.sh
index fd6d403..051b030 100755
--- a/pull.sh
+++ b/pull.sh
@@ -26,7 +26,7 @@ sayAndDo () {
 	fi
 }
 
-for component in a53 CommonLibs openbts RRLP smqueue sqlite3 subscriberRegistry
+for component in a53 CommonLibs NodeManager openbts RRLP smqueue sqlite3 subscriberRegistry
 do
 	if [ -d $component ]; then
 		echo "# pulling $component"
diff --git a/rename.sh b/rename.sh
index c224b21..9274fdf 100755
--- a/rename.sh
+++ b/rename.sh
@@ -88,12 +88,12 @@ if [ $ANSWER == "yes" ]; then
 		BOOKMARK=`git rev-parse --abbrev-ref HEAD`
 		echo "# - saving bookmark for current workspace branch..."
 		echo "# - renaming..."
-		sayAndDo git checkout -b $OLDNAME --track origin/$OLDNAME
 		sayAndDo git branch -m $OLDNAME $NEWNAME
 		echo "# - pushing to origin..."
 		sayAndDo git push origin --delete $OLDNAME
 		sayAndDo git push origin $NEWNAME
 		sayAndDo git branch -D $NEWNAME
+		sayAndDo git checkout -b $NEWNAME --track origin/$NEWNAME
 		echo "# - restoring workspace branch..."
 		sayAndDo git checkout $BOOKMARK
 	fi
diff --git a/state.sh b/state.sh
index 23415ad..b282fa1 100755
--- a/state.sh
+++ b/state.sh
@@ -41,7 +41,7 @@ else
 	usage
 fi
 
-for component in a53 CommonLibs openbts RRLP smqueue sqlite3 subscriberRegistry
+for component in a53 CommonLibs NodeManager openbts RRLP smqueue sqlite3 subscriberRegistry
 do
 	if [ -d $component ]; then
 		echo "########################################################################"
diff --git a/switchto.sh b/switchto.sh
index ec99f32..70344a1 100755
--- a/switchto.sh
+++ b/switchto.sh
@@ -35,7 +35,7 @@ if [ -z "$1" ]; then
 	usage
 fi
 
-for component in a53 CommonLibs openbts RRLP smqueue sqlite3 subscriberRegistry
+for component in a53 CommonLibs NodeManager openbts RRLP smqueue sqlite3 subscriberRegistry
 do
 	if [ -d $component ]; then
 		echo "########################################################################"