diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php
index 691b175db..6f9b072b3 100644
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-function rewrite_processor_descr ($descr) {
+function rewrite_entity_descr ($descr) {
 
   $descr = str_replace("Distributed Forwarding Card", "DFC", $descr);
   $descr = preg_replace("/7600 Series SPA Interface Processor-/", "SIP-", $descr);
diff --git a/html/pages/device/health/memory.inc.php b/html/pages/device/health/memory.inc.php
index a98ddc003..79f3ad6e6 100644
--- a/html/pages/device/health/memory.inc.php
+++ b/html/pages/device/health/memory.inc.php
@@ -9,7 +9,7 @@
  
     $proc_url   = "?page=device/".$device['device_id']."/health/memory/";
  
-    $text_descr = $mempool['mempool_descr'];
+    $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
     $mempool_url   = "/device/".$device['device_id']."/health/memory/";
     $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
diff --git a/html/pages/device/health/processors.inc.php b/html/pages/device/health/processors.inc.php
index ef2db473f..af8bdb5ee 100644
--- a/html/pages/device/health/processors.inc.php
+++ b/html/pages/device/health/processors.inc.php
@@ -12,7 +12,7 @@
 
     $text_descr = $proc['processor_descr'];
 
-    $text_descr = rewrite_processor_descr($text_descr);
+    $text_descr = rewrite_entity_descr($text_descr);
 
     $proc_popup  = "onmouseover=\"return overlib('<div class=list-large>".$device['hostname']." - ".$text_descr;
     $proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&type=processor&from=$month&to=$now&width=400&height=125\'>";
diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php
index 0c2fd5c90..4eefcd9b8 100644
--- a/html/pages/device/overview/mempools.inc.php
+++ b/html/pages/device/overview/mempools.inc.php
@@ -10,11 +10,7 @@ if(mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '"
     if(is_integer($mempool_rows/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
     $perc = round($mempool['mempool_used'] / ($mempool['mempool_total']) * 100,2);
 
-    $text_descr = $mempool['mempool_descr'];
-    $text_descr = str_replace("Routing Processor", "RP", $text_descr);
-    $text_descr = str_replace("Switching Processor", "SP", $text_descr);
-    $text_descr = str_replace("Sub-Module", "Module ", $text_descr);
-    $text_descr = str_replace("DFC Card", "DFC", $text_descr);
+    $text_descr = rewrite_entity_descr($mempool['mempool_descr']);
 
     $mempool_url   = "/device/".$device['device_id']."/health/memory/";
     $mini_url = $config['base_url'] . "/graph.php?id=".$mempool['mempool_id']."&type=mempool&from=".$day."&to=".$now."&width=80&height=20&bg=f4f4f4";
diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php
index 149ecec77..1eeb30138 100644
--- a/html/pages/device/overview/processors.inc.php
+++ b/html/pages/device/overview/processors.inc.php
@@ -20,7 +20,7 @@ if(mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id = '
 
     ## REPLACE THIS SHITTY CODE. IT IS ALSO ELSEWHERE.
 
-    $text_descr = rewrite_processor_descr($proc['processor_descr']);
+    $text_descr = rewrite_entity_descr($proc['processor_descr']);
 
     # disable short hrDeviceDescr. need to make this prettier.
     #$text_descr = short_hrDeviceDescr($proc['processor_descr']);