diff --git a/sbp.cabal b/sbp.cabal
--- a/sbp.cabal
+++ b/sbp.cabal
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.1.0
+version:               2.1.1
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3
@@ -45,7 +45,7 @@
   default-language:    Haskell2010
   hs-source-dirs:      src
   ghc-options:         -Wall -fno-warn-unused-imports -fno-warn-orphans
-  build-depends:       aeson
+  build-depends:       aeson >= 0.10
                      , array
                      , base >= 4.7 && < 5
                      , base64-bytestring
diff --git a/src/SwiftNav/SBP/Acquisition.hs b/src/SwiftNav/SBP/Acquisition.hs
--- a/src/SwiftNav/SBP/Acquisition.hs
+++ b/src/SwiftNav/SBP/Acquisition.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.Acquisition where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -64,7 +64,7 @@
 
 $(deriveSBP 'msgAcqResult ''MsgAcqResult)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResult_" . stripPrefix "_msgAcqResult_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResult_" . P.stripPrefix "_msgAcqResult_"}
              ''MsgAcqResult)
 $(makeLenses ''MsgAcqResult)
 
@@ -102,7 +102,7 @@
 
 $(deriveSBP 'msgAcqResultDepB ''MsgAcqResultDepB)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResultDepB_" . stripPrefix "_msgAcqResultDepB_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResultDepB_" . P.stripPrefix "_msgAcqResultDepB_"}
              ''MsgAcqResultDepB)
 $(makeLenses ''MsgAcqResultDepB)
 
@@ -141,7 +141,7 @@
 
 $(deriveSBP 'msgAcqResultDepA ''MsgAcqResultDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResultDepA_" . stripPrefix "_msgAcqResultDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqResultDepA_" . P.stripPrefix "_msgAcqResultDepA_"}
              ''MsgAcqResultDepA)
 $(makeLenses ''MsgAcqResultDepA)
 
@@ -206,7 +206,7 @@
     putWord32le $ fromIntegral _acqSvProfile_cf_max
     putWord32le $ fromIntegral _acqSvProfile_cf
     putWord32le _acqSvProfile_cp
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_acqSvProfile_" . stripPrefix "_acqSvProfile_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_acqSvProfile_" . P.stripPrefix "_acqSvProfile_"}
              ''AcqSvProfile)
 $(makeLenses ''AcqSvProfile)
 
@@ -232,6 +232,6 @@
 
 $(deriveSBP 'msgAcqSvProfile ''MsgAcqSvProfile)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqSvProfile_" . stripPrefix "_msgAcqSvProfile_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAcqSvProfile_" . P.stripPrefix "_msgAcqSvProfile_"}
              ''MsgAcqSvProfile)
 $(makeLenses ''MsgAcqSvProfile)
diff --git a/src/SwiftNav/SBP/Bootload.hs b/src/SwiftNav/SBP/Bootload.hs
--- a/src/SwiftNav/SBP/Bootload.hs
+++ b/src/SwiftNav/SBP/Bootload.hs
@@ -13,7 +13,7 @@
 
 module SwiftNav.SBP.Bootload where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -49,7 +49,7 @@
 
 $(deriveSBP 'msgBootloaderHandshakeReq ''MsgBootloaderHandshakeReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeReq_" . stripPrefix "_msgBootloaderHandshakeReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeReq_" . P.stripPrefix "_msgBootloaderHandshakeReq_"}
              ''MsgBootloaderHandshakeReq)
 $(makeLenses ''MsgBootloaderHandshakeReq)
 
@@ -81,7 +81,7 @@
 
 $(deriveSBP 'msgBootloaderHandshakeResp ''MsgBootloaderHandshakeResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeResp_" . stripPrefix "_msgBootloaderHandshakeResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeResp_" . P.stripPrefix "_msgBootloaderHandshakeResp_"}
              ''MsgBootloaderHandshakeResp)
 $(makeLenses ''MsgBootloaderHandshakeResp)
 
@@ -106,7 +106,7 @@
 
 $(deriveSBP 'msgBootloaderJumpToApp ''MsgBootloaderJumpToApp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderJumpToApp_" . stripPrefix "_msgBootloaderJumpToApp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderJumpToApp_" . P.stripPrefix "_msgBootloaderJumpToApp_"}
              ''MsgBootloaderJumpToApp)
 $(makeLenses ''MsgBootloaderJumpToApp)
 
@@ -132,7 +132,7 @@
 
 $(deriveSBP 'msgNapDeviceDnaReq ''MsgNapDeviceDnaReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgNapDeviceDnaReq_" . stripPrefix "_msgNapDeviceDnaReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgNapDeviceDnaReq_" . P.stripPrefix "_msgNapDeviceDnaReq_"}
              ''MsgNapDeviceDnaReq)
 $(makeLenses ''MsgNapDeviceDnaReq)
 
@@ -162,7 +162,7 @@
 
 $(deriveSBP 'msgNapDeviceDnaResp ''MsgNapDeviceDnaResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgNapDeviceDnaResp_" . stripPrefix "_msgNapDeviceDnaResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgNapDeviceDnaResp_" . P.stripPrefix "_msgNapDeviceDnaResp_"}
              ''MsgNapDeviceDnaResp)
 $(makeLenses ''MsgNapDeviceDnaResp)
 
@@ -187,6 +187,6 @@
 
 $(deriveSBP 'msgBootloaderHandshakeDepA ''MsgBootloaderHandshakeDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeDepA_" . stripPrefix "_msgBootloaderHandshakeDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBootloaderHandshakeDepA_" . P.stripPrefix "_msgBootloaderHandshakeDepA_"}
              ''MsgBootloaderHandshakeDepA)
 $(makeLenses ''MsgBootloaderHandshakeDepA)
diff --git a/src/SwiftNav/SBP/ExtEvents.hs b/src/SwiftNav/SBP/ExtEvents.hs
--- a/src/SwiftNav/SBP/ExtEvents.hs
+++ b/src/SwiftNav/SBP/ExtEvents.hs
@@ -12,7 +12,7 @@
 
 module SwiftNav.SBP.ExtEvents where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -67,6 +67,6 @@
 
 $(deriveSBP 'msgExtEvent ''MsgExtEvent)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgExtEvent_" . stripPrefix "_msgExtEvent_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgExtEvent_" . P.stripPrefix "_msgExtEvent_"}
              ''MsgExtEvent)
 $(makeLenses ''MsgExtEvent)
diff --git a/src/SwiftNav/SBP/FileIo.hs b/src/SwiftNav/SBP/FileIo.hs
--- a/src/SwiftNav/SBP/FileIo.hs
+++ b/src/SwiftNav/SBP/FileIo.hs
@@ -16,7 +16,7 @@
 
 module SwiftNav.SBP.FileIo where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -71,7 +71,7 @@
 
 $(deriveSBP 'msgFileioReadReq ''MsgFileioReadReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadReq_" . stripPrefix "_msgFileioReadReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadReq_" . P.stripPrefix "_msgFileioReadReq_"}
              ''MsgFileioReadReq)
 $(makeLenses ''MsgFileioReadReq)
 
@@ -103,7 +103,7 @@
 
 $(deriveSBP 'msgFileioReadResp ''MsgFileioReadResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadResp_" . stripPrefix "_msgFileioReadResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadResp_" . P.stripPrefix "_msgFileioReadResp_"}
              ''MsgFileioReadResp)
 $(makeLenses ''MsgFileioReadResp)
 
@@ -143,7 +143,7 @@
 
 $(deriveSBP 'msgFileioReadDirReq ''MsgFileioReadDirReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadDirReq_" . stripPrefix "_msgFileioReadDirReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadDirReq_" . P.stripPrefix "_msgFileioReadDirReq_"}
              ''MsgFileioReadDirReq)
 $(makeLenses ''MsgFileioReadDirReq)
 
@@ -176,7 +176,7 @@
 
 $(deriveSBP 'msgFileioReadDirResp ''MsgFileioReadDirResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadDirResp_" . stripPrefix "_msgFileioReadDirResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioReadDirResp_" . P.stripPrefix "_msgFileioReadDirResp_"}
              ''MsgFileioReadDirResp)
 $(makeLenses ''MsgFileioReadDirResp)
 
@@ -204,7 +204,7 @@
 
 $(deriveSBP 'msgFileioRemove ''MsgFileioRemove)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioRemove_" . stripPrefix "_msgFileioRemove_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioRemove_" . P.stripPrefix "_msgFileioRemove_"}
              ''MsgFileioRemove)
 $(makeLenses ''MsgFileioRemove)
 
@@ -247,7 +247,7 @@
 
 $(deriveSBP 'msgFileioWriteReq ''MsgFileioWriteReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioWriteReq_" . stripPrefix "_msgFileioWriteReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioWriteReq_" . P.stripPrefix "_msgFileioWriteReq_"}
              ''MsgFileioWriteReq)
 $(makeLenses ''MsgFileioWriteReq)
 
@@ -275,6 +275,6 @@
 
 $(deriveSBP 'msgFileioWriteResp ''MsgFileioWriteResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioWriteResp_" . stripPrefix "_msgFileioWriteResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFileioWriteResp_" . P.stripPrefix "_msgFileioWriteResp_"}
              ''MsgFileioWriteResp)
 $(makeLenses ''MsgFileioWriteResp)
diff --git a/src/SwiftNav/SBP/Flash.hs b/src/SwiftNav/SBP/Flash.hs
--- a/src/SwiftNav/SBP/Flash.hs
+++ b/src/SwiftNav/SBP/Flash.hs
@@ -14,7 +14,7 @@
 
 module SwiftNav.SBP.Flash where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -67,7 +67,7 @@
 
 $(deriveSBP 'msgFlashProgram ''MsgFlashProgram)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashProgram_" . stripPrefix "_msgFlashProgram_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashProgram_" . P.stripPrefix "_msgFlashProgram_"}
              ''MsgFlashProgram)
 $(makeLenses ''MsgFlashProgram)
 
@@ -95,7 +95,7 @@
 
 $(deriveSBP 'msgFlashDone ''MsgFlashDone)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashDone_" . stripPrefix "_msgFlashDone_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashDone_" . P.stripPrefix "_msgFlashDone_"}
              ''MsgFlashDone)
 $(makeLenses ''MsgFlashDone)
 
@@ -133,7 +133,7 @@
 
 $(deriveSBP 'msgFlashReadReq ''MsgFlashReadReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashReadReq_" . stripPrefix "_msgFlashReadReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashReadReq_" . P.stripPrefix "_msgFlashReadReq_"}
              ''MsgFlashReadReq)
 $(makeLenses ''MsgFlashReadReq)
 
@@ -171,7 +171,7 @@
 
 $(deriveSBP 'msgFlashReadResp ''MsgFlashReadResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashReadResp_" . stripPrefix "_msgFlashReadResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashReadResp_" . P.stripPrefix "_msgFlashReadResp_"}
              ''MsgFlashReadResp)
 $(makeLenses ''MsgFlashReadResp)
 
@@ -203,7 +203,7 @@
 
 $(deriveSBP 'msgFlashErase ''MsgFlashErase)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashErase_" . stripPrefix "_msgFlashErase_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFlashErase_" . P.stripPrefix "_msgFlashErase_"}
              ''MsgFlashErase)
 $(makeLenses ''MsgFlashErase)
 
@@ -229,7 +229,7 @@
 
 $(deriveSBP 'msgStmFlashLockSector ''MsgStmFlashLockSector)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmFlashLockSector_" . stripPrefix "_msgStmFlashLockSector_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmFlashLockSector_" . P.stripPrefix "_msgStmFlashLockSector_"}
              ''MsgStmFlashLockSector)
 $(makeLenses ''MsgStmFlashLockSector)
 
@@ -255,7 +255,7 @@
 
 $(deriveSBP 'msgStmFlashUnlockSector ''MsgStmFlashUnlockSector)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmFlashUnlockSector_" . stripPrefix "_msgStmFlashUnlockSector_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmFlashUnlockSector_" . P.stripPrefix "_msgStmFlashUnlockSector_"}
              ''MsgStmFlashUnlockSector)
 $(makeLenses ''MsgStmFlashUnlockSector)
 
@@ -279,7 +279,7 @@
 
 $(deriveSBP 'msgStmUniqueIdReq ''MsgStmUniqueIdReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmUniqueIdReq_" . stripPrefix "_msgStmUniqueIdReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmUniqueIdReq_" . P.stripPrefix "_msgStmUniqueIdReq_"}
              ''MsgStmUniqueIdReq)
 $(makeLenses ''MsgStmUniqueIdReq)
 
@@ -306,7 +306,7 @@
 
 $(deriveSBP 'msgStmUniqueIdResp ''MsgStmUniqueIdResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmUniqueIdResp_" . stripPrefix "_msgStmUniqueIdResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStmUniqueIdResp_" . P.stripPrefix "_msgStmUniqueIdResp_"}
              ''MsgStmUniqueIdResp)
 $(makeLenses ''MsgStmUniqueIdResp)
 
@@ -332,6 +332,6 @@
 
 $(deriveSBP 'msgM25FlashWriteStatus ''MsgM25FlashWriteStatus)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgM25FlashWriteStatus_" . stripPrefix "_msgM25FlashWriteStatus_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgM25FlashWriteStatus_" . P.stripPrefix "_msgM25FlashWriteStatus_"}
              ''MsgM25FlashWriteStatus)
 $(makeLenses ''MsgM25FlashWriteStatus)
diff --git a/src/SwiftNav/SBP/Gnss.hs b/src/SwiftNav/SBP/Gnss.hs
--- a/src/SwiftNav/SBP/Gnss.hs
+++ b/src/SwiftNav/SBP/Gnss.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.Gnss where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -48,7 +48,7 @@
   put GnssSignal16 {..} = do
     putWord8 _gnssSignal16_sat
     putWord8 _gnssSignal16_code
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gnssSignal16_" . stripPrefix "_gnssSignal16_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gnssSignal16_" . P.stripPrefix "_gnssSignal16_"}
              ''GnssSignal16)
 $(makeLenses ''GnssSignal16)
 
@@ -75,7 +75,7 @@
     putWord16le _gnssSignal_sat
     putWord8 _gnssSignal_code
     putWord8 _gnssSignal_reserved
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gnssSignal_" . stripPrefix "_gnssSignal_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gnssSignal_" . P.stripPrefix "_gnssSignal_"}
              ''GnssSignal)
 $(makeLenses ''GnssSignal)
 
@@ -99,7 +99,7 @@
   put GpsTime {..} = do
     putWord32le _gpsTime_tow
     putWord16le _gpsTime_wn
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gpsTime_" . stripPrefix "_gpsTime_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gpsTime_" . P.stripPrefix "_gpsTime_"}
              ''GpsTime)
 $(makeLenses ''GpsTime)
 
@@ -131,7 +131,7 @@
     putWord32le _gpsTimeNano_tow
     putWord32le $ fromIntegral _gpsTimeNano_ns
     putWord16le _gpsTimeNano_wn
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gpsTimeNano_" . stripPrefix "_gpsTimeNano_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gpsTimeNano_" . P.stripPrefix "_gpsTimeNano_"}
              ''GpsTimeNano)
 $(makeLenses ''GpsTimeNano)
 
@@ -156,6 +156,6 @@
   put CarrierPhase {..} = do
     putWord32le $ fromIntegral _carrierPhase_i
     putWord8 _carrierPhase_f
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_carrierPhase_" . stripPrefix "_carrierPhase_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_carrierPhase_" . P.stripPrefix "_carrierPhase_"}
              ''CarrierPhase)
 $(makeLenses ''CarrierPhase)
diff --git a/src/SwiftNav/SBP/Logging.hs b/src/SwiftNav/SBP/Logging.hs
--- a/src/SwiftNav/SBP/Logging.hs
+++ b/src/SwiftNav/SBP/Logging.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.Logging where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -54,7 +54,7 @@
 
 $(deriveSBP 'msgLog ''MsgLog)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgLog_" . stripPrefix "_msgLog_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgLog_" . P.stripPrefix "_msgLog_"}
              ''MsgLog)
 $(makeLenses ''MsgLog)
 
@@ -93,7 +93,7 @@
 
 $(deriveSBP 'msgFwd ''MsgFwd)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFwd_" . stripPrefix "_msgFwd_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgFwd_" . P.stripPrefix "_msgFwd_"}
              ''MsgFwd)
 $(makeLenses ''MsgFwd)
 
@@ -118,7 +118,7 @@
 
 $(deriveSBP 'msgTweet ''MsgTweet)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTweet_" . stripPrefix "_msgTweet_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTweet_" . P.stripPrefix "_msgTweet_"}
              ''MsgTweet)
 $(makeLenses ''MsgTweet)
 
@@ -143,6 +143,6 @@
 
 $(deriveSBP 'msgPrintDep ''MsgPrintDep)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPrintDep_" . stripPrefix "_msgPrintDep_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPrintDep_" . P.stripPrefix "_msgPrintDep_"}
              ''MsgPrintDep)
 $(makeLenses ''MsgPrintDep)
diff --git a/src/SwiftNav/SBP/Navigation.hs b/src/SwiftNav/SBP/Navigation.hs
--- a/src/SwiftNav/SBP/Navigation.hs
+++ b/src/SwiftNav/SBP/Navigation.hs
@@ -19,7 +19,7 @@
 
 module SwiftNav.SBP.Navigation where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -77,7 +77,7 @@
 
 $(deriveSBP 'msgGpsTime ''MsgGpsTime)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGpsTime_" . stripPrefix "_msgGpsTime_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGpsTime_" . P.stripPrefix "_msgGpsTime_"}
              ''MsgGpsTime)
 $(makeLenses ''MsgGpsTime)
 
@@ -137,7 +137,7 @@
 
 $(deriveSBP 'msgUtcTime ''MsgUtcTime)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUtcTime_" . stripPrefix "_msgUtcTime_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUtcTime_" . P.stripPrefix "_msgUtcTime_"}
              ''MsgUtcTime)
 $(makeLenses ''MsgUtcTime)
 
@@ -189,7 +189,7 @@
 
 $(deriveSBP 'msgDops ''MsgDops)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDops_" . stripPrefix "_msgDops_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDops_" . P.stripPrefix "_msgDops_"}
              ''MsgDops)
 $(makeLenses ''MsgDops)
 
@@ -244,7 +244,7 @@
 
 $(deriveSBP 'msgPosEcef ''MsgPosEcef)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosEcef_" . stripPrefix "_msgPosEcef_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosEcef_" . P.stripPrefix "_msgPosEcef_"}
              ''MsgPosEcef)
 $(makeLenses ''MsgPosEcef)
 
@@ -268,7 +268,7 @@
   , _msgPosLlh_lon      :: Double
     -- ^ Longitude
   , _msgPosLlh_height   :: Double
-    -- ^ Height
+    -- ^ Height above WGS84 ellipsoid
   , _msgPosLlh_h_accuracy :: Word16
     -- ^ Horizontal position accuracy estimate (not implemented). Defaults to 0.
   , _msgPosLlh_v_accuracy :: Word16
@@ -303,7 +303,7 @@
 
 $(deriveSBP 'msgPosLlh ''MsgPosLlh)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosLlh_" . stripPrefix "_msgPosLlh_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosLlh_" . P.stripPrefix "_msgPosLlh_"}
              ''MsgPosLlh)
 $(makeLenses ''MsgPosLlh)
 
@@ -355,7 +355,7 @@
 
 $(deriveSBP 'msgBaselineEcef ''MsgBaselineEcef)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineEcef_" . stripPrefix "_msgBaselineEcef_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineEcef_" . P.stripPrefix "_msgBaselineEcef_"}
              ''MsgBaselineEcef)
 $(makeLenses ''MsgBaselineEcef)
 
@@ -413,7 +413,7 @@
 
 $(deriveSBP 'msgBaselineNed ''MsgBaselineNed)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineNed_" . stripPrefix "_msgBaselineNed_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineNed_" . P.stripPrefix "_msgBaselineNed_"}
              ''MsgBaselineNed)
 $(makeLenses ''MsgBaselineNed)
 
@@ -464,7 +464,7 @@
 
 $(deriveSBP 'msgVelEcef ''MsgVelEcef)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelEcef_" . stripPrefix "_msgVelEcef_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelEcef_" . P.stripPrefix "_msgVelEcef_"}
              ''MsgVelEcef)
 $(makeLenses ''MsgVelEcef)
 
@@ -520,7 +520,7 @@
 
 $(deriveSBP 'msgVelNed ''MsgVelNed)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelNed_" . stripPrefix "_msgVelNed_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelNed_" . P.stripPrefix "_msgVelNed_"}
              ''MsgVelNed)
 $(makeLenses ''MsgVelNed)
 
@@ -560,7 +560,7 @@
 
 $(deriveSBP 'msgBaselineHeading ''MsgBaselineHeading)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineHeading_" . stripPrefix "_msgBaselineHeading_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineHeading_" . P.stripPrefix "_msgBaselineHeading_"}
              ''MsgBaselineHeading)
 $(makeLenses ''MsgBaselineHeading)
 
@@ -590,7 +590,7 @@
 
 $(deriveSBP 'msgAgeCorrections ''MsgAgeCorrections)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAgeCorrections_" . stripPrefix "_msgAgeCorrections_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAgeCorrections_" . P.stripPrefix "_msgAgeCorrections_"}
              ''MsgAgeCorrections)
 $(makeLenses ''MsgAgeCorrections)
 
@@ -636,7 +636,7 @@
 
 $(deriveSBP 'msgGpsTimeDepA ''MsgGpsTimeDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGpsTimeDepA_" . stripPrefix "_msgGpsTimeDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGpsTimeDepA_" . P.stripPrefix "_msgGpsTimeDepA_"}
              ''MsgGpsTimeDepA)
 $(makeLenses ''MsgGpsTimeDepA)
 
@@ -682,7 +682,7 @@
 
 $(deriveSBP 'msgDopsDepA ''MsgDopsDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDopsDepA_" . stripPrefix "_msgDopsDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDopsDepA_" . P.stripPrefix "_msgDopsDepA_"}
              ''MsgDopsDepA)
 $(makeLenses ''MsgDopsDepA)
 
@@ -737,7 +737,7 @@
 
 $(deriveSBP 'msgPosEcefDepA ''MsgPosEcefDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosEcefDepA_" . stripPrefix "_msgPosEcefDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosEcefDepA_" . P.stripPrefix "_msgPosEcefDepA_"}
              ''MsgPosEcefDepA)
 $(makeLenses ''MsgPosEcefDepA)
 
@@ -796,7 +796,7 @@
 
 $(deriveSBP 'msgPosLlhDepA ''MsgPosLlhDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosLlhDepA_" . stripPrefix "_msgPosLlhDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgPosLlhDepA_" . P.stripPrefix "_msgPosLlhDepA_"}
              ''MsgPosLlhDepA)
 $(makeLenses ''MsgPosLlhDepA)
 
@@ -848,7 +848,7 @@
 
 $(deriveSBP 'msgBaselineEcefDepA ''MsgBaselineEcefDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineEcefDepA_" . stripPrefix "_msgBaselineEcefDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineEcefDepA_" . P.stripPrefix "_msgBaselineEcefDepA_"}
              ''MsgBaselineEcefDepA)
 $(makeLenses ''MsgBaselineEcefDepA)
 
@@ -906,7 +906,7 @@
 
 $(deriveSBP 'msgBaselineNedDepA ''MsgBaselineNedDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineNedDepA_" . stripPrefix "_msgBaselineNedDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineNedDepA_" . P.stripPrefix "_msgBaselineNedDepA_"}
              ''MsgBaselineNedDepA)
 $(makeLenses ''MsgBaselineNedDepA)
 
@@ -957,7 +957,7 @@
 
 $(deriveSBP 'msgVelEcefDepA ''MsgVelEcefDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelEcefDepA_" . stripPrefix "_msgVelEcefDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelEcefDepA_" . P.stripPrefix "_msgVelEcefDepA_"}
              ''MsgVelEcefDepA)
 $(makeLenses ''MsgVelEcefDepA)
 
@@ -1013,7 +1013,7 @@
 
 $(deriveSBP 'msgVelNedDepA ''MsgVelNedDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelNedDepA_" . stripPrefix "_msgVelNedDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgVelNedDepA_" . P.stripPrefix "_msgVelNedDepA_"}
              ''MsgVelNedDepA)
 $(makeLenses ''MsgVelNedDepA)
 
@@ -1052,6 +1052,6 @@
 
 $(deriveSBP 'msgBaselineHeadingDepA ''MsgBaselineHeadingDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineHeadingDepA_" . stripPrefix "_msgBaselineHeadingDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBaselineHeadingDepA_" . P.stripPrefix "_msgBaselineHeadingDepA_"}
              ''MsgBaselineHeadingDepA)
 $(makeLenses ''MsgBaselineHeadingDepA)
diff --git a/src/SwiftNav/SBP/Observation.hs b/src/SwiftNav/SBP/Observation.hs
--- a/src/SwiftNav/SBP/Observation.hs
+++ b/src/SwiftNav/SBP/Observation.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.Observation where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -48,7 +48,7 @@
   put ObservationHeader {..} = do
     put _observationHeader_t
     putWord8 _observationHeader_n_obs
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_observationHeader_" . stripPrefix "_observationHeader_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_observationHeader_" . P.stripPrefix "_observationHeader_"}
              ''ObservationHeader)
 $(makeLenses ''ObservationHeader)
 
@@ -73,7 +73,7 @@
   put Doppler {..} = do
     putWord16le $ fromIntegral _doppler_i
     putWord8 _doppler_f
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_doppler_" . stripPrefix "_doppler_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_doppler_" . P.stripPrefix "_doppler_"}
              ''Doppler)
 $(makeLenses ''Doppler)
 
@@ -125,7 +125,7 @@
     putWord8 _packedObsContent_lock
     putWord8 _packedObsContent_flags
     put _packedObsContent_sid
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContent_" . stripPrefix "_packedObsContent_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContent_" . P.stripPrefix "_packedObsContent_"}
              ''PackedObsContent)
 $(makeLenses ''PackedObsContent)
 
@@ -167,7 +167,7 @@
 
 $(deriveSBP 'msgObs ''MsgObs)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObs_" . stripPrefix "_msgObs_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObs_" . P.stripPrefix "_msgObs_"}
              ''MsgObs)
 $(makeLenses ''MsgObs)
 
@@ -203,7 +203,7 @@
 
 $(deriveSBP 'msgBasePosLlh ''MsgBasePosLlh)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBasePosLlh_" . stripPrefix "_msgBasePosLlh_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBasePosLlh_" . P.stripPrefix "_msgBasePosLlh_"}
              ''MsgBasePosLlh)
 $(makeLenses ''MsgBasePosLlh)
 
@@ -240,7 +240,7 @@
 
 $(deriveSBP 'msgBasePosEcef ''MsgBasePosEcef)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBasePosEcef_" . stripPrefix "_msgBasePosEcef_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgBasePosEcef_" . P.stripPrefix "_msgBasePosEcef_"}
              ''MsgBasePosEcef)
 $(makeLenses ''MsgBasePosEcef)
 
@@ -277,7 +277,7 @@
     putWord32le _ephemerisCommonContent_fit_interval
     putWord8 _ephemerisCommonContent_valid
     putWord8 _ephemerisCommonContent_health_bits
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_ephemerisCommonContent_" . stripPrefix "_ephemerisCommonContent_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_ephemerisCommonContent_" . P.stripPrefix "_ephemerisCommonContent_"}
              ''EphemerisCommonContent)
 $(makeLenses ''EphemerisCommonContent)
 
@@ -397,7 +397,7 @@
 
 $(deriveSBP 'msgEphemerisGps ''MsgEphemerisGps)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisGps_" . stripPrefix "_msgEphemerisGps_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisGps_" . P.stripPrefix "_msgEphemerisGps_"}
              ''MsgEphemerisGps)
 $(makeLenses ''MsgEphemerisGps)
 
@@ -439,7 +439,7 @@
 
 $(deriveSBP 'msgEphemerisSbas ''MsgEphemerisSbas)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisSbas_" . stripPrefix "_msgEphemerisSbas_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisSbas_" . P.stripPrefix "_msgEphemerisSbas_"}
              ''MsgEphemerisSbas)
 $(makeLenses ''MsgEphemerisSbas)
 
@@ -487,7 +487,7 @@
 
 $(deriveSBP 'msgEphemerisGlo ''MsgEphemerisGlo)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisGlo_" . stripPrefix "_msgEphemerisGlo_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisGlo_" . P.stripPrefix "_msgEphemerisGlo_"}
              ''MsgEphemerisGlo)
 $(makeLenses ''MsgEphemerisGlo)
 
@@ -631,7 +631,7 @@
 
 $(deriveSBP 'msgEphemerisDepD ''MsgEphemerisDepD)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepD_" . stripPrefix "_msgEphemerisDepD_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepD_" . P.stripPrefix "_msgEphemerisDepD_"}
              ''MsgEphemerisDepD)
 $(makeLenses ''MsgEphemerisDepD)
 
@@ -760,7 +760,7 @@
 
 $(deriveSBP 'msgEphemerisDepA ''MsgEphemerisDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepA_" . stripPrefix "_msgEphemerisDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepA_" . P.stripPrefix "_msgEphemerisDepA_"}
              ''MsgEphemerisDepA)
 $(makeLenses ''MsgEphemerisDepA)
 
@@ -893,7 +893,7 @@
 
 $(deriveSBP 'msgEphemerisDepB ''MsgEphemerisDepB)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepB_" . stripPrefix "_msgEphemerisDepB_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepB_" . P.stripPrefix "_msgEphemerisDepB_"}
              ''MsgEphemerisDepB)
 $(makeLenses ''MsgEphemerisDepB)
 
@@ -1037,7 +1037,7 @@
 
 $(deriveSBP 'msgEphemerisDepC ''MsgEphemerisDepC)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepC_" . stripPrefix "_msgEphemerisDepC_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgEphemerisDepC_" . P.stripPrefix "_msgEphemerisDepC_"}
              ''MsgEphemerisDepC)
 $(makeLenses ''MsgEphemerisDepC)
 
@@ -1061,7 +1061,7 @@
   put ObservationHeaderDep {..} = do
     put _observationHeaderDep_t
     putWord8 _observationHeaderDep_n_obs
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_observationHeaderDep_" . stripPrefix "_observationHeaderDep_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_observationHeaderDep_" . P.stripPrefix "_observationHeaderDep_"}
              ''ObservationHeaderDep)
 $(makeLenses ''ObservationHeaderDep)
 
@@ -1087,7 +1087,7 @@
   put CarrierPhaseDepA {..} = do
     putWord32le $ fromIntegral _carrierPhaseDepA_i
     putWord8 _carrierPhaseDepA_f
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_carrierPhaseDepA_" . stripPrefix "_carrierPhaseDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_carrierPhaseDepA_" . P.stripPrefix "_carrierPhaseDepA_"}
              ''CarrierPhaseDepA)
 $(makeLenses ''CarrierPhaseDepA)
 
@@ -1124,7 +1124,7 @@
     putWord8 _packedObsContentDepA_cn0
     putWord16le _packedObsContentDepA_lock
     putWord8 _packedObsContentDepA_prn
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepA_" . stripPrefix "_packedObsContentDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepA_" . P.stripPrefix "_packedObsContentDepA_"}
              ''PackedObsContentDepA)
 $(makeLenses ''PackedObsContentDepA)
 
@@ -1162,7 +1162,7 @@
     putWord8 _packedObsContentDepB_cn0
     putWord16le _packedObsContentDepB_lock
     put _packedObsContentDepB_sid
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepB_" . stripPrefix "_packedObsContentDepB_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepB_" . P.stripPrefix "_packedObsContentDepB_"}
              ''PackedObsContentDepB)
 $(makeLenses ''PackedObsContentDepB)
 
@@ -1201,7 +1201,7 @@
     putWord8 _packedObsContentDepC_cn0
     putWord16le _packedObsContentDepC_lock
     put _packedObsContentDepC_sid
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepC_" . stripPrefix "_packedObsContentDepC_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_packedObsContentDepC_" . P.stripPrefix "_packedObsContentDepC_"}
              ''PackedObsContentDepC)
 $(makeLenses ''PackedObsContentDepC)
 
@@ -1230,7 +1230,7 @@
 
 $(deriveSBP 'msgObsDepA ''MsgObsDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepA_" . stripPrefix "_msgObsDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepA_" . P.stripPrefix "_msgObsDepA_"}
              ''MsgObsDepA)
 $(makeLenses ''MsgObsDepA)
 
@@ -1262,7 +1262,7 @@
 
 $(deriveSBP 'msgObsDepB ''MsgObsDepB)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepB_" . stripPrefix "_msgObsDepB_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepB_" . P.stripPrefix "_msgObsDepB_"}
              ''MsgObsDepB)
 $(makeLenses ''MsgObsDepB)
 
@@ -1296,7 +1296,7 @@
 
 $(deriveSBP 'msgObsDepC ''MsgObsDepC)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepC_" . stripPrefix "_msgObsDepC_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgObsDepC_" . P.stripPrefix "_msgObsDepC_"}
              ''MsgObsDepC)
 $(makeLenses ''MsgObsDepC)
 
@@ -1347,7 +1347,7 @@
 
 $(deriveSBP 'msgIono ''MsgIono)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgIono_" . stripPrefix "_msgIono_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgIono_" . P.stripPrefix "_msgIono_"}
              ''MsgIono)
 $(makeLenses ''MsgIono)
 
@@ -1376,7 +1376,7 @@
 
 $(deriveSBP 'msgSvConfigurationGps ''MsgSvConfigurationGps)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSvConfigurationGps_" . stripPrefix "_msgSvConfigurationGps_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSvConfigurationGps_" . P.stripPrefix "_msgSvConfigurationGps_"}
              ''MsgSvConfigurationGps)
 $(makeLenses ''MsgSvConfigurationGps)
 
@@ -1419,6 +1419,6 @@
 
 $(deriveSBP 'msgGroupDelay ''MsgGroupDelay)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGroupDelay_" . stripPrefix "_msgGroupDelay_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgGroupDelay_" . P.stripPrefix "_msgGroupDelay_"}
              ''MsgGroupDelay)
 $(makeLenses ''MsgGroupDelay)
diff --git a/src/SwiftNav/SBP/Piksi.hs b/src/SwiftNav/SBP/Piksi.hs
--- a/src/SwiftNav/SBP/Piksi.hs
+++ b/src/SwiftNav/SBP/Piksi.hs
@@ -13,7 +13,7 @@
 
 module SwiftNav.SBP.Piksi where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -49,7 +49,7 @@
 
 $(deriveSBP 'msgAlmanac ''MsgAlmanac)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAlmanac_" . stripPrefix "_msgAlmanac_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgAlmanac_" . P.stripPrefix "_msgAlmanac_"}
              ''MsgAlmanac)
 $(makeLenses ''MsgAlmanac)
 
@@ -72,7 +72,7 @@
 
 $(deriveSBP 'msgSetTime ''MsgSetTime)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSetTime_" . stripPrefix "_msgSetTime_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSetTime_" . P.stripPrefix "_msgSetTime_"}
              ''MsgSetTime)
 $(makeLenses ''MsgSetTime)
 
@@ -94,7 +94,7 @@
 
 $(deriveSBP 'msgReset ''MsgReset)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgReset_" . stripPrefix "_msgReset_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgReset_" . P.stripPrefix "_msgReset_"}
              ''MsgReset)
 $(makeLenses ''MsgReset)
 
@@ -118,7 +118,7 @@
 
 $(deriveSBP 'msgCwResults ''MsgCwResults)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCwResults_" . stripPrefix "_msgCwResults_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCwResults_" . P.stripPrefix "_msgCwResults_"}
              ''MsgCwResults)
 $(makeLenses ''MsgCwResults)
 
@@ -142,7 +142,7 @@
 
 $(deriveSBP 'msgCwStart ''MsgCwStart)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCwStart_" . stripPrefix "_msgCwStart_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCwStart_" . P.stripPrefix "_msgCwStart_"}
              ''MsgCwStart)
 $(makeLenses ''MsgCwStart)
 
@@ -168,7 +168,7 @@
 
 $(deriveSBP 'msgResetFilters ''MsgResetFilters)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgResetFilters_" . stripPrefix "_msgResetFilters_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgResetFilters_" . P.stripPrefix "_msgResetFilters_"}
              ''MsgResetFilters)
 $(makeLenses ''MsgResetFilters)
 
@@ -193,7 +193,7 @@
 
 $(deriveSBP 'msgInitBase ''MsgInitBase)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgInitBase_" . stripPrefix "_msgInitBase_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgInitBase_" . P.stripPrefix "_msgInitBase_"}
              ''MsgInitBase)
 $(makeLenses ''MsgInitBase)
 
@@ -229,7 +229,7 @@
 
 $(deriveSBP 'msgThreadState ''MsgThreadState)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgThreadState_" . stripPrefix "_msgThreadState_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgThreadState_" . P.stripPrefix "_msgThreadState_"}
              ''MsgThreadState)
 $(makeLenses ''MsgThreadState)
 
@@ -269,7 +269,7 @@
     putWord16le _uARTChannel_io_error_count
     putWord8 _uARTChannel_tx_buffer_level
     putWord8 _uARTChannel_rx_buffer_level
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_uARTChannel_" . stripPrefix "_uARTChannel_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_uARTChannel_" . P.stripPrefix "_uARTChannel_"}
              ''UARTChannel)
 $(makeLenses ''UARTChannel)
 
@@ -304,7 +304,7 @@
     putWord32le $ fromIntegral _period_pmin
     putWord32le $ fromIntegral _period_pmax
     putWord32le $ fromIntegral _period_current
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_period_" . stripPrefix "_period_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_period_" . P.stripPrefix "_period_"}
              ''Period)
 $(makeLenses ''Period)
 
@@ -338,7 +338,7 @@
     putWord32le $ fromIntegral _latency_lmin
     putWord32le $ fromIntegral _latency_lmax
     putWord32le $ fromIntegral _latency_current
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_latency_" . stripPrefix "_latency_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_latency_" . P.stripPrefix "_latency_"}
              ''Latency)
 $(makeLenses ''Latency)
 
@@ -386,7 +386,7 @@
 
 $(deriveSBP 'msgUartState ''MsgUartState)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUartState_" . stripPrefix "_msgUartState_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUartState_" . P.stripPrefix "_msgUartState_"}
              ''MsgUartState)
 $(makeLenses ''MsgUartState)
 
@@ -423,7 +423,7 @@
 
 $(deriveSBP 'msgUartStateDepa ''MsgUartStateDepa)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUartStateDepa_" . stripPrefix "_msgUartStateDepa_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUartStateDepa_" . P.stripPrefix "_msgUartStateDepa_"}
              ''MsgUartStateDepa)
 $(makeLenses ''MsgUartStateDepa)
 
@@ -450,7 +450,7 @@
 
 $(deriveSBP 'msgIarState ''MsgIarState)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgIarState_" . stripPrefix "_msgIarState_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgIarState_" . P.stripPrefix "_msgIarState_"}
              ''MsgIarState)
 $(makeLenses ''MsgIarState)
 
@@ -480,7 +480,7 @@
 
 $(deriveSBP 'msgMaskSatellite ''MsgMaskSatellite)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgMaskSatellite_" . stripPrefix "_msgMaskSatellite_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgMaskSatellite_" . P.stripPrefix "_msgMaskSatellite_"}
              ''MsgMaskSatellite)
 $(makeLenses ''MsgMaskSatellite)
 
@@ -523,7 +523,7 @@
 
 $(deriveSBP 'msgDeviceMonitor ''MsgDeviceMonitor)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDeviceMonitor_" . stripPrefix "_msgDeviceMonitor_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDeviceMonitor_" . P.stripPrefix "_msgDeviceMonitor_"}
              ''MsgDeviceMonitor)
 $(makeLenses ''MsgDeviceMonitor)
 
@@ -553,7 +553,7 @@
 
 $(deriveSBP 'msgCommandReq ''MsgCommandReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCommandReq_" . stripPrefix "_msgCommandReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCommandReq_" . P.stripPrefix "_msgCommandReq_"}
              ''MsgCommandReq)
 $(makeLenses ''MsgCommandReq)
 
@@ -583,6 +583,6 @@
 
 $(deriveSBP 'msgCommandResp ''MsgCommandResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCommandResp_" . stripPrefix "_msgCommandResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgCommandResp_" . P.stripPrefix "_msgCommandResp_"}
              ''MsgCommandResp)
 $(makeLenses ''MsgCommandResp)
diff --git a/src/SwiftNav/SBP/Settings.hs b/src/SwiftNav/SBP/Settings.hs
--- a/src/SwiftNav/SBP/Settings.hs
+++ b/src/SwiftNav/SBP/Settings.hs
@@ -15,7 +15,7 @@
 
 module SwiftNav.SBP.Settings where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -50,7 +50,7 @@
 
 $(deriveSBP 'msgSettingsSave ''MsgSettingsSave)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsSave_" . stripPrefix "_msgSettingsSave_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsSave_" . P.stripPrefix "_msgSettingsSave_"}
              ''MsgSettingsSave)
 $(makeLenses ''MsgSettingsSave)
 
@@ -77,7 +77,7 @@
 
 $(deriveSBP 'msgSettingsWrite ''MsgSettingsWrite)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsWrite_" . stripPrefix "_msgSettingsWrite_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsWrite_" . P.stripPrefix "_msgSettingsWrite_"}
              ''MsgSettingsWrite)
 $(makeLenses ''MsgSettingsWrite)
 
@@ -104,7 +104,7 @@
 
 $(deriveSBP 'msgSettingsReadReq ''MsgSettingsReadReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadReq_" . stripPrefix "_msgSettingsReadReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadReq_" . P.stripPrefix "_msgSettingsReadReq_"}
              ''MsgSettingsReadReq)
 $(makeLenses ''MsgSettingsReadReq)
 
@@ -130,7 +130,7 @@
 
 $(deriveSBP 'msgSettingsReadResp ''MsgSettingsReadResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadResp_" . stripPrefix "_msgSettingsReadResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadResp_" . P.stripPrefix "_msgSettingsReadResp_"}
              ''MsgSettingsReadResp)
 $(makeLenses ''MsgSettingsReadResp)
 
@@ -159,7 +159,7 @@
 
 $(deriveSBP 'msgSettingsReadByIndexReq ''MsgSettingsReadByIndexReq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexReq_" . stripPrefix "_msgSettingsReadByIndexReq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexReq_" . P.stripPrefix "_msgSettingsReadByIndexReq_"}
              ''MsgSettingsReadByIndexReq)
 $(makeLenses ''MsgSettingsReadByIndexReq)
 
@@ -192,7 +192,7 @@
 
 $(deriveSBP 'msgSettingsReadByIndexResp ''MsgSettingsReadByIndexResp)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexResp_" . stripPrefix "_msgSettingsReadByIndexResp_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexResp_" . P.stripPrefix "_msgSettingsReadByIndexResp_"}
              ''MsgSettingsReadByIndexResp)
 $(makeLenses ''MsgSettingsReadByIndexResp)
 
@@ -214,7 +214,7 @@
 
 $(deriveSBP 'msgSettingsReadByIndexDone ''MsgSettingsReadByIndexDone)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexDone_" . stripPrefix "_msgSettingsReadByIndexDone_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsReadByIndexDone_" . P.stripPrefix "_msgSettingsReadByIndexDone_"}
              ''MsgSettingsReadByIndexDone)
 $(makeLenses ''MsgSettingsReadByIndexDone)
 
@@ -242,6 +242,6 @@
 
 $(deriveSBP 'msgSettingsRegister ''MsgSettingsRegister)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsRegister_" . stripPrefix "_msgSettingsRegister_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgSettingsRegister_" . P.stripPrefix "_msgSettingsRegister_"}
              ''MsgSettingsRegister)
 $(makeLenses ''MsgSettingsRegister)
diff --git a/src/SwiftNav/SBP/System.hs b/src/SwiftNav/SBP/System.hs
--- a/src/SwiftNav/SBP/System.hs
+++ b/src/SwiftNav/SBP/System.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.System where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -58,7 +58,7 @@
 
 $(deriveSBP 'msgStartup ''MsgStartup)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStartup_" . stripPrefix "_msgStartup_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgStartup_" . P.stripPrefix "_msgStartup_"}
              ''MsgStartup)
 $(makeLenses ''MsgStartup)
 
@@ -97,7 +97,7 @@
 
 $(deriveSBP 'msgDgnssStatus ''MsgDgnssStatus)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDgnssStatus_" . stripPrefix "_msgDgnssStatus_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgDgnssStatus_" . P.stripPrefix "_msgDgnssStatus_"}
              ''MsgDgnssStatus)
 $(makeLenses ''MsgDgnssStatus)
 
@@ -128,6 +128,6 @@
 
 $(deriveSBP 'msgHeartbeat ''MsgHeartbeat)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgHeartbeat_" . stripPrefix "_msgHeartbeat_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgHeartbeat_" . P.stripPrefix "_msgHeartbeat_"}
              ''MsgHeartbeat)
 $(makeLenses ''MsgHeartbeat)
diff --git a/src/SwiftNav/SBP/Tracking.hs b/src/SwiftNav/SBP/Tracking.hs
--- a/src/SwiftNav/SBP/Tracking.hs
+++ b/src/SwiftNav/SBP/Tracking.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.Tracking where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -137,7 +137,7 @@
 
 $(deriveSBP 'msgTrackingStateDetailed ''MsgTrackingStateDetailed)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingStateDetailed_" . stripPrefix "_msgTrackingStateDetailed_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingStateDetailed_" . P.stripPrefix "_msgTrackingStateDetailed_"}
              ''MsgTrackingStateDetailed)
 $(makeLenses ''MsgTrackingStateDetailed)
 
@@ -165,7 +165,7 @@
     putWord8 _trackingChannelState_state
     put _trackingChannelState_sid
     putFloat32le _trackingChannelState_cn0
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelState_" . stripPrefix "_trackingChannelState_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelState_" . P.stripPrefix "_trackingChannelState_"}
              ''TrackingChannelState)
 $(makeLenses ''TrackingChannelState)
 
@@ -192,7 +192,7 @@
 
 $(deriveSBP 'msgTrackingState ''MsgTrackingState)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingState_" . stripPrefix "_msgTrackingState_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingState_" . P.stripPrefix "_msgTrackingState_"}
              ''MsgTrackingState)
 $(makeLenses ''MsgTrackingState)
 
@@ -215,7 +215,7 @@
   put TrackingChannelCorrelation {..} = do
     putWord32le $ fromIntegral _trackingChannelCorrelation_I
     putWord32le $ fromIntegral _trackingChannelCorrelation_Q
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelCorrelation_" . stripPrefix "_trackingChannelCorrelation_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelCorrelation_" . P.stripPrefix "_trackingChannelCorrelation_"}
              ''TrackingChannelCorrelation)
 $(makeLenses ''TrackingChannelCorrelation)
 
@@ -249,7 +249,7 @@
 
 $(deriveSBP 'msgTrackingIq ''MsgTrackingIq)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingIq_" . stripPrefix "_msgTrackingIq_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingIq_" . P.stripPrefix "_msgTrackingIq_"}
              ''MsgTrackingIq)
 $(makeLenses ''MsgTrackingIq)
 
@@ -276,7 +276,7 @@
     putWord8 _trackingChannelStateDepA_state
     putWord8 _trackingChannelStateDepA_prn
     putFloat32le _trackingChannelStateDepA_cn0
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelStateDepA_" . stripPrefix "_trackingChannelStateDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_trackingChannelStateDepA_" . P.stripPrefix "_trackingChannelStateDepA_"}
              ''TrackingChannelStateDepA)
 $(makeLenses ''TrackingChannelStateDepA)
 
@@ -301,6 +301,6 @@
 
 $(deriveSBP 'msgTrackingStateDepA ''MsgTrackingStateDepA)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingStateDepA_" . stripPrefix "_msgTrackingStateDepA_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgTrackingStateDepA_" . P.stripPrefix "_msgTrackingStateDepA_"}
              ''MsgTrackingStateDepA)
 $(makeLenses ''MsgTrackingStateDepA)
diff --git a/src/SwiftNav/SBP/User.hs b/src/SwiftNav/SBP/User.hs
--- a/src/SwiftNav/SBP/User.hs
+++ b/src/SwiftNav/SBP/User.hs
@@ -11,7 +11,7 @@
 
 module SwiftNav.SBP.User where
 
-import BasicPrelude
+import BasicPrelude as P
 import Control.Lens
 import Control.Monad.Loops
 import Data.Aeson.TH           (defaultOptions, deriveJSON, fieldLabelModifier)
@@ -49,6 +49,6 @@
 
 $(deriveSBP 'msgUserData ''MsgUserData)
 
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUserData_" . stripPrefix "_msgUserData_"}
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_msgUserData_" . P.stripPrefix "_msgUserData_"}
              ''MsgUserData)
 $(makeLenses ''MsgUserData)