diff --git a/conf/solaris/smf/svc-puppetd b/conf/solaris/smf/svc-puppetd
index 9036b505c..b6cf05736 100755
--- a/conf/solaris/smf/svc-puppetd
+++ b/conf/solaris/smf/svc-puppetd
@@ -1,66 +1,66 @@
 #!/bin/sh
 # This is the /etc/init.d file for puppetd
 # Modified for CSW
 #
 # description: puppetd - Puppet Automation Client
 #
 
 . /lib/svc/share/smf_include.sh
 
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetd.pid
+pidfile=/var/lib/puppet/run/agent.pid
 
 case "$1" in
 start)
     cd /
     # Start daemons.
 
     printf "Starting Puppet client services:"
 
     /opt/csw/sbin/puppetd
 
     printf " puppetd"
     echo ""
     ;;
 stop)
     printf "Stopping Puppet client services:"
     kill `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet client services:"
     kill -HUP `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 reload)
     printf "Reloading Puppet client services:"
 
     kill -HUP `cat $pidfile`
 
     printf " puppetd"
     echo ""
     ;;
 status)
     if [ -f $pidfile ]; then
         pid=`cat $pidfile`
         curpid=`pgrep puppetd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0
         else
             exit 1
         fi
     else
         exit 1
     fi
 esac
 exit 0
 
 # $Id$
diff --git a/conf/solaris/smf/svc-puppetmasterd b/conf/solaris/smf/svc-puppetmasterd
index 34f5a62e6..80e3d464a 100755
--- a/conf/solaris/smf/svc-puppetmasterd
+++ b/conf/solaris/smf/svc-puppetmasterd
@@ -1,62 +1,62 @@
 #!/bin/sh
 #
 
 . /lib/svc/share/smf_include.sh
 
 prefix=/opt/csw
 exec_prefix=/opt/csw
 sysconfdir=/opt/csw/etc
 sbindir=/opt/csw/sbin
 
-pidfile=/var/lib/puppet/run/puppetmasterd.pid
+pidfile=/var/lib/puppet/run/master.pid
 
 case "$1" in
 start)
     cd /
     # Start daemons.
 
     printf "Starting Puppet server services:"
 
     /opt/csw/sbin/puppetmasterd
 
     printf " puppetmaster"
     echo ""
     ;;
 stop)
     printf "Stopping Puppet server services:"
     kill `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 restart)
     printf "Restarting Puppet server services:"
     kill -HUP `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 reload)
     printf "Reloading Puppet server services:"
 
     kill -HUP `cat $pidfile`
 
     printf " puppetmasterd"
     echo ""
     ;;
 status)
     if [ -f $pidfile ]; then
         pid=`cat $pidfile`
         curpid=`pgrep puppetmasterd`
         if [ "$pid" -eq "$curpid" ]; then
             exit 0
         else
             exit 1
         fi
     else
         exit 1
     fi
 esac
 exit 0
 
 # $Id$