diff --git a/src/import/export.c b/src/import/export.c
index 9c44fcf35c..5faf4ccc06 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -7,13 +7,13 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "export-raw.h"
 #include "export-tar.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 1fe5a257db..a12ee77ef9 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -5,13 +5,13 @@
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "mkdir.h"
 #include "ratelimit.h"
 #include "rm-rf.h"
diff --git a/src/import/import.c b/src/import/import.c
index 934074a7b0..661fa2888c 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -7,13 +7,13 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index a54f968cd7..dc0bf20201 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -7,9 +7,9 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "hostname-util.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "parse-util.h"
 #include "pull-raw.h"
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index f74cabd7fb..539b4c802a 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -8,6 +8,7 @@
 #include "bus-label.h"
 #include "bus-polkit.h"
 #include "copy.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -15,7 +16,6 @@
 #include "image-dbus.h"
 #include "io-util.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "mount-util.h"
 #include "process-util.h"
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a65f9b6a8e..08179eb400 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -12,6 +12,7 @@
 #include "bus-locator.h"
 #include "bus-polkit.h"
 #include "cgroup-util.h"
+#include "discover-image.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -20,7 +21,6 @@
 #include "image-dbus.h"
 #include "io-util.h"
 #include "machine-dbus.h"
-#include "machine-image.h"
 #include "machine-pool.h"
 #include "machined.h"
 #include "missing_capability.h"
diff --git a/src/machine/machined.c b/src/machine/machined.c
index 6a5bf391e6..1d82059985 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -15,11 +15,11 @@
 #include "bus-polkit.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "hostname-util.h"
 #include "label.h"
-#include "machine-image.h"
 #include "machined-varlink.h"
 #include "machined.h"
 #include "main-func.h"
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index aa3bcdb7a2..a702af8e3b 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -36,6 +36,7 @@
 #include "copy.h"
 #include "cpu-set-util.h"
 #include "dev-setup.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "env-util.h"
 #include "escape.h"
@@ -53,7 +54,6 @@
 #include "log.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
-#include "machine-image.h"
 #include "macro.h"
 #include "main-func.h"
 #include "missing_sched.h"
diff --git a/src/portable/portable.c b/src/portable/portable.c
index d74e498d59..d18e03afd4 100644
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -8,6 +8,7 @@
 #include "copy.h"
 #include "def.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -16,7 +17,6 @@
 #include "io-util.h"
 #include "locale-util.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "mkdir.h"
 #include "nulstr-util.h"
 #include "os-util.h"
diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 0b329134de..ee1c7b6965 100644
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -12,13 +12,13 @@
 #include "bus-wait-for-jobs.h"
 #include "def.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
 #include "fs-util.h"
 #include "locale-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "pager.h"
 #include "parse-util.h"
diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c
index cf50d58c71..20a33dc671 100644
--- a/src/portable/portabled-bus.c
+++ b/src/portable/portabled-bus.c
@@ -4,9 +4,9 @@
 #include "btrfs-util.h"
 #include "bus-common-errors.h"
 #include "bus-polkit.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "io-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 76b6ddebde..babdf4197f 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -11,10 +11,10 @@
 #include "bus-label.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"
diff --git a/src/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h
index aa2a3ade77..8442baf232 100644
--- a/src/portable/portabled-image-bus.h
+++ b/src/portable/portabled-image-bus.h
@@ -3,7 +3,7 @@
 
 #include "sd-bus.h"
 
-#include "machine-image.h"
+#include "discover-image.h"
 #include "portabled.h"
 
 int bus_image_common_get_os_release(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error);
diff --git a/src/portable/portabled-image.h b/src/portable/portabled-image.h
index eeefffee64..753f389f80 100644
--- a/src/portable/portabled-image.h
+++ b/src/portable/portabled-image.h
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "discover-image.h"
 #include "hashmap.h"
-#include "machine-image.h"
 #include "portabled.h"
 
 Image *manager_image_cache_get(Manager *m, const char *name_or_path);
diff --git a/src/shared/machine-image.c b/src/shared/discover-image.c
similarity index 99%
rename from src/shared/machine-image.c
rename to src/shared/discover-image.c
index d2b726efc4..1f5e4c6f86 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/discover-image.c
@@ -16,6 +16,7 @@
 #include "chattr-util.h"
 #include "copy.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "env-file.h"
 #include "env-util.h"
@@ -27,7 +28,6 @@
 #include "lockfile-util.h"
 #include "log.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "macro.h"
 #include "mkdir.h"
 #include "nulstr-util.h"
@@ -1065,7 +1065,6 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
                         r = asprintf(&p, "/run/systemd/nspawn/locks/inode-%lu:%lu", (unsigned long) st.st_dev, (unsigned long) st.st_ino);
                 else
                         return -ENOTTY;
-
                 if (r < 0)
                         return -ENOMEM;
         }
@@ -1220,11 +1219,16 @@ int image_read_metadata(Image *i) {
 }
 
 int image_name_lock(const char *name, int operation, LockFile *ret) {
+        const char *p;
+
         assert(name);
         assert(ret);
 
         /* Locks an image name, regardless of the precise path used. */
 
+        if (streq(name, ".host"))
+                return -EBUSY;
+
         if (!image_name_is_valid(name))
                 return -EINVAL;
 
@@ -1233,11 +1237,9 @@ int image_name_lock(const char *name, int operation, LockFile *ret) {
                 return 0;
         }
 
-        if (streq(name, ".host"))
-                return -EBUSY;
-
-        const char *p = strjoina("/run/systemd/nspawn/locks/name-", name);
         (void) mkdir_p("/run/systemd/nspawn/locks", 0700);
+
+        p = strjoina("/run/systemd/nspawn/locks/name-", name);
         return make_lock_file(p, operation, ret);
 }
 
diff --git a/src/shared/machine-image.h b/src/shared/discover-image.h
similarity index 100%
rename from src/shared/machine-image.h
rename to src/shared/discover-image.h
diff --git a/src/shared/meson.build b/src/shared/meson.build
index f301a9f610..b1a8ea9ac6 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -79,6 +79,8 @@ shared_sources = files('''
         dev-setup.c
         dev-setup.h
         devnode-acl.h
+        discover-image.c
+        discover-image.h
         dissect-image.c
         dissect-image.h
         dm-util.c
@@ -172,8 +174,6 @@ shared_sources = files('''
         loopback-setup.h
         machine-id-setup.c
         machine-id-setup.h
-        machine-image.c
-        machine-image.h
         machine-pool.c
         machine-pool.h
         macvlan-util.c
diff --git a/src/shared/os-util.c b/src/shared/os-util.c
index d1cf41283b..45c10ca9c5 100644
--- a/src/shared/os-util.c
+++ b/src/shared/os-util.c
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "macro.h"
-#include "machine-image.h"
 #include "os-util.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 601fd63a14..ee38e49ec9 100644
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "capability-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "escape.h"
 #include "fd-util.h"
@@ -14,7 +15,6 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "log.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "missing_magic.h"
 #include "mkdir.h"
diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index e25cf9e5d9..641cadec85 100644
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -8,6 +8,7 @@
 #include "condition.h"
 #include "device-private.h"
 #include "device.h"
+#include "discover-image.h"
 #include "execute.h"
 #include "import-util.h"
 #include "install.h"
@@ -18,7 +19,6 @@
 #include "locale-util.h"
 #include "log.h"
 #include "logs-show.h"
-#include "machine-image.h"
 #include "mount.h"
 #include "path.h"
 #include "process-util.h"