diff --git a/src/pg.ml b/src/pg.ml
index ecd1c074..d64cd088 100644
--- a/src/pg.ml
+++ b/src/pg.ml
@@ -37,7 +37,7 @@ let preflight =
 
 let find_signkey =
   let req =
-    Caqti_type.(eddsa_pub ->? signkey_data)
+    Caqti_type.(eddsa_pub ->? signkey)
       "SELECT exchange_pub, valid_from, expire_sign, expire_legal, master_sig \
        FROM exchange_sign_keys WHERE exchange_pub=$1"
   in
@@ -46,7 +46,7 @@ let find_signkey =
 
 let get_active_signkeys =
   let req =
-    Caqti_type.(time ->* signkey_data)
+    Caqti_type.(time ->* signkey)
       "SELECT esk.exchange_pub, esk.valid_from, esk.expire_sign, \
        esk.expire_legal, esk.master_sig FROM exchange_sign_keys esk WHERE \
        expire_sign > $1 AND NOT EXISTS (SELECT esk_serial FROM \
@@ -56,7 +56,7 @@ let get_active_signkeys =
 
 let insert_signkey =
   let req =
-    Caqti_type.(signkey_data ->. unit)
+    Caqti_type.(signkey ->. unit)
       "INSERT INTO exchange_sign_keys (exchange_pub, valid_from, expire_sign, \
        expire_legal, master_sig) VALUES ($1, $2, $3, $4, $5)"
   in
@@ -64,7 +64,7 @@ let insert_signkey =
 
 let find_denom =
   let req =
-    Caqti_type.(denom_hash ->? denom_data)
+    Caqti_type.(denom_hash ->? denom)
       "SELECT denom_pub, (coin).*, valid_from, expire_withdraw, \
        expire_deposit, expire_legal, (fee_withdraw).*, (fee_deposit).*, \
        (fee_refresh).*, (fee_refund).*, age_mask, denom_pub_hash, master_sig \
@@ -74,7 +74,7 @@ let find_denom =
 
 let get_denominations =
   let req =
-    Caqti_type.(unit ->* denom_data)
+    Caqti_type.(unit ->* denom)
       "SELECT dn.denom_pub, (dn.coin).*, dn.valid_from, dn.expire_withdraw, \
        dn.expire_deposit, dn.expire_legal, (dn.fee_withdraw).*, \
        (dn.fee_deposit).*, (dn.fee_refresh).*, (dn.fee_refund).*, dn.age_mask, \
@@ -87,7 +87,7 @@ let get_denominations =
 (* note: does not update revocation *)
 let insert_denom =
   let req =
-    Caqti_type.(denom_data ->. unit)
+    Caqti_type.(denom ->. unit)
       "INSERT INTO denominations (denom_pub, coin, valid_from, \
        expire_withdraw, expire_deposit, expire_legal, fee_withdraw, \
        fee_deposit, fee_refresh, fee_refund, age_mask, denom_pub_hash, \
diff --git a/src/pg_type.ml b/src/pg_type.ml
index 24ec5b42..3d5bfca3 100644
--- a/src/pg_type.ml
+++ b/src/pg_type.ml
@@ -43,7 +43,7 @@ include struct
   let planchets_hash = HashPlanchetsP.caqti
 end
 
-let signkey_data =
+let signkey =
   let master_sig = Signatures.ExchangeSigningKeyValidity.caqti in
   custom
     ~encode:(fun
@@ -53,7 +53,7 @@ let signkey_data =
       Ok { pub; stamp_start; stamp_expire; stamp_end; master_sig })
     (t5 eddsa_pub time time time master_sig)
 
-let denom_data =
+let denom =
   let master_sig = Signatures.DenominationKeyValidity.caqti in
   custom
     ~encode:(fun