diff --git a/security/tinc/Makefile b/security/tinc/Makefile
index 0c4a40ed6..70be98fc1 100644
--- a/security/tinc/Makefile
+++ b/security/tinc/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		tinc
 PLUGIN_VERSION=		1.2
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Tinc VPN
 PLUGIN_DEPENDS=		tinc
 PLUGIN_MAINTAINER=	ad@opnsense.org
diff --git a/security/tinc/src/etc/rc.d/opnsense-tincd b/security/tinc/src/etc/rc.d/opnsense-tincd
index 25ccd6622..57fbc959b 100755
--- a/security/tinc/src/etc/rc.d/opnsense-tincd
+++ b/security/tinc/src/etc/rc.d/opnsense-tincd
@@ -2,32 +2,32 @@
 #
 # $FreeBSD$
 #
-# PROVIDE: tincd
+# PROVIDE: ostincd
 # REQUIRE: SERVERS
 # KEYWORD: shutdown
 #
 
 . /etc/rc.subr
 
-name=opnsensetincd
+name=ostincd
 
-stop_cmd=tincd_stop
-start_cmd=tincd_start
-rcvar=OPNtincd_enable
+stop_cmd=ostincd_stop
+start_cmd=ostincd_start
+rcvar=ostincd_enable
 
 load_rc_config $name
 
-[ -z "$OPNtincd_enable" ] && OPNtincd_enable="NO"
+[ -z "$ostincd_enable" ] && ostincd_enable="NO"
 
 # stop tincd
-tincd_stop()
+ostincd_stop()
 {
 	echo "stopping tincd"
 	/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py stop
 }
 
 # start tincd
-tincd_start()
+ostincd_start()
 {
 	echo "starting tincd"
 	/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py start
diff --git a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/+TARGETS b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/+TARGETS
index e7221bfb2..bcc05dd49 100644
--- a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/+TARGETS
+++ b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/+TARGETS
@@ -1,2 +1,2 @@
 tinc_deploy.xml:/usr/local/etc/tinc_deploy.xml
-rc.conf.d:/etc/rc.conf.d/opnsensetincd
+rc.conf.d:/etc/rc.conf.d/opnsense-tincd
diff --git a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
index ade8376cd..d59a0b81f 100644
--- a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
+++ b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
@@ -5,7 +5,7 @@
 {%   endif %}
 {% endfor %}
 {% if networks|length > 0 %}
-OPNtincd_enable=YES
+ostincd_enable=YES
 {% else %}
-OPNtincd_enable=NO
+ostincd_enable=NO
 {% endif %}