diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 4f06895..bed71fc 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -20,7 +20,7 @@
             imports = [
               ./vm02116
               self.nixosModules.ageSecrets
-              { x_fediversity.hostPublicKey = self.keys.systems.vm02116; }
+              { fediversity.hostPublicKey = self.keys.systems.vm02116; }
             ];
           };
         };
@@ -38,7 +38,7 @@
             imports = [
               ./vm02179
               self.nixosModules.ageSecrets
-              { x_fediversity.hostPublicKey = self.keys.systems.vm02179; }
+              { fediversity.hostPublicKey = self.keys.systems.vm02179; }
             ];
           };
         };
@@ -56,7 +56,7 @@
             imports = [
               ./vm02186
               self.nixosModules.ageSecrets
-              { x_fediversity.hostPublicKey = self.keys.systems.vm02186; }
+              { fediversity.hostPublicKey = self.keys.systems.vm02186; }
             ];
           };
         };
@@ -82,7 +82,7 @@
             imports = [
               ./vm02187
               self.nixosModules.ageSecrets
-              { x_fediversity.hostPublicKey = self.keys.systems.vm02187; }
+              { fediversity.hostPublicKey = self.keys.systems.vm02187; }
             ];
           };
         };
diff --git a/secrets/flake-part.nix b/secrets/flake-part.nix
index aa7a2eb..b2e1874 100644
--- a/secrets/flake-part.nix
+++ b/secrets/flake-part.nix
@@ -20,7 +20,7 @@ in
       {
         imports = [ inputs.agenix.nixosModules.default ];
 
-        options.x_fediversity.hostPublicKey = lib.mkOption {
+        options.fediversity.hostPublicKey = lib.mkOption {
           description = ''
             The host public key of the machine. It is used in particular
             to filter Age secrets and only keep the relevant ones.
@@ -29,7 +29,7 @@ in
 
         config.age.secrets = concatMapAttrs (
           name: secret:
-          optionalAttrs (elem config.x_fediversity.hostPublicKey secret.publicKeys) ({
+          optionalAttrs (elem config.fediversity.hostPublicKey secret.publicKeys) ({
             ${removeSuffix ".age" name}.file = ./. + "/${name}";
           })
         ) secrets;