diff --git a/src/devices.ml b/src/devices.ml
index c37d5f76..1d3c702b 100644
--- a/src/devices.ml
+++ b/src/devices.ml
@@ -18,9 +18,9 @@ let db_connection : (env, Caqti_miou.connection) Vif.Device.device =
           Logs.info (fun m -> m "database connection initialized");
           conn)
 
-let secmod =
+let keys =
   let finally _key = () in
-  Vif.Device.v ~name:"secmod" ~finally [ Vif.Device.value db_connection ]
+  Vif.Device.v ~name:"keys" ~finally [ Vif.Device.value db_connection ]
   @@ fun (module Conn : Pg.CONN) (_env : env) ->
   let sm : (module Keys.S) = (module Keys.Make (Conn)) in
   sm
diff --git a/src/http_information.ml b/src/http_information.ml
index 02d2c9e3..6c4068d9 100644
--- a/src/http_information.ml
+++ b/src/http_information.ml
@@ -235,7 +235,7 @@ let jsont = ExchangeKeysResponse.jsont
 let keys req server _env =
   Logs.info (fun m -> m "GET /keys");
   let db_conn = Vif.Server.device Devices.db_connection server in
-  let keys = Vif.Server.device Devices.secmod server in
+  let keys = Vif.Server.device Devices.keys server in
   let res =
     let* last_issue_date =
       match Vif.Queries.get req "last_issue_date" with
diff --git a/src/http_management.ml b/src/http_management.ml
index f5828bb0..be19ac91 100644
--- a/src/http_management.ml
+++ b/src/http_management.ml
@@ -22,7 +22,7 @@ module Keys_get = struct
 
   let f req server _env =
     Logs.info (fun m -> m "GET /management/keys/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let res =
       let v = mk_future_keys_response keys in
       let s = Api.encode_exn jsont v in
@@ -103,7 +103,7 @@ module Keys_post = struct
   let f req server _env =
     Logs.info (fun m -> m "POST /management/keys/");
     let db_conn = Vif.Server.device Devices.db_connection server in
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
       let* () = verify keys v in
@@ -128,7 +128,7 @@ module Denom_revoke = struct
 
   let f req h_denom_pub server _env =
     Logs.info (fun m -> m "POST /management/denominations/$H_DENOM_PUB/revoke/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let res =
       let* h_denom_pub = DenominationHash.of_b32 h_denom_pub in
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -154,7 +154,7 @@ module Signkey_revoke = struct
 
   let f req exchange_pub server _env =
     Logs.info (fun m -> m "POST /management/signkeys/$EXCHANGE_PUB/revoke/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let res =
       let* exchange_pub = Crypto.EddsaPublicKey.of_b32 exchange_pub in
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -208,7 +208,7 @@ module Auditors = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/auditors/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -248,7 +248,7 @@ module Auditors_disable = struct
 
   let f req auditor_pub server _env =
     Logs.info (fun m -> m "POST /management/auditors/$AUDITOR_PUB/revoke/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* auditor_pub = Crypto.EddsaPublicKey.of_b32 auditor_pub in
@@ -308,7 +308,7 @@ module Wire_fee = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/wire-fee/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -379,7 +379,7 @@ module Global_fees = struct
      and once set for a timeframe, it should not change. *)
   let f req server _env =
     Logs.info (fun m -> m "POST /management/global-fees/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -458,7 +458,7 @@ module Wire = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/wire/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -493,7 +493,7 @@ module Wire_disable = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/wire/disable/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -533,7 +533,7 @@ module Drain = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/drain/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -573,7 +573,7 @@ module AmlOfficer = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/aml-officers/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
@@ -615,7 +615,7 @@ module Partners = struct
 
   let f req server _env =
     Logs.info (fun m -> m "POST /management/partners/");
-    let keys = Vif.Server.device Devices.secmod server in
+    let keys = Vif.Server.device Devices.keys server in
     let db_conn = Vif.Server.device Devices.db_connection server in
     let res =
       let* v = Vif.Request.of_json req |> unwrap_err_msg in
diff --git a/src/mte.ml b/src/mte.ml
index 5dcf79a3..77f07de8 100644
--- a/src/mte.ml
+++ b/src/mte.ml
@@ -76,7 +76,7 @@ let () =
   let env : Devices.env =
     { caqti_switch; db_uri= Config.Exchangedb_postgres.config }
   in
-  let devices = Vif.Devices.[ Devices.db_connection; Devices.secmod ] in
+  let devices = Vif.Devices.[ Devices.db_connection; Devices.keys ] in
   let middlewares = Vif.Middlewares.[] in
   Logs.info (fun m ->
       m ~tags:(Util.Log_reporter.detail "...") "Starting MTE server");