diff --git a/meson.build b/meson.build
index 217b17423b..889669b5d2 100644
--- a/meson.build
+++ b/meson.build
@@ -2272,8 +2272,8 @@ executable(
 if conf.get('HAVE_LIBCRYPTSETUP') == 1
         systemd_cryptsetup_sources = files('''
                 src/cryptsetup/cryptsetup-pkcs11.h
-                src/cryptsetup/cryptsetup-util.c
-                src/cryptsetup/cryptsetup-util.h
+                src/cryptsetup/cryptsetup-keyfile.c
+                src/cryptsetup/cryptsetup-keyfile.h
                 src/cryptsetup/cryptsetup.c
 '''.split())
 
diff --git a/src/cryptsetup/cryptsetup-util.c b/src/cryptsetup/cryptsetup-keyfile.c
similarity index 99%
rename from src/cryptsetup/cryptsetup-util.c
rename to src/cryptsetup/cryptsetup-keyfile.c
index 8ae70a5d10..ebf4cb1b6b 100644
--- a/src/cryptsetup/cryptsetup-util.c
+++ b/src/cryptsetup/cryptsetup-keyfile.c
@@ -2,7 +2,7 @@
 
 #include <unistd.h>
 
-#include "cryptsetup-util.h"
+#include "cryptsetup-keyfile.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "memory-util.h"
diff --git a/src/cryptsetup/cryptsetup-util.h b/src/cryptsetup/cryptsetup-keyfile.h
similarity index 100%
rename from src/cryptsetup/cryptsetup-util.h
rename to src/cryptsetup/cryptsetup-keyfile.h
diff --git a/src/cryptsetup/cryptsetup-pkcs11.c b/src/cryptsetup/cryptsetup-pkcs11.c
index 642a1b7d11..bbc0122002 100644
--- a/src/cryptsetup/cryptsetup-pkcs11.c
+++ b/src/cryptsetup/cryptsetup-pkcs11.c
@@ -10,7 +10,7 @@
 #include "alloc-util.h"
 #include "ask-password-api.h"
 #include "cryptsetup-pkcs11.h"
-#include "cryptsetup-util.h"
+#include "cryptsetup-keyfile.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "format-util.h"
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 8be9c9acac..f9e627da46 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -11,7 +11,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
-#include "crypt-util.h"
+#include "cryptsetup-keyfile.h"
 #include "cryptsetup-pkcs11.h"
 #include "cryptsetup-util.h"
 #include "device-util.h"
diff --git a/src/home/homework-luks.h b/src/home/homework-luks.h
index 4d3e085ff0..af0ad4b504 100644
--- a/src/home/homework-luks.h
+++ b/src/home/homework-luks.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "homework.h"
 #include "user-record.h"
 
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 2728cb8ba8..daadf9ef43 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -11,7 +11,7 @@
 #include <sys/vfs.h>
 
 #include "blockdev-util.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "device-nodes.h"
 #include "dissect-image.h"
 #include "escape.h"
diff --git a/src/partition/repart.c b/src/partition/repart.c
index 96c4e809ae..5ddfdfa635 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -24,7 +24,7 @@
 #include "btrfs-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "def.h"
 #include "efivars.h"
 #include "errno-util.h"
diff --git a/src/shared/crypt-util.c b/src/shared/cryptsetup-util.c
similarity index 96%
rename from src/shared/crypt-util.c
rename to src/shared/cryptsetup-util.c
index 52bd12bb8d..9bc85a1739 100644
--- a/src/shared/crypt-util.c
+++ b/src/shared/cryptsetup-util.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #if HAVE_LIBCRYPTSETUP
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "log.h"
 
 static void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
diff --git a/src/shared/crypt-util.h b/src/shared/cryptsetup-util.h
similarity index 100%
rename from src/shared/crypt-util.h
rename to src/shared/cryptsetup-util.h
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 9bcab8445e..a035e8de5a 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -19,7 +19,7 @@
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "copy.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "def.h"
 #include "device-nodes.h"
 #include "device-util.h"
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 572ac1de64..5416c68bf5 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -73,8 +73,8 @@ shared_sources = files('''
         coredump-util.h
         cpu-set-util.c
         cpu-set-util.h
-        crypt-util.c
-        crypt-util.h
+        cryptsetup-util.c
+        cryptsetup-util.h
         daemon-util.h
         dev-setup.c
         dev-setup.h
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 753777b6ad..8294951759 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 
 #include "alloc-util.h"
-#include "crypt-util.h"
+#include "cryptsetup-util.h"
 #include "fileio.h"
 #include "hexdecoct.h"
 #include "log.h"