diff --git a/modules/services/x11/xserver.nix b/modules/services/x11/xserver.nix
index c918d813e29..da29faabcfd 100644
--- a/modules/services/x11/xserver.nix
+++ b/modules/services/x11/xserver.nix
@@ -384,16 +384,15 @@ in
     environment.pathsToLink =
       [ "/etc/xdg" "/share/xdg" "/share/applications" "/share/icons" "/share/pixmaps" ];
 
-    jobs.check_for_xserver_start =
+    jobs."xserver-start-check" =
       { startOn = if cfg.autorun then "filesystem and stopped udevtrigger" else "";
         stopOn = "";
         task = true;
-        script = "grep -qv noX11 /proc/cmdline && initctl emit start_xserver || true";
+        script = "grep -qv noX11 /proc/cmdline && start xserver || true";
       };
 
     jobs.xserver =
-      { startOn = "start_xserver";
-        environment =
+      { environment =
           { FONTCONFIG_FILE = "/etc/fonts/fonts.conf"; # !!! cleanup
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
             TZ = config.time.timeZone;
diff --git a/modules/tasks/scsi-link-power-management.nix b/modules/tasks/scsi-link-power-management.nix
index 13b9eca53cb..263acb8f321 100644
--- a/modules/tasks/scsi-link-power-management.nix
+++ b/modules/tasks/scsi-link-power-management.nix
@@ -24,7 +24,7 @@ with pkgs.lib;
 
   config = mkIf (config.powerManagement.scsiLinkPolicy != "") {
 
-    jobs.scsilinkpmpolicy =
+    jobs."scsi-link-pm" =
       { description = "Set SCSI link power management policy";
 
         startOn = "started udev";