diff --git a/pbs-mom.service b/pbs_mom.service
similarity index 100%
rename from pbs-mom.service
rename to pbs_mom.service
diff --git a/pbs-sched.service b/pbs_sched.service
similarity index 100%
rename from pbs-sched.service
rename to pbs_sched.service
diff --git a/pbs-server.service b/pbs_server.service
similarity index 100%
rename from pbs-server.service
rename to pbs_server.service
diff --git a/torque.spec b/torque.spec
index 762fbfd..c80f92d 100644
--- a/torque.spec
+++ b/torque.spec
@@ -80,9 +80,9 @@ Source4:     xpbs.png
 Source5:     xpbsmon.png
 Source6:     README.Fedora
 Source8:     config
-Source20:    pbs-mom.service
-Source21:    pbs-sched.service
-Source22:    pbs-server.service
+Source20:    pbs_mom.service
+Source21:    pbs_sched.service
+Source22:    pbs_server.service
 Source23:    trqauthd.service
 # Feb 3rd 2011, I've sent a mail upstream to request the re-inclusion
 # of the OpenPBS license file in distribution.
@@ -408,9 +408,9 @@ install -p -m 644 %{SOURCE23} %{buildroot}%{_unitdir}/
 %else
 # install initscripts
 mkdir -p %{buildroot}%{_initrddir}
-install -p -m 755 contrib/init.d/pbs_mom   %{buildroot}%{_initrddir}/pbs-mom
-install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs-sched
-install -p -m 755 contrib/init.d/pbs_server   %{buildroot}%{_initrddir}/pbs-server
+install -p -m 755 contrib/init.d/pbs_mom   %{buildroot}%{_initrddir}/pbs_mom
+install -p -m 755 contrib/init.d/pbs_sched %{buildroot}%{_initrddir}/pbs_sched
+install -p -m 755 contrib/init.d/pbs_server   %{buildroot}%{_initrddir}/pbs_server
 install -p -m 755 contrib/init.d/trqauthd   %{buildroot}%{_initrddir}/trqauthd
 %endif
 
@@ -567,52 +567,52 @@ fi
 
 %post mom
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-mom.service
+%systemd_post pbs_mom.service
 %else
-/sbin/chkconfig --add pbs-mom
+/sbin/chkconfig --add pbs_mom
 %endif
 
 %preun mom
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-mom.service
+%systemd_preun pbs_mom.service
 %else
 if [ $1 -eq 0 ]; then
-   /sbin/service pbs-mom stop >/dev/null 2>&1
-   /sbin/chkconfig --del pbs-mom
+   /sbin/service pbs_mom stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_mom
 fi
 %endif
 
 %post scheduler
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-sched.service
+%systemd_post pbs_sched.service
 %else
-/sbin/chkconfig --add pbs-sched
+/sbin/chkconfig --add pbs_sched
 %endif
 
 %preun scheduler
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-sched.service
+%systemd_preun pbs_sched.service
 %else
 if [ $1 -eq 0 ]; then
-   /sbin/service pbs-sched stop >/dev/null 2>&1
-   /sbin/chkconfig --del pbs-sched
+   /sbin/service pbs_sched stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_sched
 fi
 %endif
 
 %post server
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_post pbs-server.service
+%systemd_post pbs_server.service
 %else
-/sbin/chkconfig --add pbs-server
+/sbin/chkconfig --add pbs_server
 %endif
 
 %preun server
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%systemd_preun pbs-server.service
+%systemd_preun pbs_server.service
 %else
 if [ $1 -eq 0 ]; then
-   /sbin/service pbs-server stop >/dev/null 2>&1
-   /sbin/chkconfig --del pbs-server
+   /sbin/service pbs_server stop >/dev/null 2>&1
+   /sbin/chkconfig --del pbs_server
 fi
 %endif
 
@@ -775,9 +775,9 @@ fi
 %{_sbindir}/pbs_demux
 %{_bindir}/pbs_track
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-mom.service
+%{_unitdir}/pbs_mom.service
 %else
-%{_initrddir}/pbs-mom
+%{_initrddir}/pbs_mom
 %endif
 %if %{use_rcp}
 %attr(4755, root, root) %{_sbindir}/pbs_rcp
@@ -801,9 +801,9 @@ fi
 %attr(0755, root, root) %{_sbindir}/pbs_sched
 %{_sbindir}/qschedd
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-sched.service
+%{_unitdir}/pbs_sched.service
 %else
-%{_initrddir}/pbs-sched
+%{_initrddir}/pbs_sched
 %endif
 %dir %{torquehomedir}/sched_priv
 %config(noreplace) %{torquehomedir}/sched_priv/*
@@ -826,10 +826,10 @@ fi
 %attr(0755, root, root) %{_sbindir}/trqauthd
 %{_sbindir}/qserverd
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
-%{_unitdir}/pbs-server.service
+%{_unitdir}/pbs_server.service
 %{_unitdir}/trqauthd.service
 %else
-%{_initrddir}/pbs-server
+%{_initrddir}/pbs_server
 %{_initrddir}/trqauthd
 %endif
 %dir %{_var}/log/torque/server_logs