diff --git a/src/etc/inc/plugins.inc.d/shaper.inc b/src/etc/inc/plugins.inc.d/ipfw.inc
similarity index 98%
rename from src/etc/inc/plugins.inc.d/shaper.inc
rename to src/etc/inc/plugins.inc.d/ipfw.inc
index bb4d1b777..78e946a62 100644
--- a/src/etc/inc/plugins.inc.d/shaper.inc
+++ b/src/etc/inc/plugins.inc.d/ipfw.inc
@@ -27,9 +27,10 @@
 */
 
 
-function shaper_services()
+function ipfw_services()
 {
     global $config;
+
     $services = array();
 
     if (!empty($config['OPNsense']['TrafficShaper']['rules']['rule'])) {
diff --git a/src/etc/inc/plugins.inc.d/firewall.inc b/src/etc/inc/plugins.inc.d/pf.inc
similarity index 98%
rename from src/etc/inc/plugins.inc.d/firewall.inc
rename to src/etc/inc/plugins.inc.d/pf.inc
index c7c8196b3..b4e41a0aa 100644
--- a/src/etc/inc/plugins.inc.d/firewall.inc
+++ b/src/etc/inc/plugins.inc.d/pf.inc
@@ -26,7 +26,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-function firewall_services()
+function pf_services()
 {
     global $config;