diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
index 3ee9fd2106f71a50b00013c31d569becb02bb3f0..8d04a9257e5604aa7cd9c1b5cdbe764edd295ab2 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
@@ -524,13 +524,13 @@ else {
 
 		<?php
 
-		$shortname="$build_distribution";
+		$shortname="jsdt";
 		$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
 		displayp2repoarchives($zipfilename, $downloadprefix, $shortname         , "Minimal", "Executable code");
 		$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk"  , "SDK", "Executable code and source");
+		displayp2repoarchives($zipfilename, $downloadprefix, $shortname."_sdk"  , "SDK", "Executable code and source");
 		$zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
+		displayp2repoarchives($zipfilename, $downloadprefix, $shortname."_tests", "Tests", "Unit tests");
 
 		?>
 		</table>
diff --git a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
index 3ee9fd2106f71a50b00013c31d569becb02bb3f0..ee189d661d1e16e80d7d972e0cc3714600b7f98a 100644
--- a/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches32x.site/templateFiles/index.html.template.php
@@ -524,13 +524,13 @@ else {
 
 		<?php
 
-		$shortname="$build_distribution";
+		$shortname="wtp-patches32x";
 		$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
 		displayp2repoarchives($zipfilename, $downloadprefix, $shortname         , "Minimal", "Executable code");
 		$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk"  , "SDK", "Executable code and source");
+		displayp2repoarchives($zipfilename, $downloadprefix, $shortname."_sdk"  , "SDK", "Executable code and source");
 		$zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
+		displayp2repoarchives($zipfilename, $downloadprefix, $shortname."_tests", "Tests", "Unit tests");
 
 		?>
 		</table>