2 files changed, 6 insertions, 4 deletions

diff --git a/src/Network/BitTorrent/Exchange/Block.hs b/src/Network/BitTorrent/Exchange/Block.hs
index 5ab73b65..d06fe727 100644
--- a/src/Network/BitTorrent/Exchange/Block.hs
+++ b/src/Network/BitTorrent/Exchange/Block.hs
@@ -41,6 +41,7 @@ import Data.Typeable
 import Text.PrettyPrint
 import Text.PrettyPrint.Class
 
+import Data.Torrent.JSON
 import Data.Torrent.Piece
 
 {-----------------------------------------------------------------------
@@ -84,7 +85,7 @@ data BlockIx = BlockIx {
   , ixLength :: {-# UNPACK #-} !BlockSize
   } deriving (Show, Eq, Typeable)
 
-$(deriveJSON defaultOptions { fieldLabelModifier = (L.map toLower . L.dropWhile isLower) } ''BlockIx)
+$(deriveJSON omitRecordPrefix ''BlockIx)
 
 getInt :: S.Get Int
 getInt = fromIntegral <$> S.getWord32be
diff --git a/src/Network/BitTorrent/Exchange/Status.hs b/src/Network/BitTorrent/Exchange/Status.hs
index 42766428..8472e575 100644
--- a/src/Network/BitTorrent/Exchange/Status.hs
+++ b/src/Network/BitTorrent/Exchange/Status.hs
@@ -36,14 +36,15 @@ module Network.BitTorrent.Exchange.Status
 import Control.Lens
 import Data.Aeson.TH
 import Data.Default
-import Data.List as L
 import Data.Maybe
 import Data.Monoid
 import Text.PrettyPrint as PP hiding ((<>))
 import Text.PrettyPrint.Class
 
+import Data.Torrent.JSON
 import Network.BitTorrent.Exchange.Message
 
+
 {-----------------------------------------------------------------------
 --  Peer status
 -----------------------------------------------------------------------}
@@ -60,7 +61,7 @@ data PeerStatus = PeerStatus
   } deriving (Show, Eq, Ord)
 
 $(makeLenses ''PeerStatus)
-$(deriveJSON defaultOptions { fieldLabelModifier = L.tail } ''PeerStatus)
+$(deriveJSON omitLensPrefix ''PeerStatus)
 
 instance Pretty PeerStatus where
   pretty PeerStatus {..} =
@@ -103,7 +104,7 @@ data SessionStatus = SessionStatus
   } deriving (Show, Eq)
 
 $(makeLenses ''SessionStatus)
-$(deriveJSON defaultOptions { fieldLabelModifier = L.tail } ''SessionStatus)
+$(deriveJSON omitRecordPrefix ''SessionStatus)
 
 instance Pretty SessionStatus where
   pretty SessionStatus {..} =