diff --git a/appbrowse.php b/appbrowse.php
index 0a2a940..7e1fd59 100644
--- a/appbrowse.php
+++ b/appbrowse.php
@@ -107,7 +107,7 @@ if($apps)
 	
         //display row
         echo "<tr class=$bgcolor>\n";
-        echo "    <td><a href='appview.php?iAppId=$iAppId'>".$oApp->sName."</a></td>\n";
+        echo "    <td>".$oApp->objectMakeLink()."</td>\n";
         echo "    <td>$desc &nbsp;</td>\n";
         echo "    <td>".sizeof($oApp->aVersionsIds)."</td>\n";
         echo "</tr>\n\n";
diff --git a/browse_by_rating.php b/browse_by_rating.php
index 9b98793..a6f6ab5 100644
--- a/browse_by_rating.php
+++ b/browse_by_rating.php
@@ -160,7 +160,7 @@ if (empty($aClean['sRating']))
 	
         //display row
         echo "<tr class=$bgcolor>\n";
-        echo "    <td><a href='appview.php?iAppId=$iAppId&sRating=".$aClean['sRating']."'>".$oApp->sName."</a></td>\n";
+        echo "    <td>".$oApp->objectMakeLink()."</td>\n";
         echo "    <td>$desc &nbsp;</td>\n";
         echo "    <td>".sizeof($oApp->aVersionsIds)."</td>\n";
         echo "</tr>\n\n";
diff --git a/browse_downloadable.php b/browse_downloadable.php
index e142222..7d3c177 100644
--- a/browse_downloadable.php
+++ b/browse_downloadable.php
@@ -113,13 +113,13 @@ if($hResult && mysql_num_rows($hResult))
 
     for($i = 1; $oRow = mysql_fetch_object($hResult); $i++)
     {
+        $oVersion = new version($oRow->versionId);
         echo html_tr_highlight_clickable(
-            "appview.php?iVersionId=$oRow->versionId",
+            $oVersion->objectMakeUrl(),
             ($i % 2) ? "color1" : "color0",
             ($i % 2) ? "color1" : "color0",
             ($i % 2) ? "color1" : "color0");
-        echo "<td><a href=\"appview.php?iVersionId=$oRow->versionId\">".
-             "$oRow->appName $oRow->versionName</a></td>\n";
+        echo "<td>".version::fullNameLink($oVersion->iVersionId)."</td>\n";
         echo "<td>$oRow->description</td>\n";
         echo "</tr>\n";
     }
diff --git a/browse_newest_apps.php b/browse_newest_apps.php
index 996c727..26c538a 100644
--- a/browse_newest_apps.php
+++ b/browse_newest_apps.php
@@ -50,8 +50,9 @@ if($hResult)
     $c = 1;
     while($row = mysql_fetch_object($hResult))
     {
+        $oApp = new application($row->appId);
         $bgcolor = ($c % 2) ? "color0" : "color1";
-        $link = "<a href=\"appview.php?iAppId=$row->appId\"> $row->appName </a>";
+        $link = $oApp->objectMakeLink();
         echo "<tr class=\"$bgcolor\">";
         echo "<td width=\"20%\">".print_short_date(mysqltimestamp_to_unixtimestamp($row->submitTime))."</td>\n";
         echo "<td>$link </td>\n";
diff --git a/include/sidebar_login.php b/include/sidebar_login.php
index 5072597..57aa9cd 100644
--- a/include/sidebar_login.php
+++ b/include/sidebar_login.php
@@ -27,10 +27,11 @@ function global_sidebar_login() {
             $g->addmisc("You maintain:\n");
             while(list($index, list($appId, $versionId, $superMaintainer)) = each($apps_user_maintains))
             {
+                $oApp = new application($appId);
                 if($superMaintainer)
-                    $g->addmisc("<a href='".BASE."appview.php?iAppId=$appId'>".Application::lookup_name($appId)."*</a>", "center");
+                    $g->addmisc($oApp->objectMakeLink()."*", "center");
                 else
-                    $g->addmisc("<a href='".BASE."appview.php?iVersionId=$versionId'>".Application::lookup_name($appId)." ".Version::lookup_name($versionId)."</a>", "center");
+                    $g->addmisc(version::fullNameLink($versionId), "center");
             }
         }
         $appsRejected = $_SESSION['current']->getAllRejectedApps();
@@ -44,7 +45,7 @@ function global_sidebar_login() {
             $g->addmisc("You monitor:\n");
 
             while(list($i, list($iAppId, $iVersionId)) = each($aMonitored))
-                $g->addmisc("<a href=\"".BASE."appview.php?iVersionId=$iVersionId\">".Application::lookup_name($iAppId)." ".Version::lookup_name($iVersionId)."</a>","center");
+                $g->addmisc(version::fullNameLink($iVersionId),"center");
         }
 
         /* Display a link to the user's queued items,
diff --git a/include/vendor.php b/include/vendor.php
index 8d578ea..d433d33 100644
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -244,8 +244,7 @@ class Vendor {
             foreach($this->aApplicationsIds as $iAppId)
             {
                 $oApp  = new Application($iAppId);
-                echo '<li> <a href="appview.php?iAppId='.$oApp->iAppId.'">'.
-                     $oApp->sName.'</a> </li>',"\n";
+                echo '<li>'.$oApp->objectMakeLink().'</li>',"\n";
             }
             echo '</ol>',"\n";
         }
diff --git a/include/version.php b/include/version.php
index 7db4bd6..9691030 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1037,7 +1037,7 @@ class Version {
 
                     //display row
                     echo "<tr class=$bgcolor>\n";
-                    echo "    <td><a href=\"".BASE."appview.php?iVersionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n";
+                    echo "    <td>".$oVersion->objectMakeLink()."</td>\n";
                     echo "    <td>".util_trim_description($oVersion->sDescription)."</td>\n";
                     echo "    <td $sRatingColor align=center>".$oVersion->sTestedRating."</td>\n";
                     echo "    <td $sRatingColor align=center>".$oVersion->sTestedRelease."</td>\n";
diff --git a/include/vote.php b/include/vote.php
index ed5c68c..c07b510 100644
--- a/include/vote.php
+++ b/include/vote.php
@@ -122,11 +122,7 @@ function vote_menu()
     for($i = 1;$i <= MAX_VOTES; $i++)
     {
         if(isset($votes[$i]))
-        {
-            $sName = Version::fullName($votes[$i]->versionId);
-            $str = "<a href='appview.php?iVersionId=".$votes[$i]->versionId."'>".
-                   "$sName</a>";
-        }
+            $str = Version::fullNameLink($votes[$i]->versionId);
         else
             $str = "No App Selected";
 
diff --git a/votestats.php b/votestats.php
index 60c2d17..fdbee42 100644
--- a/votestats.php
+++ b/votestats.php
@@ -168,8 +168,7 @@ if($hResult)
     while($row = mysql_fetch_object($hResult))
     {
         $bgcolor = ($c % 2) ? "color0" : "color1";
-        $link = "<a href='appview.php?iVersionId=$row->versionId'>$row->appName ".
-            "$row->versionName</a>";
+        $link = version::fullNameLink($row->versionId);
         echo "<tr class=$bgcolor><td width='90%'>$c. $link </td> <td> $row->count ".
             "</td></tr>\n";
         $c++;