diff --git a/LCS/Tools/src/pkgdep.cc b/LCS/Tools/src/pkgdep.cc
index 367ef0f571fbaac0377936f92865597ca44d4192..83de41e4d6053861d561ba888098a523a7a7abb4 100644
--- a/LCS/Tools/src/pkgdep.cc
+++ b/LCS/Tools/src/pkgdep.cc
@@ -68,7 +68,7 @@ string replaceSlash (const string& str)
   string out = str;
   string::size_type idx = out.find('/');
   while (idx != string::npos) {
-    out.replace (idx, 1, 1, '_');
+    out.replace (idx, 1, 1, '~');
     idx = out.find('/');
   }
   return out;
diff --git a/support/tools/TreeBrowser/scripts/make_links.php b/support/tools/TreeBrowser/scripts/make_links.php
index 5e24cd1ae92115a44a6b6d46f60103e1c23e6202..4725f21ed080cb45d415fca8160a1ae730574a72 100644
--- a/support/tools/TreeBrowser/scripts/make_links.php
+++ b/support/tools/TreeBrowser/scripts/make_links.php
@@ -1,6 +1,6 @@
 <?php
 $name = $_REQUEST["name"];
-$realname= str_replace("_","/",$name);
+$realname= str_replace("~","/",$name);
 $isUsed=file_exists("../dep/".$name.".used.html");
 $isUses=file_exists("../dep/".$name.".uses.html");
 $isFlat=file_exists("../dep/".$name.".flat.html");
@@ -22,7 +22,8 @@ echo $realname;
 if ($isUsed) {
 ?>
   --  <a href="../dep/<?php echo $name;?>.used.html" title="(shows in a
-  recursive way the packages where <?php echo $name;?> is used)" target="depend"> Used </a>
+  recursive way the packages where <?php echo $realname;?> is used)" 
+  target="depend"> Used</a>
 <?php
 } else {
 ?>
@@ -34,7 +35,8 @@ if ($isUsed) {
 if ($isUses) {
 ?>
   --  <a href="../dep/<?php echo $name;?>.uses.html" title="(shows in a
-  recursive way the packages used by <?php echo $name;?>)" target="depend"> Uses </a>
+  recursive way the packages used by <?php echo $realname;?>)" 
+  target="depend"> Uses</a>
 <?php
 } else {
 ?>
@@ -46,13 +48,12 @@ if ($isUses) {
 if ($isFlat) {
 ?>
   --  <a href="../dep/<?php echo $name;?>.flat.html" title="(shows the
-  packages used by <?php echo $name;?>)" target="depend"> Flat </a>
+  packages used by <?php echo $realname;?>)" target="depend"> Flat</a>
 <?php
 }
 ?>
- --- Build results: 
-    <A HREF="../../BuildResults/thisWeek/" target="_top">this week</a>
- -- <A HREF="../../BuildResults/lastWeek/" target="_top">last week</a>
+  ---  <a href="http://svn.astron.nl/CDash/index.php?project=LOFAR" 
+  target="_blank">Build results</a>
 </center>
 </body>
 </html>
diff --git a/support/tools/TreeBrowser/scripts/makepage.php b/support/tools/TreeBrowser/scripts/makepage.php
index 667f093a2ccdbfa5df02472045a8b3e993022eaf..1ebc5f00a0fb791c66f5140d9c3d01d169a4b392 100644
--- a/support/tools/TreeBrowser/scripts/makepage.php
+++ b/support/tools/TreeBrowser/scripts/makepage.php
@@ -1,9 +1,7 @@
 <?php
-$name      = $_REQUEST["name"];
-$realname  = str_replace("_","/",$name);
-$namearray = explode('_',$name);
-$shortname = $namearray[sizeof($namearray)-1];
-$docname   = "group__".$shortname.".html";
+$name     = $_REQUEST["name"];
+$realname = str_replace("~","/",$name);
+$docname  = "group__" .str_replace("_","__",end(explode('~',$name))). ".html";
 ?>
 <html>
 <head>