diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
index 29d2d3af8e9..f54135b1137 100644
--- a/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
+++ b/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
@@ -1651,7 +1651,7 @@ mkTxMetaEntity wid txid mfee meta derived = TxMeta
     , txMetaAmount = getQuantity (derived ^. #amount)
     , txMetaFee = fromIntegral . W.unCoin <$> mfee
     , txMetaSlotExpires = derived ^. #expiry
-    , txMetaData = meta
+    , txMetadata = meta
     }
 
 -- note: TxIn records must already be sorted by order
@@ -1669,7 +1669,7 @@ txHistoryFromEntity ti tip metas ins outs ws =
     mapM mkItem metas
   where
     startTime' = interpretQuery ti . slotToUTCTime
-    mkItem m = mkTxWith (txMetaTxId m) (txMetaFee m) (txMetaData m) (mkTxDerived m)
+    mkItem m = mkTxWith (txMetaTxId m) (txMetaFee m) (txMetadata m) (mkTxDerived m)
     mkTxWith txid mfee meta derived = do
         t <- startTime' (derived ^. #slotNo)
         return $ W.TransactionInfo
diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs
index fdef2accf31..ae3225d2e55 100644
--- a/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs
+++ b/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs
@@ -108,7 +108,7 @@ TxMeta
     txMetaSlot              SlotNo              sql=slot
     txMetaBlockHeight       Word32              sql=block_height
     txMetaAmount            Natural             sql=amount
-    txMetaData              W.TxMetadata Maybe  sql=data
+    txMetadata              W.TxMetadata Maybe  sql=data
     txMetaSlotExpires       SlotNo Maybe        sql=slot_expires
     txMetaFee               Natural Maybe       sql=fee
 
diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
index f5f2c15c3f2..5b7d3ef0f61 100644
--- a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
+++ b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
@@ -935,9 +935,9 @@ fromShelleyWdrl (SL.Wdrl wdrl) = Map.fromList $
     bimap (fromStakeCredential . SL.getRwdCred) fromShelleyCoin
         <$> Map.toList wdrl
 
-fromShelleyMD :: SL.MetaData -> Cardano.TxMetadata
-fromShelleyMD (SL.MetaData m) =
-    Cardano.makeTransactionMetadata . fromShelleyMetaData $ m
+fromShelleyMD :: SL.Metadata -> Cardano.TxMetadata
+fromShelleyMD (SL.Metadata m) =
+    Cardano.makeTransactionMetadata . fromShelleyMetadata $ m
 
 -- Convert & filter Shelley certificate into delegation certificate. Returns
 -- 'Nothing' if certificates aren't delegation certificate.
@@ -972,7 +972,7 @@ fromShelleyRegistrationCert = \case
             , W.poolMargin = fromUnitInterval (SL._poolMargin pp)
             , W.poolCost = lovelaceFromCoin (SL._poolCost pp)
             , W.poolPledge = lovelaceFromCoin (SL._poolPledge pp)
-            , W.poolMetadata = fromPoolMetaData <$> strictMaybeToMaybe (SL._poolMD pp)
+            , W.poolMetadata = fromPoolMetadata <$> strictMaybeToMaybe (SL._poolMD pp)
             }
         )
 
@@ -994,8 +994,8 @@ toWalletCoin = W.Coin . unsafeCoinToWord64
 unsafeCoinToWord64 :: SL.Coin -> Word64
 unsafeCoinToWord64 (SL.Coin c) = fromIntegral c
 
-fromPoolMetaData :: SL.PoolMetaData -> (W.StakePoolMetadataUrl, W.StakePoolMetadataHash)
-fromPoolMetaData meta =
+fromPoolMetadata :: SL.PoolMetadata -> (W.StakePoolMetadataUrl, W.StakePoolMetadataHash)
+fromPoolMetadata meta =
     ( W.StakePoolMetadataUrl (urlToText (SL._poolMDUrl meta))
     , W.StakePoolMetadataHash (SL._poolMDHash meta)
     )