diff --git a/tools/setup_radiohdl.sh b/tools/setup_radiohdl.sh
index 2ff1eae1bc526502abf6a5a643ad4c82c83a81a7..470fd91888e6d6ddad2bb7ad5c4ccc442dd837f9 100755
--- a/tools/setup_radiohdl.sh
+++ b/tools/setup_radiohdl.sh
@@ -33,8 +33,8 @@ echo "Setup RadioHDL environment"
 
 # 2) Setup
 
-export UNB=${SVN}/UniBoard_FP7/UniBoard/trunk
-export RADIOHDL=${SVN}/UniBoard_FP7/RadioHDL/trunk
+export UNB=${SVN}/UniBoard/trunk
+export RADIOHDL=${SVN}/RadioHDL/trunk
 export HDL_BUILD_DIR=${RADIOHDL}/build
 
 #UniBoard Python Environment
diff --git a/tools/setup_unb.sh b/tools/setup_unb.sh
index 94e7e7e1d7f7c655897477948c3d2fb1a05798f7..f8b0bcfc69a49bb3b2c18a4c5ce6fce7174d0e05 100755
--- a/tools/setup_unb.sh
+++ b/tools/setup_unb.sh
@@ -69,8 +69,8 @@ echo "Setup old UniBoard environment for Modelsim and Quartus"
 # In addation to the 'lp' and 'mk' commands for the UNB libraries these projects have 'lpa' and 'mka' commands to load and make
 # the application specific libraries for simulation.
 
-export AARTFAAC=${SVN}/UniBoard_FP7/Aartfaac/trunk
-export PAASAR=${SVN}/UniBoard_FP7/Paasar/trunk
+export AARTFAAC=${SVN}/Aartfaac/trunk
+export PAASAR=${SVN}/Paasar/trunk
 
 export PATH=${PATH}:\
 ${AARTFAAC}/Firmware/sim/modelsim:\