diff --git a/src/etc/inc/plugins.inc.d/ipfw.inc b/src/etc/inc/plugins.inc.d/ipfw.inc
index d6af2c770..e406501e2 100644
--- a/src/etc/inc/plugins.inc.d/ipfw.inc
+++ b/src/etc/inc/plugins.inc.d/ipfw.inc
@@ -1,30 +1,30 @@
 <?php
 
 /*
-    Copyright (C) 2016 Deciso B.V.
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2016 Deciso B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
 
 function ipfw_services()
 {
@@ -34,7 +34,7 @@ function ipfw_services()
 
     if (!empty($config['OPNsense']['TrafficShaper']['rules']['rule'])) {
         $services[] = array(
-            'description' => gettext('Traffic Shaper'),
+            'description' => gettext('Shaper'),
             'configd' => array(
                 'restart' => array('ipfw reload'),
                 'start' => array('ipfw reload'),
@@ -53,7 +53,7 @@ function ipfw_xmlrpc_sync()
     $result = array();
 
     $result[] = array(
-        'description' => gettext('Traffic Shaper'),
+        'description' => gettext('Shaper'),
         'section' => 'OPNsense.TrafficShaper',
         'id' => 'shaper',
     );
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
index 344974b1a..517851d72 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
@@ -1,6 +1,6 @@
 <acl>
     <page-firewall-trafficshaper>
-        <name>Firewall: Traffic Shaper</name>
+        <name>Firewall: Shaper</name>
         <patterns>
             <pattern>ui/trafficshaper/*</pattern>
             <pattern>api/trafficshaper/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
index b8cf572c5..7257b8183 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
@@ -1,12 +1,12 @@
 <menu>
     <Firewall>
-        <TrafficShaper order="40" VisibleName="Traffic Shaper" cssClass="fa fa-filter fa-fw">
+        <Shaper order="40" cssClass="fa fa-filter fa-fw">
             <Settings order="10" url="/ui/trafficshaper">
-                <Pipes VisibleName="Pipes" url="/ui/trafficshaper#pipes"/>
-                <Queues VisibleName="Queues" url="/ui/trafficshaper#queues"/>
-                <Rules VisibleName="Rules" url="/ui/trafficshaper#rules"/>
+                <Pipes url="/ui/trafficshaper#pipes"/>
+                <Queues url="/ui/trafficshaper#queues"/>
+                <Rules url="/ui/trafficshaper#rules"/>
             </Settings>
             <Status order="20" url="/diag_limiter_info.php"/>
-        </TrafficShaper>
+        </Shaper>
     </Firewall>
 </menu>