diff --git a/src/devices.ml b/src/devices.ml
index 4f669f41..6f7c1968 100644
--- a/src/devices.ml
+++ b/src/devices.ml
@@ -1,29 +1,29 @@
 module Secmod_signkey = struct
   type t = {
     secmod_key: Signkey.t;
-    signkeys: Signkey.t list;
+    keys: Signkey.t list;
   }
 
   let v =
     let finally _key = () in
     Vif.Device.v ~name:"secmod_signkey" ~finally [] @@ fun () ->
     let secmod_key = Signkey.generate () in
-    let signkeys = [ Signkey.generate () ] in
-    { secmod_key; signkeys }
+    let keys = [ Signkey.generate () ] in
+    { secmod_key; keys }
 end
 
 module Secmod_denom = struct
   type t = {
     secmod_key: Signkey.t;
-    denom_keys: Denomination.t list;
+    keys: Denomination.t list;
   }
 
   let v =
     let finally _key = () in
     Vif.Device.v ~name:"secmod_denom" ~finally [] @@ fun () ->
     let secmod_key = Signkey.generate () in
-    let denom_keys = List.map Denomination.make Config.coins in
-    { secmod_key; denom_keys }
+    let keys = List.map Denomination.make Config.coins in
+    { secmod_key; keys }
 end
 
 let secmod_signkey = Secmod_signkey.v
diff --git a/src/management.ml b/src/management.ml
index 11a3b91b..23aea7fb 100644
--- a/src/management.ml
+++ b/src/management.ml
@@ -92,12 +92,12 @@ let mk_future_signkey signkey_signf
 let mk_future_keys_response (secmod_signkey : Secmod_signkey.t)
     (secmod_denom : Secmod_denom.t) =
   let future_denoms =
-    secmod_denom.denom_keys
+    secmod_denom.keys
     |> List.filter (fun k -> Option.is_none k.Denomination.master_sig)
     |> List.map (mk_future_denom secmod_denom.secmod_key.Signkey.sign)
   in
   let future_signkeys =
-    secmod_signkey.signkeys
+    secmod_signkey.keys
     |> List.filter (fun k -> Option.is_none k.Signkey.master_sig)
     |> List.map (mk_future_signkey secmod_signkey.secmod_key.sign)
   in