diff --git a/man/rules/meson.build b/man/rules/meson.build
index e8c5a967ad..8fc158bd91 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -23,7 +23,6 @@ manpages = [
  ['hostname', '5', [], ''],
  ['hostnamectl', '1', [], 'ENABLE_HOSTNAMED'],
  ['hwdb', '7', [], 'ENABLE_HWDB'],
- ['initrd-battery-check.service', '8', ['systemd-battery-check'], ''],
  ['integritytab', '5', [], 'HAVE_LIBCRYPTSETUP'],
  ['iocost.conf', '5', [], ''],
  ['journal-remote.conf', '5', ['journal-remote.conf.d'], 'HAVE_MICROHTTPD'],
@@ -889,6 +888,7 @@ manpages = [
   ''],
  ['systemd-ask-password', '1', [], ''],
  ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'],
+ ['systemd-battery-check.service', '8', ['systemd-battery-check'], ''],
  ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'],
  ['systemd-bless-boot-generator', '8', [], 'ENABLE_BOOTLOADER'],
  ['systemd-bless-boot.service',
diff --git a/man/initrd-battery-check.service.xml b/man/systemd-battery-check.service.xml
similarity index 83%
rename from man/initrd-battery-check.service.xml
rename to man/systemd-battery-check.service.xml
index 582b2269fb..2d9005696e 100644
--- a/man/initrd-battery-check.service.xml
+++ b/man/systemd-battery-check.service.xml
@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="initrd-battery-check.service" xmlns:xi="http://www.w3.org/2001/XInclude">
+<refentry id="systemd-battery-check.service" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>
     <title>systemd-battery-check</title>
@@ -11,18 +11,18 @@
   </refentryinfo>
 
   <refmeta>
-    <refentrytitle>initrd-battery-check.service</refentrytitle>
+    <refentrytitle>systemd-battery-check.service</refentrytitle>
     <manvolnum>8</manvolnum>
   </refmeta>
 
   <refnamediv>
-    <refname>initrd-battery-check.service</refname>
+    <refname>systemd-battery-check.service</refname>
     <refname>systemd-battery-check</refname>
     <refpurpose>Check battery level whether there's enough charge, and power off if not.</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
-    <para><filename>initrd-battery-check.service</filename></para>
+    <para><filename>systemd-battery-check.service</filename></para>
     <cmdsynopsis>
       <command>/usr/lib/systemd/systemd-battery-check</command>
       <arg choice="opt" rep="repeat">OPTIONS</arg>
@@ -33,7 +33,7 @@
     <title>Description</title>
 
     <para>
-      <filename>initrd-battery-check.service</filename> is used to check the battery level during the early
+      <filename>systemd-battery-check.service</filename> is used to check the battery level during the early
       boot stage to determine whether there's sufficient battery power to carry on with the booting process.
     </para>
     <para>
diff --git a/units/meson.build b/units/meson.build
index a552dd6c3f..5161ec5029 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -56,8 +56,9 @@ units = [
           'conditions' : ['ENABLE_HIBERNATE'],
         },
         {
-          'file' : 'initrd-battery-check.service.in',
+          'file' : 'systemd-battery-check.service.in',
           'conditions' : ['ENABLE_INITRD'],
+          'symlinks' : ['initrd.target.wants/'],
         },
         {
           'file' : 'initrd-cleanup.service',
diff --git a/units/initrd-battery-check.service.in b/units/systemd-battery-check.service.in
similarity index 83%
rename from units/initrd-battery-check.service.in
rename to units/systemd-battery-check.service.in
index 052586f3c7..3de8ba1d8e 100644
--- a/units/initrd-battery-check.service.in
+++ b/units/systemd-battery-check.service.in
@@ -9,10 +9,11 @@
 
 [Unit]
 Description=Check battery level during early boot
-Documentation=man:initrd-battery-check.service(8)
+Documentation=man:systemd-battery-check.service(8)
 DefaultDependencies=no
 AssertPathExists=/etc/initrd-release
-Before=local-fs-pre.target
+After=plymouth-start.service
+Before=initrd-root-device.target
 
 [Service]
 Type=oneshot