--- old/Make.inc.in
+++ new/Make.inc.in
@@ -48,7 +48,7 @@
 
 LOGDIR		= ${logdir}
 RADDBDIR	= ${raddbdir}
-RUNDIR		= ${localstatedir}/run/radiusd
+RUNDIR		= ${localstatedir}/run/freeradius
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 
--- old/raddb/radiusd.conf.in
+++ new/raddb/radiusd.conf.in
@@ -62,7 +62,7 @@

 #
 #  name of the running server.  See also the "-n" command-line option.
-name = radiusd
+name = freeradius

 #  Location of config and logfiles.
 confdir = ${raddbdir}
@@ -164,8 +164,8 @@
 #  It will join all groups where "user" is a member.  This can allow
 #  for some finer-grained access controls.
 #
-#user = radius
-#group = radius
+user = freerad
+group = freerad

 #  max_request_time: The maximum time (in seconds) to handle a request.
 #
--- a/scripts/freeradius.monitrc
+++ b/scripts/freeradius.monitrc
@@ -8,9 +8,9 @@
 #  Totalmem limit should be lowered to 200.0 if none of the 
 #  interpreted language modules or rlm_cache are being used.
 #
-check process radiusd with pidfile /var/run/radiusd/radiusd.pid
-   start program = "/etc/init.d/radiusd start"
-   stop program = "/etc/init.d/radiusd stop"
+check process freeradius with pidfile /var/run/freeradius/freeradius.pid
+   start program = "/etc/init.d/freeradius start"
+   stop program = "/etc/init.d/freeradius stop"
    if failed host 127.0.0.1 port 1812 type udp protocol radius secret testing123 then alert
    if failed host 127.0.0.1 port 1813 type udp protocol radius secret testing123 then alert
    if cpu > 95% for 2 cycles then alert


