diff --git a/lib/modules/inventory/distributed-service/inventory-adapter.nix b/lib/modules/inventory/distributed-service/inventory-adapter.nix
index 66786b375..8d82ed97d 100644
--- a/lib/modules/inventory/distributed-service/inventory-adapter.nix
+++ b/lib/modules/inventory/distributed-service/inventory-adapter.nix
@@ -95,7 +95,7 @@
       grouped = lib.foldlAttrs (
         acc: instanceName: instance:
         let
-          inputName = if instance.module.input == null then "self" else instance.module.input;
+          inputName = if instance.module.input == null then "<clan-core>" else instance.module.input;
           id = inputName + "-" + instance.module.name;
         in
         acc
diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/modules/inventory/distributed-service/tests/default.nix
index 9183ea644..426351c8b 100644
--- a/lib/modules/inventory/distributed-service/tests/default.nix
+++ b/lib/modules/inventory/distributed-service/tests/default.nix
@@ -79,7 +79,7 @@ in
     {
       # Test that the module is mapped into the output
       # We might change the attribute name in the future
-      expr = res.importedModulesEvaluated ? "self-simple-module";
+      expr = res.importedModulesEvaluated ? "<clan-core>-simple-module";
       expected = true;
       inherit res;
     };
@@ -133,8 +133,8 @@ in
       # We might change the attribute name in the future
       expr = lib.mapAttrs (_n: v: builtins.length v) res.grouped;
       expected = {
-        self-A = 2;
-        self-B = 1;
+        "<clan-core>-A" = 2;
+        "<clan-core>-B" = 1;
       };
     };