diff --git a/doc/guix.texi b/doc/guix.texi
index 7dd66a86ab5336754806b5c6358973186a1f93b1..d126dd3ec3a23a01c0aa9f0573876f440c5402ad 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9783,10 +9783,11 @@ extend it by passing it lists of packages to add to the system profile.
 
 @cindex PID 1
 @cindex init system
-The @code{(gnu services dmd)} provides a way to define services managed
-by the GNU@tie{}Shepherd, which is GuixSD initialization system---the
-first process that is started when the system boots, aka. PID@tie{}1
-(@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}).
+The @code{(gnu services shepherd)} provides a way to define services
+managed by the GNU@tie{}Shepherd, which is GuixSD initialization
+system---the first process that is started when the system boots,
+aka. PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd
+Manual}).
 
 Services in the Shepherd can depend on each other.  For instance, the
 SSH daemon may need to be started after the syslog daemon has been
diff --git a/gnu-system.am b/gnu-system.am
index 19f7ca77acda01916539278c1e6853f0cbb4abdd..94526079a58f6ddacbb92b2fe62a1c90c9bd03f4 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -362,10 +362,10 @@ GNU_SYSTEM_MODULES =				\
   gnu/services/databases.scm			\
   gnu/services/dbus.scm				\
   gnu/services/desktop.scm			\
-  gnu/services/dmd.scm				\
   gnu/services/lirc.scm				\
   gnu/services/mail.scm				\
   gnu/services/networking.scm			\
+  gnu/services/shepherd.scm			\
   gnu/services/ssh.scm				\
   gnu/services/web.scm				\
   gnu/services/xorg.scm				\
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 909abeffe68dfcfe80b2615fcc8fa99fceb9f264..d458042365fa760aa4297323047169c318a0724b 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -19,7 +19,7 @@
 (define-module (gnu services avahi)
   #:use-module (gnu services)
   #:use-module (gnu services base)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services dbus)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages avahi)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 6483a66b5ad2388054fbc1d9198ef90e04185f0c..10df9270d90ea0cb00408dda8f8e0354813b467b 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -22,7 +22,7 @@
 (define-module (gnu services base)
   #:use-module (guix store)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services networking)
   #:use-module (gnu system pam)
   #:use-module (gnu system shadow)                ; 'user-account', etc.
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 8fdd222a3bf90899fa487fc4f10b8b9c8682b12a..c85606e62d8d60f35ad74e7f46155d1fe21ea1fe 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu services databases)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages databases)
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 9b0d198683180496f602e8901eb79a09bc4611f5..3e5fa14a38e833b529ee391fa0d86bc39bbfcd31 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu services dbus)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module ((gnu packages glib) #:select (dbus/activation))
   #:use-module (gnu packages admin)
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 694a8eda7e958c698240304aba62ebe76fc0b9b7..e6d323270e78ffd30323b3f50b748ac375df8b39 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -20,7 +20,7 @@
 
 (define-module (gnu services desktop)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
   #:use-module (gnu services dbus)
   #:use-module (gnu services avahi)
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index 6ae622579d7ace2917ebabec831946a336e003f1..bfaca9b8531fe4d1ce056b5971d24c989fb40b30 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu services lirc)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages lirc)
   #:use-module (guix gexp)
   #:use-module (guix records)
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index f49a4a43418e06bcf2811bd83d7f12f4fb26532a..181693aeba39600ae0b840eaf4b2d6691ff27391 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -21,7 +21,7 @@
 (define-module (gnu services mail)
   #:use-module (gnu services)
   #:use-module (gnu services base)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages mail)
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index ce21b1d9ff866b6eb88dba2f9865f7e5d09f2ecb..bce1778b5bb7d23ba7e69f195d5995c55ed747a1 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu services networking)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services dbus)
   #:use-module (gnu system shadow)
   #:use-module (gnu system pam)
diff --git a/gnu/services/dmd.scm b/gnu/services/shepherd.scm
similarity index 99%
rename from gnu/services/dmd.scm
rename to gnu/services/shepherd.scm
index 828d781e4a74e1ed948c27494e8c9dfa99931c7e..a33985efa1e492171dfa502ec7fa173b1497a5cf 100644
--- a/gnu/services/dmd.scm
+++ b/gnu/services/shepherd.scm
@@ -16,7 +16,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu services dmd)
+(define-module (gnu services shepherd)
   #:use-module (guix ui)
   #:use-module (guix sets)
   #:use-module (guix gexp)
@@ -272,4 +272,4 @@ (define edges
   (lambda (service)
     (vhash-foldq* cons '() service edges)))
 
-;;; dmd.scm ends here
+;;; shepherd.scm ends here
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 4b0380e8fd56114ebbdb12516eb1705ecad444c3..d6365023cef61dcb8c3bd596eb552f748bdfbca9 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -20,7 +20,7 @@ (define-module (gnu services ssh)
   #:use-module (guix gexp)
   #:use-module (guix records)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module (gnu packages lsh)
   #:use-module (srfi srfi-26)
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index 84bb30d8fd0921ebdfec00762fd6e024d6ade37f..bc0aa62a352a51eb28326180394fb831c77cc43e 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu services web)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages web)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index 7fea6829d5a3f8e084cd297c24c4eac8ae429701..4b81bd90d4de42df7e510562004f47bc6ed25272 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -20,7 +20,7 @@
 (define-module (gnu services xorg)
   #:use-module (gnu artwork)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu system pam)
   #:use-module ((gnu packages base) #:select (canonical-package))
   #:use-module (gnu packages guile)
diff --git a/gnu/system.scm b/gnu/system.scm
index 024518445d258db47511056570d468623ef85768..97103a99929718410c744722e8632a10b015148f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -44,7 +44,7 @@ (define-module (gnu system)
   #:use-module (gnu packages firmware)
   #:autoload   (gnu packages cryptsetup) (cryptsetup)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu services base)
   #:use-module (gnu system grub)
   #:use-module (gnu system shadow)
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index 887bceb1552cac04ab9fc73be3e0b44d5eb6df71..fcbb630517b9c084c52c3dbd43e013daf4204c2f 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -24,7 +24,7 @@ (define-module (gnu system install)
   #:use-module (guix monads)
   #:use-module ((guix store) #:select (%store-prefix))
   #:use-module (guix profiles)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages linux)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 564ed02d5971831edd1a557e530f71ce6fec0d54..3f368ca55f0ccba0a2b3dd3e5f350fa799df5755 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -40,7 +40,7 @@ (define-module (guix scripts system)
   #:use-module (gnu system vm)
   #:use-module (gnu system grub)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (gnu packages grub)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-19)
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index bf654166383a1e9b307d4e8c30290e2917454101..27cc64929d5adf3c7c108f1bbca4037212bfa2c0 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -3,7 +3,7 @@
 gnu/packages.scm
 gnu/services.scm
 gnu/system.scm
-gnu/services/dmd.scm
+gnu/services/shepherd.scm
 gnu/system/shadow.scm
 guix/scripts.scm
 guix/scripts/build.scm
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 02e2524d9e9136324d2ac9b0ff4687cb9b11b4d8..cd135b9a8867ec9515535e1433425c5c3b878f6c 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -114,10 +114,10 @@ else
     grep "service 'networking'.*more than once" "$errorfile"
 fi
 
-# Reporting unmet dmd requirements.
+# Reporting unmet shepherd requirements.
 
 cat > "$tmpfile" <<EOF
-(use-modules (gnu) (gnu services dmd))
+(use-modules (gnu) (gnu services shepherd))
 (use-service-modules networking)
 
 (define buggy-service-type
diff --git a/tests/services.scm b/tests/services.scm
index 7d2e31b3a94cf7c947636370463db985c97bca1f..ab8f293c43841d6308484512f167ebc6cac68982 100644
--- a/tests/services.scm
+++ b/tests/services.scm
@@ -18,7 +18,7 @@
 
 (define-module (test-services)
   #:use-module (gnu services)
-  #:use-module (gnu services dmd)
+  #:use-module (gnu services shepherd)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-34)