diff --git a/src/handler.ml b/src/handler.ml
index 17f35827..c18eac14 100644
--- a/src/handler.ml
+++ b/src/handler.ml
@@ -114,15 +114,15 @@ let management_auditors_disable req auditor_pub server _env =
   in
   respond_with_res res req
 
-let management_wirefee_jsont = WireFeeSetupMessage.jsont
+let management_wire_fee_jsont = WireFeeSetupMessage.jsont
 
-let management_wirefee req server _env =
+let management_wire_fee req server _env =
   let open Management 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
-    let* () = verify_wirefee_setup_sig v in
-    let* () = update_wirefee_setup ~db_conn v in
+    let* () = verify_wire_fee_setup_sig v in
+    let* () = update_wire_fee_setup ~db_conn v in
     Ok ""
   in
   respond_with_res res req
diff --git a/src/management.ml b/src/management.ml
index 924da552..7caa0eb5 100644
--- a/src/management.ml
+++ b/src/management.ml
@@ -297,7 +297,7 @@ let auditor_disable ~db_conn auditor_pub
         in
         ()
 
-let verify_wirefee_setup_sig
+let verify_wire_fee_setup_sig
     WireFeeSetupMessage.
       {
         wire_method;
@@ -317,7 +317,7 @@ let verify_wirefee_setup_sig
       closing_fee;
     }
 
-let update_wirefee_setup ~db_conn
+let update_wire_fee_setup ~db_conn
     WireFeeSetupMessage.
       {
         wire_method;
@@ -327,16 +327,16 @@ let update_wirefee_setup ~db_conn
         closing_fee;
         wire_fee;
       } =
-  let* wirefee_opt =
-    Pg.lookup_wirefee_by_time db_conn ~wire_method ~start_date:fee_start
+  let* wire_fee_opt =
+    Pg.lookup_wire_fee_by_time db_conn ~wire_method ~start_date:fee_start
       ~end_date:fee_end
     |> unwrap_err_caqti
   in
-  match wirefee_opt with
+  match wire_fee_opt with
   | Some (_wire_fee, _closing_fee) -> Error "wire-fee already setup"
   | None ->
       let+ () =
-        Pg.insert_wirefee db_conn ~wire_method ~start_date:fee_start
+        Pg.insert_wire_fee db_conn ~wire_method ~start_date:fee_start
           ~end_date:fee_end ~wire_fee ~closing_fee ~master_sig:master_sig_wire
         |> unwrap_err_caqti
       in
diff --git a/src/mte.ml b/src/mte.ml
index 631d3faa..b15f8636 100644
--- a/src/mte.ml
+++ b/src/mte.ml
@@ -49,8 +49,8 @@ let routes =
       (v "management" / "auditors" /% string `Path / "disable")
       management_auditors_disable_jsont
     --> management_auditors_disable;
-    post (v "management" / "wire-fee") management_wirefee_jsont
-    --> management_wirefee;
+    post (v "management" / "wire-fee") management_wire_fee_jsont
+    --> management_wire_fee;
     post (v "management" / "global-fees") management_global_fees_jsont
     --> management_global_fees;
   ]
diff --git a/src/pg.ml b/src/pg.ml
index 584b12de..1f728716 100644
--- a/src/pg.ml
+++ b/src/pg.ml
@@ -221,17 +221,17 @@ let update_auditor =
     Conn.exec update_auditor
       (auditor_pub, auditor_url, auditor_name, enabled, change_date)
 
-let lookup_wirefee_by_time =
-  let lookup_wirefee_by_time =
+let lookup_wire_fee_by_time =
+  let lookup_wire_fee_by_time =
     Caqti_type.(t3 wire_method time time ->? t2 amount amount)
       "SELECT (wire_fee).*, (closing_fee).* FROM wire_fee WHERE wire_method=$1 \
        AND end_date > $2 AND start_date < $3"
   in
   fun (module Conn : CONN) ~wire_method ~start_date ~end_date ->
-    Conn.find_opt lookup_wirefee_by_time (wire_method, start_date, end_date)
+    Conn.find_opt lookup_wire_fee_by_time (wire_method, start_date, end_date)
 
-let insert_wirefee =
-  let insert_wirefee =
+let insert_wire_fee =
+  let insert_wire_fee =
     let master_sig = Bin_sig.MasterWireFee.caqti in
     Caqti_type.(t6 wire_method time time amount amount master_sig ->. unit)
       "INSERT INTO wire_fee (wire_method, start_date, end_date, wire_fee, \
@@ -245,7 +245,7 @@ let insert_wirefee =
     ~closing_fee
     ~master_sig
   ->
-    Conn.exec insert_wirefee
+    Conn.exec insert_wire_fee
       (wire_method, start_date, end_date, wire_fee, closing_fee, master_sig)
 
 let lookup_global_fee_by_time =