diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 6881e499f..1e5d69579 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-function generate_device_link($device, $text=0, $start=0, $end=0) 
+function generate_device_link($device, $text=0, $linksuffix="", $start=0, $end=0) 
 {
   global $twoday; global $day; global $now; global $config;
   if (!$start) { $start = $day; }
@@ -21,7 +21,7 @@ function generate_device_link($device, $text=0, $start=0, $end=0)
     $graphs = $config['os']['default']['over']; 
   }
 
-  $url  = $config['base_url']."/device/" . $device['device_id'] . "/";
+  $url  = $config['base_url']."/device/" . $device['device_id'] . "/" . $linksuffix;
   $contents = "<div class=list-large>".$device['hostname'];
   if($device['hardware']) { $contents .= " - ".$device['hardware']; }
   $contents .= "</div>";
@@ -34,7 +34,6 @@ function generate_device_link($device, $text=0, $start=0, $end=0)
 #  if($device['hardware']) { $contents .= " - ".$device['hardware']; }
   $contents .= "</div>";
 
-
 #  if (isset($device['location'])) { $contents .= "" . htmlentities($device['location'])."<br />"; }
   foreach ($graphs as $entry)
   {
diff --git a/html/includes/graphs/bgp/cbgp_prefixes.inc.php b/html/includes/graphs/bgp/prefixes.inc.php
similarity index 100%
rename from html/includes/graphs/bgp/cbgp_prefixes.inc.php
rename to html/includes/graphs/bgp/prefixes.inc.php
diff --git a/html/pages/bgp.inc.php b/html/pages/bgp.inc.php
index 70c46e121..03eb95cc4 100644
--- a/html/pages/bgp.inc.php
+++ b/html/pages/bgp.inc.php
@@ -40,7 +40,7 @@ else
 
     echo("<tr bgcolor=$bg_colour background=$bg_image>
             <td></td>
-            <td width=150><span class=list-large>" . $peer['bgpLocalAddr'] . "</span><br />".generate_device_link($peer, shorthost($peer['hostname']))."</td>
+            <td width=150><span class=list-large>" . $peer['bgpLocalAddr'] . "</span><br />".generate_device_link($peer, shorthost($peer['hostname']), 'bgp/')."</td>
 	     <td width=30>-></td>
             <td width=150><span class=list-large>" . $peer['bgpPeerIdentifier'] . "</span><br />".$peername."</td>
 	     <td width=50><b>$peer_type</b></td>
diff --git a/html/pages/device/bgp.inc.php b/html/pages/device/bgp.inc.php
index a503984e4..95787692d 100644
--- a/html/pages/device/bgp.inc.php
+++ b/html/pages/device/bgp.inc.php
@@ -10,9 +10,9 @@ echo("
   <div style='margin: auto; text-align: left; padding-left: 11px; clear: both; display:block; height:20px;'>
   <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/'>No Graphs</a> |
   <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/updates/'>Updates</a> | Prefixes:
-  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/cbgp_prefixes/ipv4.unicast/'>IPv4</a> |
-  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/cbgp_prefixes/ipv4.vpn/'>VPNv4</a> |
-  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/cbgp_prefixes/ipv6.unicast/'>IPv6</a>
+  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/prefixes/ipv4.unicast/'>IPv4</a> |
+  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/prefixes/ipv4.vpn/'>VPNv4</a> |
+  <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/prefixes/ipv6.unicast/'>IPv6</a>
   | Traffic:
   <a href='".$config['base_url']."/device/" . $_GET['id'] . "/bgp/macaccounting/'>Mac Accounting</a>
 </div>
@@ -84,7 +84,7 @@ print_optionbar_end();
 
   if (isset($_GET['opta']) && $_GET['opta'] != "macaccounting") {
     foreach(explode(" ", $_GET['opta']) as $graph_type) {        
-      if($graph_type == "cbgp_prefixes") { list($afi, $safi) = explode(".", $_GET['optb']); $afisafi = "&afi=$afi&safi=$safi"; }
+      if($graph_type == "prefixes") { list($afi, $safi) = explode(".", $_GET['optb']); $afisafi = "&afi=$afi&safi=$safi"; }
       if($graph_type == "updates" || $valid_afi_safi[$afi][$safi]) {
         $daily_traffic   = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&type=bgp_$graph_type&from=$day&to=$now&width=210&height=100$afisafi";
         $daily_url       = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&type=bgp_$graph_type&from=$day&to=$now&width=500&height=150$afisafi";