diff --git a/src/etc/inc/plugins.inc b/src/etc/inc/plugins.inc
index 4c3defb9e..cb9920f3f 100644
--- a/src/etc/inc/plugins.inc
+++ b/src/etc/inc/plugins.inc
@@ -58,7 +58,7 @@ function plugins_interfaces()
     // register / update interfaces
     foreach (plugin_scan() as $name => $path) {
         require_once $path;
-        $func = sprintf('%s_interface', $name);
+        $func = sprintf('%s_interfaces', $name);
         if (function_exists($func)) {
             foreach ($func() as $intf_ref => $intf_data) {
                 if (is_array($intf_data)) {
diff --git a/src/etc/inc/plugins.inc.d/plugin_ifgroups.inc b/src/etc/inc/plugins.inc.d/if_group.inc
similarity index 98%
rename from src/etc/inc/plugins.inc.d/plugin_ifgroups.inc
rename to src/etc/inc/plugins.inc.d/if_group.inc
index 1ae88dc96..c1b777854 100644
--- a/src/etc/inc/plugins.inc.d/plugin_ifgroups.inc
+++ b/src/etc/inc/plugins.inc.d/if_group.inc
@@ -26,9 +26,10 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-function plugin_ifgroups_interface()
+function if_group_interfaces()
 {
     global $config;
+
     $interfaces = array();
 
     /* add interface groups */
diff --git a/src/etc/inc/plugins.inc.d/plugin_ipsec.inc b/src/etc/inc/plugins.inc.d/if_ipsec.inc
similarity index 74%
rename from src/etc/inc/plugins.inc.d/plugin_ipsec.inc
rename to src/etc/inc/plugins.inc.d/if_ipsec.inc
index cb9fbd358..b16022636 100644
--- a/src/etc/inc/plugins.inc.d/plugin_ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/if_ipsec.inc
@@ -26,9 +26,30 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-function plugin_ipsec_interface()
+function if_ipsec_services()
 {
     global $config;
+
+    $services = array();
+
+    if (isset($config['ipsec']['enable'])) {
+        $pconfig = array();
+        $pconfig['name'] = 'ipsec';
+        $pconfig['description'] = gettext('IPsec VPN');
+        $pconfig['pidfile'] = '/var/run/charon.pid';
+        $pconfig['php']['restart'] = array('ipsec_force_reload');
+        $pconfig['php']['start'] = array('ipsec_force_reload');
+        $pconfig['mwexec']['stop'] = array('/usr/local/sbin/ipsec stop');
+        $services[] = $pconfig;
+    }
+
+    return $services;
+}
+
+function if_ipsec_interfaces()
+{
+    global $config;
+
     $interfaces = array();
 
     /* add ipsec interfaces */
diff --git a/src/etc/inc/plugins.inc.d/plugin_openvpn.inc b/src/etc/inc/plugins.inc.d/if_openvpn.inc
similarity index 60%
rename from src/etc/inc/plugins.inc.d/plugin_openvpn.inc
rename to src/etc/inc/plugins.inc.d/if_openvpn.inc
index 41b9d26d7..6bc1f7518 100644
--- a/src/etc/inc/plugins.inc.d/plugin_openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/if_openvpn.inc
@@ -1,4 +1,5 @@
 <?php
+
 /*
     Copyright (C) 2016 Deciso B.V.
     All rights reserved.
@@ -25,10 +26,39 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-function plugin_openvpn_interface()
+function if_openvpn_services()
 {
     global $config;
+
+    $services = array();
+
+    foreach (array('server', 'client') as $mode) {
+        if (isset($config['openvpn']["openvpn-{$mode}"])) {
+            foreach ($config['openvpn']["openvpn-{$mode}"] as $setting) {
+                if (!isset($setting['disable'])) {
+                    $pconfig = array();
+                    /* XXX clean up name print */
+                    $pconfig['description'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
+                    $pconfig['php']['restart'] = array('openvpn_restart_by_id');
+                    $pconfig['php']['start'] = array('openvpn_restart_by_id');
+                    $pconfig['php']['args'] = array('mode', 'id');
+                    $pconfig['pidfile'] = "/var/run/openvpn_{$mode}{$setting['vpnid']}.pid";
+                    $pconfig['id'] = $setting['vpnid'];
+                    $pconfig['name'] = 'openvpn';
+                    $pconfig['mode'] = $mode;
+                    $services[] = $pconfig;
+                }
+            }
+        }
+    }
+
+    return $services;
+}
+
+function if_openvpn_interfaces()
+{
+    global $config;
+
     $interfaces = array();
 
     /* add openvpn interfaces */
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index d1a124a05..ecf8456d5 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -2596,17 +2596,6 @@ function services_get()
         $services[] = $pconfig;
     }
 
-    if (isset($config['ipsec']['enable'])) {
-        $pconfig = array();
-        $pconfig['name'] = "ipsec";
-        $pconfig['description'] = gettext("IPsec VPN");
-        $pconfig['pidfile'] = '/var/run/charon.pid';
-        $pconfig['php']['restart'] = array('ipsec_force_reload');
-        $pconfig['php']['start'] = array('ipsec_force_reload');
-        $pconfig['mwexec']['stop'] = array('/usr/local/sbin/ipsec stop');
-        $services[] = $pconfig;
-    }
-
     if (isset($config['system']['ssh']['enabled'])) {
         $pconfig = array();
         $pconfig['name'] = 'sshd';
@@ -2616,25 +2605,6 @@ function services_get()
         $services[] = $pconfig;
     }
 
-    foreach (array('server', 'client') as $mode) {
-        if (isset($config['openvpn']["openvpn-{$mode}"])) {
-            foreach ($config['openvpn']["openvpn-{$mode}"] as $setting) {
-                if (!isset($setting['disable'])) {
-                    $pconfig = array();
-                    $pconfig['description'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']);
-                    $pconfig['php']['restart'] = array('openvpn_restart_by_id');
-                    $pconfig['php']['start'] = array('openvpn_restart_by_id');
-                    $pconfig['php']['args'] = array('mode', 'id');
-                    $pconfig['pidfile'] = "/var/run/openvpn_{$mode}{$setting['vpnid']}.pid";
-                    $pconfig['id'] = $setting['vpnid'];
-                    $pconfig['name'] = 'openvpn';
-                    $pconfig['mode'] = $mode;
-                    $services[] = $pconfig;
-                }
-            }
-        }
-    }
-
     if (isset($config['load_balancer']['virtual_server']) && isset($config['load_balancer']['lbpool']) && count($config['load_balancer']['virtual_server']) && count($config['load_balancer']['lbpool'])) {
           $pconfig = array();
           $pconfig['name'] = "relayd";