diff --git a/include/class.nav.php b/include/class.nav.php
index a5ce84cb07affcec52e9ecec88460b790ece4fb6..35cd29942cb64145f5f15d7621c4ce5391283a0c 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -126,7 +126,7 @@ class StaffNav {
                     $subnav[]=array('desc'=>'Knowledgebase','href'=>'kb.php', 'urls'=>array('faq.php'), 'iconclass'=>'kb');
                     if($staff) {
                         if($staff->canManageFAQ())
-                            $subnav[]=array('desc'=>'Categories','href'=>'categories.php','iconclass'=>'kb-categories');
+                            $subnav[]=array('desc'=>'Categories','href'=>'categories.php','iconclass'=>'faq-categories');
                         if($staff->canManageCannedResponses())
                             $subnav[]=array('desc'=>'Canned Replies','href'=>'canned.php','iconclass'=>'canned');
                     }
diff --git a/include/staff/kb-categories.inc.php b/include/staff/faq-categories.inc.php
similarity index 100%
rename from include/staff/kb-categories.inc.php
rename to include/staff/faq-categories.inc.php
diff --git a/include/staff/kb-category.inc.php b/include/staff/faq-category.inc.php
similarity index 100%
rename from include/staff/kb-category.inc.php
rename to include/staff/faq-category.inc.php
diff --git a/kb/faq.php b/kb/faq.php
index e0c1661c4ff62f8bc85b6c492b2eaf4467d19570..d8c1634e35e1aa625c835143e5cea925c2b0ce0e 100644
--- a/kb/faq.php
+++ b/kb/faq.php
@@ -28,7 +28,7 @@ $inc='knowledgebase.inc.php'; //FAQs landing page.
 if($faq && $faq->isPublished()) {
     $inc='faq.inc.php';
 } elseif($category && $category->isPublic() && $_REQUEST['a']!='search') {
-    $inc='kb-category.inc.php';
+    $inc='faq-category.inc.php';
 }
 require_once(CLIENTINC_DIR.'header.inc.php');
 require_once(CLIENTINC_DIR.$inc);
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 3c7b83e12f3fc85001b1fd451c6fcc3e586e2752..0042ed4306a406337f3a3deec2811467c06a325d 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -234,7 +234,7 @@ a.premade { background:url(../images/icons/premade_reply.gif) }
 a.newPremade { background:url(../images/icons/new_premade_reply.gif) }
 
 a.kb { background:url(../images/icons/kb.gif) }
-a.kb-categories { background:url(../images/icons/kb-categories.gif) }
+a.faq-categories { background:url(../images/icons/faq-categories.gif) }
 a.canned { background:url(../images/icons/canned.gif) }
 
 a.staff { background:url(../images/icons/list_groups.gif) }
diff --git a/scp/images/kb_category_bg.png b/scp/images/faq_category_bg.png
similarity index 100%
rename from scp/images/kb_category_bg.png
rename to scp/images/faq_category_bg.png
diff --git a/scp/kb.php b/scp/kb.php
index 0a683a05f01d8cf294b336929038a9803171ab85..65e3a66ef2930c5b01c4fd7f9ffd6b6fa0733962 100644
--- a/scp/kb.php
+++ b/scp/kb.php
@@ -19,9 +19,9 @@ $category=null;
 if($_REQUEST['cid'] && !($category=Category::lookup($_REQUEST['cid'])))
     $errors['err']='Unknown or invalid FAQ category';
 
-$inc='kb-categories.inc.php'; //KB landing page.
+$inc='faq-categories.inc.php'; //KB landing page.
 if($category && $_REQUEST['a']!='search') {
-    $inc='kb-category.inc.php';
+    $inc='faq-category.inc.php';
 }
 $nav->setTabActive('kbase');
 require_once(STAFFINC_DIR.'header.inc.php');