diff --git a/metadata/at.fhhgb.mc.swip.txt b/metadata/at.fhhgb.mc.swip.txt
index d133f91fed..62d20da29d 100644
--- a/metadata/at.fhhgb.mc.swip.txt
+++ b/metadata/at.fhhgb.mc.swip.txt
@@ -40,7 +40,7 @@ Build:0.2.6,7
     subdir=src
     target=android-19
     extlibs=android/android-support-v4.jar
-    srclibs=RootTools@2.6
+    srclibs=RootToolsSvn@2.6
     prebuild=rm -fR ../libs; rm libs/*;
 
 Auto Update Mode:None
diff --git a/metadata/be.ppareit.shutdown.txt b/metadata/be.ppareit.shutdown.txt
index ec94279cc4..58fe93e3db 100644
--- a/metadata/be.ppareit.shutdown.txt
+++ b/metadata/be.ppareit.shutdown.txt
@@ -16,8 +16,8 @@ Repo:https://github.com/ppareit/Shutdown.git
 
 Build:1.2,10200
     commit=v1.2
-    srclibs=RootTools@2.6
-    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties
+    srclibs=RootToolsSvn@2.6
+    prebuild=echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/com.asksven.betterbatterystats.txt b/metadata/com.asksven.betterbatterystats.txt
index 2830f32966..8e9603b4a8 100644
--- a/metadata/com.asksven.betterbatterystats.txt
+++ b/metadata/com.asksven.betterbatterystats.txt
@@ -70,14 +70,14 @@ Build:1.15.0.0_RC8,43
     commit=v1.15.0.0_RC8
     subdir=BetterBatteryStats
     rm=BetterBatteryStats/libs/libGoogleAnalytics.jar,BetterBatteryStats/src/com/asksven/betterbatterystats/localeplugin
-    srclibs=RootTools@2.6,1:Common-AskSven@4d805,3:ActionBarSherlock@4.4.0,2:NoAnalytics@a63142b59
+    srclibs=RootToolsSvn@2.6,1:Common-AskSven@4d805,3:ActionBarSherlock@4.4.0,2:NoAnalytics@a63142b59
     prebuild=sed -i '115,127d' AndroidManifest.xml
 
 Build:1.15.0.0,44
     commit=480c0d217ee
     subdir=BetterBatteryStats
     rm=BetterBatteryStats/libs/libGoogleAnalytics.jar,BetterBatteryStats/src/com/asksven/betterbatterystats/localeplugin
-    srclibs=RootTools@2.6,1:Common-AskSven@4d805,3:ActionBarSherlock@4.4.0,2:NoAnalytics@d38ae535b543b515db
+    srclibs=RootToolsSvn@2.6,1:Common-AskSven@4d805,3:ActionBarSherlock@4.4.0,2:NoAnalytics@d38ae535b543b515db
     prebuild=sed -i '115,127d' AndroidManifest.xml
 
 Maintainer Notes:
diff --git a/metadata/de.j4velin.systemappmover.txt b/metadata/de.j4velin.systemappmover.txt
index c8c0eba7a5..9779374466 100644
--- a/metadata/de.j4velin.systemappmover.txt
+++ b/metadata/de.j4velin.systemappmover.txt
@@ -29,12 +29,12 @@ Repo:https://github.com/j4velin/SystemAppMover.git
 Build:1.5.6,19
     commit=457e6d661b726d5
     target=android-19
-    srclibs=1:RootTools@253
+    srclibs=1:RootToolsSvn@253
 
 Build:1.5.7,20
     commit=7c449eb05bbcf
     target=android-19
-    srclibs=1:RootTools@253
+    srclibs=1:RootToolsSvn@253
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest
diff --git a/metadata/org.adblockplus.android.txt b/metadata/org.adblockplus.android.txt
index f5480f0f02..24ebc357b4 100644
--- a/metadata/org.adblockplus.android.txt
+++ b/metadata/org.adblockplus.android.txt
@@ -36,10 +36,10 @@ Repo:https://hg.adblockplus.org/adblockplusandroid
 
 Build:1.0.1,168
     commit=1.0.1
-    init=rm -rf iptables/ libs/RootTools-1.7.jar build.xml && \
+    init=rm -rf iptables/ libs/RootToolsSvn-1.7.jar build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
-    srclibs=RootTools@1.7
-    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+    srclibs=RootToolsSvn@1.7
+    prebuild=echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
@@ -52,8 +52,8 @@ Build:1.1,238
     init=rm -rf iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
     update=.,submodules/actionbarsherlock/library,submodules/android-switch-backport
-    srclibs=RootTools@1.7
-    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+    srclibs=RootToolsSvn@1.7
+    prebuild=echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
@@ -66,8 +66,8 @@ Build:1.1.1,248
     init=rm -rf iptables/ libs/* obj/ build.xml && \
         git clone https://android.googlesource.com/platform/external/iptables
     update=.,submodules/actionbarsherlock/library,submodules/android-switch-backport
-    srclibs=RootTools@1.7
-    prebuild=echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+    srclibs=RootToolsSvn@1.7
+    prebuild=echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         sed -i 's@ndk-build@$$NDK$$/ndk-build@g' Makefile && \
@@ -77,10 +77,10 @@ Build:1.1.1,248
 
 Build:1.1.2,253
     commit=1.1.2
-    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
-    prebuild=rm libs/RootTools-1.7.jar && \
+    srclibs=RootToolsSvn@1.7,iptables@android-4.2.2_r1
+    prebuild=rm libs/RootToolsSvn-1.7.jar && \
         cp -r $$iptables$$ . && \
-        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         python extensions/fixinit.py
@@ -91,10 +91,10 @@ Build:1.1.2,253
 
 Build:1.1.3,270
     commit=1.1.3
-    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
-    prebuild=rm libs/RootTools-1.7.jar && \
+    srclibs=RootToolsSvn@1.7,iptables@android-4.2.2_r1
+    prebuild=rm libs/RootToolsSvn-1.7.jar && \
         cp -r $$iptables$$ . && \
-        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         python extensions/fixinit.py
@@ -106,10 +106,10 @@ Build:1.1.3,270
 Build:1.1.4,286
     disable=blobs in jni
     commit=1.1.4
-    srclibs=RootTools@1.7,iptables@android-4.2.2_r1
-    prebuild=rm libs/RootTools-1.7.jar && \
+    srclibs=RootToolsSvn@1.7,iptables@android-4.2.2_r1
+    prebuild=rm libs/RootToolsSvn-1.7.jar && \
         cp -r $$iptables$$ . && \
-        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         cd iptables && \
         git apply ../iptables.patch && \
         python extensions/fixinit.py
@@ -122,11 +122,11 @@ Build:1.1.4,286
 Build:1.2,307
     disable=blobs in jni
     commit=1.2
-    rm=buildtools,libs/RootTools-1.7.jar,assets/install/iptables
+    rm=buildtools,libs/RootToolsSvn-1.7.jar,assets/install/iptables
     extlibs=iptables-script_1.4.20.zip
-    srclibs=RootTools@1.7
+    srclibs=RootToolsSvn@1.7
     prebuild=sed -i 's/android-7/android-8/' build.xml && \
-        echo "source.dir=src;$$RootTools$$/src" >> ant.properties && \
+        echo "source.dir=src;$$RootToolsSvn$$/src" >> ant.properties && \
         echo "ndk.dir=$$NDK$$" >> local.properties && \
         unzip libs/iptables-script_1.4.20.zip && \
         sed -i 's/arm x86 mips/arm/g' external/Makefile && \
diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt
index c16bddb8be..0ea6536c6b 100644
--- a/metadata/stericson.busybox.donate.txt
+++ b/metadata/stericson.busybox.donate.txt
@@ -45,9 +45,9 @@ Build:10.3,161
     subdir=app/Pro
     target=android-15
     rm=binaries,patches,app/Free,app/Pro/assets
-    srclibs=1:ViewPagerIndicator@8cd549,RootTools@3.4,BusyboxConfigs-linusyang@63dc
+    srclibs=1:ViewPagerIndicator@8cd549,RootToolsSvn@3.4,BusyboxConfigs-linusyang@63dc
     prebuild=mkdir assets && \
-        cp -r $$RootTools$$/src/com/ src/ && \
+        cp -r $$RootToolsSvn$$/src/com/ src/ && \
         cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
         sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/g;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
     build=cd ../BB && \
@@ -62,9 +62,9 @@ Build:10.3.1,162
     forceversion=yes
     forcevercode=yes
     rm=binaries,patches,app,deprecated/Free,deprecated/Pro/assets
-    srclibs=1:ViewPagerIndicator@8cd549,RootTools@3.4,BusyboxConfigs-linusyang@63dc
+    srclibs=1:ViewPagerIndicator@8cd549,RootToolsSvn@3.4,BusyboxConfigs-linusyang@63dc
     prebuild=mkdir assets && \
-        cp -r $$RootTools$$/src/com/ src/ && \
+        cp -r $$RootToolsSvn$$/src/com/ src/ && \
         cp -r $$BusyboxConfigs-linusyang$$ ../BB && \
         sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile
     build=cd ../BB && \
diff --git a/metadata/stericson.busybox.txt b/metadata/stericson.busybox.txt
index 8652b91819..8c4c8534fe 100644
--- a/metadata/stericson.busybox.txt
+++ b/metadata/stericson.busybox.txt
@@ -36,10 +36,10 @@ Build:10.9,157
     commit=6c3dbbee
     init=sed -i 's@\(reference.1=\).*@\1view_pager_JW@' project.properties
     target=android-18
-    rm=assets/busybox1.21.1.png,assets/busybox1.22.1.png,assets/reboot.png,build,out,view_pager_JW/build,RootTools.jar
+    rm=assets/busybox1.21.1.png,assets/busybox1.22.1.png,assets/reboot.png,build,out,view_pager_JW/build,RootToolsSvn.jar
     extlibs=toolbox
-    srclibs=RootTools@3.4,BusyboxConfigs-linusyang@63dc
-    prebuild=cp -r $$RootTools$$/src/com/ src/ && \
+    srclibs=RootToolsSvn@3.4,BusyboxConfigs-linusyang@63dc
+    prebuild=cp -r $$RootToolsSvn$$/src/com/ src/ && \
         sed -i 's/"Busybox 1.22.1", //g' src/stericson/busybox/Constants.java && \
         mv libs/toolbox assets/toolbox.png && \
         cp -r $$BusyboxConfigs-linusyang$$ BB && \