diff --git a/include/i18n/en_US/help/tips/emails.addnew_email.yaml b/include/i18n/en_US/help/tips/emails.email.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/emails.addnew_email.yaml
rename to include/i18n/en_US/help/tips/emails.email.yaml
diff --git a/include/i18n/en_US/help/tips/emails.emails.yaml b/include/i18n/en_US/help/tips/emails.emails.yaml
deleted file mode 100644
index 8e982d172bd26a695df29d9e7fe1a2ba5f1f6c4f..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/emails.emails.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Emails -> Emails
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-add_new_email:
-    title: Add New Email
-    content: >
-        Custom lists are used to provide drop-down lists for custom forms.
-
-email_addresses:
-    title: Email Addresses
-    content: >
-
-email:
-    title: Email
-    content: >
-
-priority:
-    title: Priority
-    content: >
-
-department:
-    title: Department
-    content: >
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_response.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.canned_response.yaml
diff --git a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
deleted file mode 100644
index d4f3c913410a6ece7def3ed527704f94c2651fae..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> Canned Responses
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-add_new_response:
-    title: Add New Response
-    content: >
-
-canned_responses:
-    title: Canned Responses
-    content: >
-        Create responses to your more frequently asked questions to expedite
-        Client support. You can also upload attachments to <span 
-        class="doc-desc-title">Canned Responses</span>.
-
-showing_premade_responses:
-    title: Showing… Premade Responses
-    content: >
-
-title:
-    title: Title
-    content: >
-
-status:
-    title: Status
-    content: >
-
-department:
-    title: Department
-    content: >
diff --git a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
deleted file mode 100644
index f715307e631dd840853a6d787bb7044cac7cea4d..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> Categories
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-faq_categories:
-    title: FAQ Categories
-    content: >
-        Categories must first be created before any <span class="doc-desc-title">
-        FAQs</span> can be published.
-
-setting:
-    title: Setting
-    content: >
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml b/include/i18n/en_US/help/tips/knowledgebase.category.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.category.yaml
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml b/include/i18n/en_US/help/tips/knowledgebase.faq.yaml
similarity index 93%
rename from include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
rename to include/i18n/en_US/help/tips/knowledgebase.faq.yaml
index 0c9d272d870549bc4b799a420f61b0450ed8502c..6d3e407bb5387269c531ef98b4d07954e7bf37f3 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.faq.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQ -> Add New FAQ
+# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQ
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -20,4 +20,4 @@ listing_type:
         FAQ</span> to be published on public knowledgebase if the parent category is public.
     links:
       - title: Enable the Public Knowledgebase for the Client Portal
-        href: /scp/settings.php?t=kb
\ No newline at end of file
+        href: /scp/settings.php?t=kb
diff --git a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
deleted file mode 100644
index 2c257c8d632dc53442b9676c364bdc7a910eeaf3..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQs
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-page_header:
-    title: Frequently Asked Questions
-    content: >
-        You must first create <span class="doc-desc-title">Categories</span> 
-        before any <span class="doc-desc-title">FAQs</span> can be published.
-        It is also recommended that you create <span class="doc-desc-title">Help 
-        Topics</span> before adding <span class="doc-desc-title">FAQs</span>.
-    links:
-      - title: Create Categories
-        href: /scp/categories.php
-      - title: Create Help Topics
-        href: /scp/helptopics.php
-search_box:
-    title: Search for Articles
-    content: >
-
-category_select:
-    title: Category Filter
-    content: >
-
-help_topic_select:
-    title: Help Topic Filter
-    content: >
-
-resulted_listings:
-    title: Resulted Listings
-    content: >
-
-listed_categories:
-    title: Adding FAQs&hellip;
-    content: >
-        Select one of your categories below to add
-        <span class="doc-desc-title">FAQs</span> within it.
diff --git a/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml b/include/i18n/en_US/help/tips/manage.custom_list.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
rename to include/i18n/en_US/help/tips/manage.custom_list.yaml
diff --git a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
deleted file mode 100644
index ab01c7c97be32db780f5c26c307119db008aa7b9..0000000000000000000000000000000000000000
--- a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# This is popup help messages for the Admin Panel -> Staff -> Add New Group  -> User Group Form
-#
-# Fields:
-# title - Shown in bold at the top of the popover window
-# content - The body of the help popover
-# links - List of links shows below the content
-#   title - Link title
-#   href - href of link (links starting with / are translated to the
-#       helpdesk installation path)
-#
-# The key names such as 'helpdesk_name' should not be translated as they
-# must match the HTML #ids put into the page template.
-#
----
-add_new_group:
-    title: Add New Group
-    content: >
-
-group_information:
-    title: Group Information
-    content: >
-
-name:
-    title: Name
-    content: >
-
-status:
-    title: Status
-    content: >
-	By disabling, staff assigned to the group will be limited in their access to the help desk. 
-
-group_permissions:
-    title: Group Permissions
-    content: >
-
-can_create_tickets:
-    title: Can Create Tickets
-    content: >
-
-can_edit_tickets:
-    title: Can Edit Tickets
-    content: >
-
-can_post_reply:
-    title: Can Post Reply
-    content: >
-
-can_close_tickets:
-    title: Can Close Tickets
-    content: >
-
-can_assign_tickets:
-    title: Can Assign Tickets
-    content: >
-
-can_transfer_tickets:
-    title: Can Transfer Tickets
-    content: >
-
-can_delete_tickets:
-    title: Can Delete Tickets
-    content: >
-
-can_ban_emails:
-    title: Can Ban Emails
-    content: >
-
-can_manage_premade:
-    title: Can Manage Premade
-    content: >
-
-can_manage_faq:
-    title: Can Manage FAQ
-    content: >
-
-can_view_staff_stats_:
-    title: Can View Staff Stats.
-    content: >
-
-department_access:
-    title: Department Access
-    content: >
-
-support:
-    title: Support
-    content: >
diff --git a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml b/include/i18n/en_US/help/tips/staff.agent.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/staff.addnew_staff.yaml
rename to include/i18n/en_US/help/tips/staff.agent.yaml
diff --git a/include/i18n/en_US/help/tips/staff.addnew_department.yaml b/include/i18n/en_US/help/tips/staff.department.yaml
similarity index 100%
rename from include/i18n/en_US/help/tips/staff.addnew_department.yaml
rename to include/i18n/en_US/help/tips/staff.department.yaml
diff --git a/include/i18n/en_US/help/tips/staff.groups.yaml b/include/i18n/en_US/help/tips/staff.groups.yaml
index 89c9018cfe0cad1d9edd45c39afcca094f026e12..ab01c7c97be32db780f5c26c307119db008aa7b9 100644
--- a/include/i18n/en_US/help/tips/staff.groups.yaml
+++ b/include/i18n/en_US/help/tips/staff.groups.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Admin Panel -> Staff -> Groups
+# This is popup help messages for the Admin Panel -> Staff -> Add New Group  -> User Group Form
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -17,30 +17,71 @@ add_new_group:
     title: Add New Group
     content: >
 
-user_groups:
-    title: User Groups
+group_information:
+    title: Group Information
     content: >
 
-group_name:
-    title: Group Name
+name:
+    title: Name
     content: >
 
 status:
     title: Status
     content: >
+	By disabling, staff assigned to the group will be limited in their access to the help desk. 
 
-members:
-    title: Members
+group_permissions:
+    title: Group Permissions
     content: >
 
-departments:
-    title: Departments
+can_create_tickets:
+    title: Can Create Tickets
     content: >
 
-created_on:
-    title: Created On
+can_edit_tickets:
+    title: Can Edit Tickets
     content: >
 
-last_updated:
-    title: Last Updated
+can_post_reply:
+    title: Can Post Reply
+    content: >
+
+can_close_tickets:
+    title: Can Close Tickets
+    content: >
+
+can_assign_tickets:
+    title: Can Assign Tickets
+    content: >
+
+can_transfer_tickets:
+    title: Can Transfer Tickets
+    content: >
+
+can_delete_tickets:
+    title: Can Delete Tickets
+    content: >
+
+can_ban_emails:
+    title: Can Ban Emails
+    content: >
+
+can_manage_premade:
+    title: Can Manage Premade
+    content: >
+
+can_manage_faq:
+    title: Can Manage FAQ
+    content: >
+
+can_view_staff_stats_:
+    title: Can View Staff Stats.
+    content: >
+
+department_access:
+    title: Department Access
+    content: >
+
+support:
+    title: Support
     content: >
diff --git a/scp/canned.php b/scp/canned.php
index b567b0ea6f9790cb106a2a1de5c5225219046af4..ef9fc922f1fee99c536608b5d79aeeb57f8dfea3 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -147,10 +147,9 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
 }
 
 $page='cannedresponses.inc.php';
-$tip_namespace = 'knowledgebase.canned_responses';
+$tip_namespace = 'knowledgebase.canned_response';
 if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='cannedresponse.inc.php';
-    $tip_namespace = 'knowledgebase.addnew_canned_response';
 }
 
 $nav->setTabActive('kbase');
diff --git a/scp/categories.php b/scp/categories.php
index d6b66f485b91feb7cf5c3273a7e6d8566e23fe5d..d707c864bc3f3e577f484bdd7691c0a78ea34c5d 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -104,10 +104,9 @@ if($_POST){
 }
 
 $page='categories.inc.php';
-$tip_namespace = 'knowledgebase.categories';
+$tip_namespace = 'knowledgebase.category';
 if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='category.inc.php';
-    $tip_namespace = 'knowledgebase.addnew_category';
 }
 
 $nav->setTabActive('kbase');
diff --git a/scp/departments.php b/scp/departments.php
index b1b4dbdce637a6e5bab4b8511dd8538448cae4a4..abb9574902a050c4aa12d3b5e1bc74e8647b281f 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -103,10 +103,9 @@ if($_POST){
 }
 
 $page='departments.inc.php';
-$tip_namespace = 'staff.departments';
+$tip_namespace = 'staff.department';
 if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='department.inc.php';
-    $tip_namespace = 'staff.addnew_department';
 }
 
 $nav->setTabActive('staff');
diff --git a/scp/emails.php b/scp/emails.php
index e577044217e385e8a64c5d4b8630286c8697b329..8c688fcb99a50f2640ee0e20a60d149f69274f31 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -78,10 +78,9 @@ if($_POST){
 }
 
 $page='emails.inc.php';
-$tip_namespace = 'emails.emails';
+$tip_namespace = 'emails.email';
 if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='email.inc.php';
-    $tip_namespace = 'emails.addnew_email';
 }
 
 $nav->setTabActive('emails');
diff --git a/scp/faq.php b/scp/faq.php
index 8adbe88370f8b9ccc000507779ae9c6cab436694..602b4a33e2eca89b7529715ddd2a58b1001c1569 100644
--- a/scp/faq.php
+++ b/scp/faq.php
@@ -94,13 +94,12 @@ if($faq) {
     $inc='faq-view.inc.php';
     if($_REQUEST['a']=='edit' && $thisstaff->canManageFAQ())
         $inc='faq.inc.php';
-        $tip_namespace = 'knowledgebase.addnew_faq';
 }elseif($_REQUEST['a']=='add' && $thisstaff->canManageFAQ()) {
     $inc='faq.inc.php';
-    $tip_namespace = 'knowledgebase.addnew_faq';
 } elseif($category && $_REQUEST['a']!='search') {
     $inc='faq-category.inc.php';
 }
+$tip_namespace = 'knowledgebase.faq';
 $nav->setTabActive('kbase');
 $ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />',
     "$('#content').data('tipNamespace', '".$tip_namespace."');");
diff --git a/scp/groups.php b/scp/groups.php
index a2730a58d638e556806208a71913954d110143c3..b2cbd0466dac6fcf166d049367974f1428a713a6 100644
--- a/scp/groups.php
+++ b/scp/groups.php
@@ -98,7 +98,6 @@ $page='groups.inc.php';
 $tip_namespace = 'staff.groups';
 if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='group.inc.php';
-    $tip_namespace = 'staff.addnew_groups';
 }
 
 $nav->setTabActive('staff');
diff --git a/scp/lists.php b/scp/lists.php
index 479ea804620e0495897ac4cfb67a3eb59a2a5164..66801deee614ad2d8ef82b8534be2eec2a4fa3f8 100644
--- a/scp/lists.php
+++ b/scp/lists.php
@@ -181,8 +181,8 @@ if($_POST) {
 $page='dynamic-lists.inc.php';
 if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='dynamic-list.inc.php';
-    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_custom_list" />',
-        "$('#content').data('tipNamespace', 'manage.addnew_custom_list');");
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.custom_list" />',
+        "$('#content').data('tipNamespace', 'manage.custom_list');");
 }
 
 $nav->setTabActive('manage');
diff --git a/scp/slas.php b/scp/slas.php
index 7003be1c9d86ce5e70fa7eddf04dcb8a8fcfef0d..e4434da4668a3eabc440f069eaa51df6980c8d28 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -100,8 +100,8 @@ if($_POST){
 $page='slaplans.inc.php';
 if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='slaplan.inc.php';
-    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_sla_plan" />',
-        "$('#content').data('tipNamespace', 'manage.addnew_sla_plan');");
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.sla" />',
+            "$('#content').data('tipNamespace', 'manage.sla');");
 }
 
 $nav->setTabActive('manage');
diff --git a/scp/staff.php b/scp/staff.php
index ae2f8e24053a417b413e43fe4ffefd7f3ecbaffd..e66054b84485ffc0b6112d5f701b9787449bd90b 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -97,10 +97,9 @@ if($_POST){
 }
 
 $page='staffmembers.inc.php';
-$tip_namespace = 'staff.agents';
+$tip_namespace = 'staff.agent';
 if($staff || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='staff.inc.php';
-    $tip_namespace = 'staff.addnew_staff';
 }
 
 $nav->setTabActive('staff');