diff --git a/Make.inc.in b/Make.inc.in
index 0b2cd74de8..a655a3e03b 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -98,7 +98,7 @@ LDFLAGS		= $(OPENSSL_LDFLAGS) $(TALLOC_LDFLAGS) @LDFLAGS@
 
 LOGDIR		= ${logdir}
 RADDBDIR	= ${raddbdir}
-RUNDIR		= ${localstatedir}/run/radiusd
+RUNDIR		= ${localstatedir}/run/freeradius
 SBINDIR		= ${sbindir}
 RADIR		= ${radacctdir}
 LIBRADIUS	= $(top_builddir)/src/lib/$(LIBPREFIX)freeradius-radius.la $(TALLOC_LIBS)
diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 74dfdfd792..21f6ede91a 100644
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -91,7 +91,7 @@ radacctdir = @radacctdir@
 
 #
 #  name of the running server.  See also the "-n" command-line option.
-name = radiusd
+name = freeradius
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
@@ -447,8 +447,8 @@ security {
 	#  member.  This can allow for some finer-grained access
 	#  controls.
 	#
-#	user = radius
-#	group = radius
+	user = freerad
+	group = freerad
 
 	#  Core dumps are a bad thing.  This should only be set to
 	#  'yes' if you're debugging a problem with the server.
diff --git a/raddb/sites-available/control-socket b/raddb/sites-available/control-socket
index 97ba9ef972..17b9f69596 100644
--- a/raddb/sites-available/control-socket
+++ b/raddb/sites-available/control-socket
@@ -72,12 +72,12 @@ listen {
 	#
 	#  Name of user that is allowed to connect to the control socket.
 	#
-#	uid = radius
+#	uid = freerad
 
 	#
 	#  Name of group that is allowed to connect to the control socket.
 	#
-#	gid = radius
+#	gid = freerad
 
 	#
 	#  Access mode.
diff --git a/scripts/monit/freeradius.monitrc b/scripts/monit/freeradius.monitrc
index 65f96cf901..b5ae55ae23 100644
--- a/scripts/monit/freeradius.monitrc
+++ b/scripts/monit/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
diff --git a/src/main/radiusd.c b/src/main/radiusd.c
index 4f64184210..9440b2c465 100644
--- a/src/main/radiusd.c
+++ b/src/main/radiusd.c
@@ -102,7 +102,6 @@ int main(int argc, char *argv[])
 	bool display_version = false;
 	int flag = 0;
 	int from_child[2] = {-1, -1};
-	char *p;
 	fr_state_t *state = NULL;
 
 	/*
@@ -137,13 +136,7 @@ int main(int argc, char *argv[])
 	main_config.myip.af = AF_UNSPEC;
 	main_config.port = 0;
 	main_config.daemonize = true;
-
-	p = strrchr(argv[0], FR_DIR_SEP);
-	if (!p) {
-		main_config.name = argv[0];
-	} else {
-		main_config.name = p + 1;
-	}
+	main_config.name = "radiusd";
 
 	/*
 	 *	Don't put output anywhere until we get told a little