diff --git a/man/systemd-dissect.xml b/man/systemd-dissect.xml
index 06c57a22ec..eac50bffde 100644
--- a/man/systemd-dissect.xml
+++ b/man/systemd-dissect.xml
@@ -274,9 +274,9 @@
         <term><option>--discover</option></term>
 
         <listitem><para>Show a list of DDIs in well-known directories. This will show machine, portable
-        service and system extension disk images in the usual directories
+        service and system/configuration extension disk images in the usual directories
         <filename>/usr/lib/machines/</filename>, <filename>/usr/lib/portables/</filename>,
-        <filename>/usr/lib/extensions/</filename>, <filename>/var/lib/machines/</filename>,
+        <filename>/usr/lib/confexts/</filename>, <filename>/var/lib/machines/</filename>,
         <filename>/var/lib/portables/</filename>, <filename>/var/lib/extensions/</filename> and so
         on.</para></listitem>
       </varlistentry>
diff --git a/units/systemd-confext.service b/units/systemd-confext.service
index b9d0b21508..3b46ecae08 100644
--- a/units/systemd-confext.service
+++ b/units/systemd-confext.service
@@ -26,7 +26,8 @@ Before=shutdown.target initrd-switch-root.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=systemd-confext merge
+ExecStart=systemd-confext refresh
+ExecReload=systemd-confext refresh
 ExecStop=systemd-confext unmerge
 
 [Install]
diff --git a/units/systemd-sysext.service b/units/systemd-sysext.service
index 9a8d4ebc5f..117591e897 100644
--- a/units/systemd-sysext.service
+++ b/units/systemd-sysext.service
@@ -25,7 +25,8 @@ Before=shutdown.target initrd-switch-root.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=systemd-sysext merge
+ExecStart=systemd-sysext refresh
+ExecReload=systemd-sysext refresh
 ExecStop=systemd-sysext unmerge
 
 [Install]