diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 00cf87be7..fdb8aaf69 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -1,8 +1,8 @@
-PLUGIN_NAME=            collectd
-PLUGIN_VERSION=         0.1
-PLUGIN_COMMENT=         Collect system and application performance metrics periodically
-PLUGIN_DEPENDS=         collectd5
-PLUGIN_MAINTAINER=      m.muenz@gmail.com
-PLUGIN_DEVEL=           yes
+PLUGIN_NAME=		collectd
+PLUGIN_VERSION=		0.1
+PLUGIN_COMMENT=		Collect system and application performance metrics periodically
+PLUGIN_DEPENDS=		collectd5
+PLUGIN_MAINTAINER=	m.muenz@gmail.com
+PLUGIN_DEVEL=		yes
 
 .include "../../Mk/plugins.mk"
diff --git a/net-mgmt/collectd/pkg-descr b/net-mgmt/collectd/pkg-descr
index ecc2df166..cfacb9279 100644
--- a/net-mgmt/collectd/pkg-descr
+++ b/net-mgmt/collectd/pkg-descr
@@ -1,6 +1,6 @@
-collectd is a daemon which collects system and application 
-performance metrics periodically and provides mechanisms 
-to store the values in a variety of ways, for example 
+collectd is a daemon which collects system and application
+performance metrics periodically and provides mechanisms
+to store the values in a variety of ways, for example
 in RRD files.
 
 WWW: http://www.collectd.org
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/GeneralController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/GeneralController.php
similarity index 97%
rename from net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/GeneralController.php
rename to net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/GeneralController.php
index 629cc7aca..19d23d810 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/GeneralController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/GeneralController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2017 Michael Muenz
@@ -28,10 +29,10 @@
  *
  */
 
-namespace OPNsense\collectd\Api;
+namespace OPNsense\Collectd\Api;
 
 use \OPNsense\Base\ApiControllerBase;
-use \OPNsense\collectd\General;
+use \OPNsense\Collectd\General;
 use \OPNsense\Core\Config;
 
 class GeneralController extends ApiControllerBase
@@ -46,7 +47,7 @@ class GeneralController extends ApiControllerBase
         }
         return $result;
     }
-    
+
     public function setAction()
     {
         $result = array("result"=>"failed");
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/ServiceController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
similarity index 97%
rename from net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/ServiceController.php
rename to net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
index a8e45e79b..14538d355 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/Api/ServiceController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Copyright (C) 2015 - 2017 Deciso B.V.
  *    Copyright (C) 2017 Michael Muenz
@@ -28,15 +29,15 @@
  *
  */
 
-namespace OPNsense\collectd\Api;
+namespace OPNsense\Collectd\Api;
 
 use \OPNsense\Base\ApiControllerBase;
 use \OPNsense\Core\Backend;
-use \OPNsense\collectd\General;
+use \OPNsense\Collectd\General;
 
 /**
  * Class ServiceController
- * @package OPNsense\collectd
+ * @package OPNsense\Collectd
  */
 class ServiceController extends ApiControllerBase
 {
@@ -145,4 +146,3 @@ class ServiceController extends ApiControllerBase
         }
     }
 }
-
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/GeneralController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
similarity index 91%
rename from net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/GeneralController.php
rename to net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
index ce74a7d76..1bfa88f25 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/GeneralController.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/GeneralController.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
     Copyright (C) 2017 Michael Muenz
     All rights reserved.
@@ -25,14 +26,14 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-namespace OPNsense\collectd;
+namespace OPNsense\Collectd;
 
 class GeneralController extends \OPNsense\Base\IndexController
 {
     public function indexAction()
     {
-        $this->view->title = gettext("collectd settings");
+        $this->view->title = gettext("Collectd settings");
         $this->view->generalForm = $this->getForm("general");
-        $this->view->pick('OPNsense/collectd/general');
+        $this->view->pick('OPNsense/Collectd/general');
     }
 }
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/forms/general.xml b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
similarity index 98%
rename from net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/forms/general.xml
rename to net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
index 1251032aa..0b8515e90 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/collectd/forms/general.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
@@ -3,7 +3,7 @@
         <id>general.enabled</id>
         <label>Enable</label>
         <type>checkbox</type>
-        <help>This will activate the collectd service.</help>
+        <help>This will activate the Collectd service.</help>
     </field>
     <field>
         <id>general.hostname</id>
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/ACL/ACL.xml b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/ACL/ACL.xml
similarity index 83%
rename from net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/ACL/ACL.xml
rename to net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/ACL/ACL.xml
index 3dd4cf422..1b509cfa9 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/ACL/ACL.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/ACL/ACL.xml
@@ -1,6 +1,6 @@
 <acl>
    <page-services-collectd>
-      <name>Services: collectd</name>
+      <name>Services: Collectd</name>
       <patterns>
          <pattern>ui/collectd/*</pattern>
          <pattern>api/collectd/*</pattern>
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.php b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.php
similarity index 97%
rename from net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.php
rename to net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.php
index 858b2ff6b..89b840724 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.php
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.php
@@ -1,7 +1,4 @@
 <?php
-namespace OPNsense\collectd;
-
-use OPNsense\Base\BaseModel;
 
 /*
     Copyright (C) 2017 Michael Muenz
@@ -29,6 +26,10 @@ use OPNsense\Base\BaseModel;
     POSSIBILITY OF SUCH DAMAGE.
 */
 
+namespace OPNsense\Collectd;
+
+use OPNsense\Base\BaseModel;
+
 class General extends BaseModel
 {
 }
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.xml b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
similarity index 98%
rename from net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.xml
rename to net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
index add83445a..96c3ba191 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/General.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/collectd/general</mount>
-    <description>collectd configuration</description>
+    <description>Collectd configuration</description>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/Menu/Menu.xml b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/Menu/Menu.xml
similarity index 100%
rename from net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/collectd/Menu/Menu.xml
rename to net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/Menu/Menu.xml
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/collectd/general.volt b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
similarity index 99%
rename from net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/collectd/general.volt
rename to net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
index 27625a564..9e7f95e56 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/collectd/general.volt
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
@@ -57,4 +57,3 @@ POSSIBILITY OF SUCH DAMAGE.
         });
     });
 </script>
-  
diff --git a/net-mgmt/collectd/src/opnsense/scripts/Collectd/setup.sh b/net-mgmt/collectd/src/opnsense/scripts/Collectd/setup.sh
index 72443b1bd..a91fed675 100644
--- a/net-mgmt/collectd/src/opnsense/scripts/Collectd/setup.sh
+++ b/net-mgmt/collectd/src/opnsense/scripts/Collectd/setup.sh
@@ -2,4 +2,4 @@
 
 mkdir -p /var/db/collectd
 chown -R root:wheel /var/db/collectd
-chmod 750 /var/db/collectd
\ No newline at end of file
+chmod 750 /var/db/collectd
diff --git a/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf b/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
index b5680d7e1..5e2827dce 100644
--- a/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
+++ b/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
@@ -2,28 +2,28 @@
 command:/usr/local/opnsense/scripts/collectd/setup.sh;/usr/local/etc/rc.d/collectd start
 parameters:
 type:script
-message:starting collectd
+message:starting Collectd
 
 [stop]
 command:/usr/local/etc/rc.d/collectd stop; exit 0
 parameters:
 type:script
-message:stopping collectd
+message:stopping Collectd
 
 [restart]
 command:/usr/local/opnsense/scripts/collectd/setup.sh;/usr/local/etc/rc.d/collectd restart
 parameters:
 type:script
-message:restarting collectd
+message:restarting Collectd
 
 [reconfigure]
 command:/usr/local/opnsense/scripts/collectd/setup.sh;/usr/local/etc/rc.d/collectd restart
 parameters:
 type:script
-message:reconfigure collectd
+message:reconfigure Collectd
 
 [status]
 command:/usr/local/etc/rc.d/collectd status;exit 0
 parameters:
 type:script_output
-message:request collectd status
+message:request Collectd status
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/+TARGETS b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/+TARGETS
similarity index 100%
rename from net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/+TARGETS
rename to net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/+TARGETS
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd
new file mode 100644
index 000000000..5eff48b5a
--- /dev/null
+++ b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd
@@ -0,0 +1,6 @@
+{% if helpers.exists('OPNsense.collectd.general.enabled') and OPNsense.collectd.general.enabled == '1' %}
+collectd_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh"
+collectd_enable="YES"
+{% else %}
+collectd_enable="NO"
+{% endif %}"
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/collectd.conf b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
similarity index 100%
rename from net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/collectd.conf
rename to net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/collectd b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/collectd
deleted file mode 100644
index 2f8a9c7c9..000000000
--- a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/collectd/collectd
+++ /dev/null
@@ -1 +0,0 @@
-collectd_enable="{% if helpers.exists('OPNsense.collectd.general.enabled') and OPNsense.collectd.general.enabled == '1' %}YES{% else %}NO{% endif %}"