diff --git a/lib/Vyatta/Siproxd.pm b/lib/Vyatta/Siproxd.pm
index 9c982c1..ece6a1b 100644
--- a/lib/Vyatta/Siproxd.pm
+++ b/lib/Vyatta/Siproxd.pm
@@ -1,5 +1,5 @@
 #
-# Module: Vyatta::Netflow.pm
+# Module: Vyatta::Siproxd.pm
 # 
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -11,13 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2008-2009 Vyatta, Inc.
+# This code was originally developed by Managed I.T.
+# Portions created by Managed I.T. are Copyright (C) 2010 Managed I.T.
 # All Rights Reserved.
 # 
-# Author: Stig Thormodsrud
-# Date: June 2009
-# Description: Common netflow definitions/funcitions
+# Author: Kiall Mac Innes
+# Date: May 2010
+# Description: Common Siproxd definitions/funcitions
 # 
 # **** End License ****
 #
diff --git a/scripts/system/siproxd-config.pl b/scripts/system/siproxd-config.pl
index 861bce0..3cd008d 100644
--- a/scripts/system/siproxd-config.pl
+++ b/scripts/system/siproxd-config.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Module: siproxd-config.pl
+# Module: Vyatta::Siproxd.pm
 # 
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -11,13 +11,13 @@
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2008-2010 Vyatta, Inc.
+#
+# This code was originally developed by Managed I.T.
+# Portions created by Managed I.T. are Copyright (C) 2010 Managed I.T.
 # All Rights Reserved.
 # 
 # Author: Kiall Mac Innes
-# Date: April 2010
+# Date: May 2010
 # Description: Script to configure sip proxy (siproxd).
 # 
 # **** End License ****
@@ -44,7 +44,7 @@
 );
 
 if ($setup_siproxd) {
-	# TODO: Change from PREROUTING to VYATTA_PRE_DNAT_HOOK
+	# TODO: Change from PREROUTING to VYATTA_PRE_DNAT_HOOK after kenwood
 	system("sudo iptables -t nat -N SIPROXD");
 	system("sudo iptables -t nat -I PREROUTING 1 -j SIPROXD");
 	exit 0;
@@ -55,7 +55,7 @@
 }
 
 if ($stop_siproxd) {
-	# TODO: Change from PREROUTING to VYATTA_PRE_DNAT_HOOK
+	# TODO: Change from PREROUTING to VYATTA_PRE_DNAT_HOOK after kenwood
 	system("sudo iptables -t nat -D PREROUTING -j SIPROXD");
 	system("sudo iptables -t nat -F SIPROXD");
 	system("sudo iptables -t nat -X SIPROXD");
diff --git a/scripts/system/siproxd-interface-config.pl b/scripts/system/siproxd-interface-config.pl
index ae79042..c73b8c1 100644
--- a/scripts/system/siproxd-interface-config.pl
+++ b/scripts/system/siproxd-interface-config.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Module: siproxd-interface-config.pl
+# Module: Vyatta::Siproxd.pm
 # 
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -11,13 +11,13 @@
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2008-2010 Vyatta, Inc.
+#
+# This code was originally developed by Managed I.T.
+# Portions created by Managed I.T. are Copyright (C) 2010 Managed I.T.
 # All Rights Reserved.
 # 
 # Author: Kiall Mac Innes
-# Date: April 2010
+# Date: May 2010
 # Description: Script to configure sip proxy (siproxd).
 # 
 # **** End License ****
diff --git a/scripts/system/siproxd.init b/scripts/system/siproxd.init
deleted file mode 100644
index 11f1f9b..0000000
--- a/scripts/system/siproxd.init
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-. /lib/lsb/init-functions
-
-CONFIGFILE=/opt/vyatta/etc/siproxd.conf
-PIDFILE=/var/run/siproxd.pid
-
-start() {
-	if [ ! -f "$CONFIGFILE" ]; then
-	  log_failure_msg "Cannot start the SIP Proxy because configuration file $CONFIGFILE is absent."
-	  exit 1
-	fi
-}
-
-stop() {
-	if [ -f "$PIDFILE" ]; then
-	  PID=`cat $PIDFILE` 
-	  if [ -n "$PID" ]; then 
-	    OUTPUT=`start-stop-daemon -q --stop --pidfile $PIDFILE 2>&1`
-
-# Commenting out verification loop for now.  Process goes into zombie state only on
-# system startup.  This causes a loop greater that 20 seconds which forces rtrmgr
-# to commit suicide.	    
-#	    while [ -d "/proc/$PID" ]; do
-#	      sleep 1
-#	    done
-	  fi
-	  rm -f $PIDFILE
-	fi
-	
-}
-
-restart () {
-	if [ -f "$PIDFILE" ]; then 
-	  PID=`cat $PIDFILE`
-	fi
-
-        if [ -n "$PID" ] && [ -d "/proc/$PID" ]; then
-	  OUTPUT=`kill -HUP $PID`
-	else
- 	  start
-        fi
-}
-
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		stop
-		start
-		# note I am disabling restart because no sig will cause dnsmasq to re-read it's config file.
-		# this is not good since I think it loses it's cache file on complete restart.
-		# maybe we can fix this when we shift away from dnsmasq.  Hence I leave the original code
-		# in this file
-		# restart
-		;;
-	*)
-		log_failure_msg "usage: $0 {start|stop|restart}"
-		exit 1
-		;;
-esac
-
-exit 0