diff --git a/sbp.cabal b/sbp.cabal
--- a/sbp.cabal
+++ b/sbp.cabal
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               0.52.0
+version:               0.52.1
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3
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
@@ -44,7 +44,7 @@
     -- ^ Code phase of best point
   , _msgAcqResult_cf :: Float
     -- ^ Carrier frequency of best point
-  , _msgAcqResult_sid :: SBPGnssSignal
+  , _msgAcqResult_sid :: GnssSignal
     -- ^ GNSS signal for which acquisition was attempted
   } deriving ( Show, Read, Eq )
 
diff --git a/src/SwiftNav/SBP/GnssSignal.hs b/src/SwiftNav/SBP/GnssSignal.hs
--- a/src/SwiftNav/SBP/GnssSignal.hs
+++ b/src/SwiftNav/SBP/GnssSignal.hs
@@ -26,29 +26,29 @@
 import SwiftNav.SBP.TH
 import SwiftNav.SBP.Types
 
--- | SBPGnssSignal.
+-- | GnssSignal.
 --
 -- Signal identifier containing constellation, band, and satellite identifier
-data SBPGnssSignal = SBPGnssSignal
-  { _sBPGnssSignal_sat         :: Word16
+data GnssSignal = GnssSignal
+  { _gnssSignal_sat         :: Word16
     -- ^ Constellation-specific satellite identifier
-  , _sBPGnssSignal_band        :: Word8
+  , _gnssSignal_band        :: Word8
     -- ^ Signal band
-  , _sBPGnssSignal_constellation :: Word8
+  , _gnssSignal_constellation :: Word8
     -- ^ Constellation to which the satellite belongs
   } deriving ( Show, Read, Eq )
 
-instance Binary SBPGnssSignal where
+instance Binary GnssSignal where
   get = do
-    _sBPGnssSignal_sat <- getWord16le
-    _sBPGnssSignal_band <- getWord8
-    _sBPGnssSignal_constellation <- getWord8
-    return SBPGnssSignal {..}
+    _gnssSignal_sat <- getWord16le
+    _gnssSignal_band <- getWord8
+    _gnssSignal_constellation <- getWord8
+    return GnssSignal {..}
 
-  put SBPGnssSignal {..} = do
-    putWord16le _sBPGnssSignal_sat
-    putWord8 _sBPGnssSignal_band
-    putWord8 _sBPGnssSignal_constellation
-$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_sBPGnssSignal_" . stripPrefix "_sBPGnssSignal_"}
-             ''SBPGnssSignal)
-$(makeLenses ''SBPGnssSignal)
+  put GnssSignal {..} = do
+    putWord16le _gnssSignal_sat
+    putWord8 _gnssSignal_band
+    putWord8 _gnssSignal_constellation
+$(deriveJSON defaultOptions {fieldLabelModifier = fromMaybe "_gnssSignal_" . stripPrefix "_gnssSignal_"}
+             ''GnssSignal)
+$(makeLenses ''GnssSignal)
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
@@ -114,7 +114,7 @@
     -- ^ Lock indicator. This value changes whenever a satellite signal has lost
     -- and regained lock, indicating that the carrier phase ambiguity may have
     -- changed.
-  , _packedObsContent_sid :: SBPGnssSignal
+  , _packedObsContent_sid :: GnssSignal
     -- ^ GNSS signal identifier
   } deriving ( Show, Read, Eq )
 
@@ -306,7 +306,7 @@
     -- ^ Is valid?
   , _msgEphemeris_healthy :: Word8
     -- ^ Satellite is healthy?
-  , _msgEphemeris_sid    :: SBPGnssSignal
+  , _msgEphemeris_sid    :: GnssSignal
     -- ^ GNSS signal identifier
   , _msgEphemeris_iode   :: Word8
     -- ^ Issue of ephemeris data
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
@@ -384,7 +384,7 @@
 data MsgMaskSatellite = MsgMaskSatellite
   { _msgMaskSatellite_mask :: Word8
     -- ^ Mask of systems that should ignore this satellite.
-  , _msgMaskSatellite_sid :: SBPGnssSignal
+  , _msgMaskSatellite_sid :: GnssSignal
     -- ^ GNSS signal for which the mask is applied
   } deriving ( Show, Read, Eq )
 
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
@@ -34,7 +34,7 @@
 data TrackingChannelState = TrackingChannelState
   { _trackingChannelState_state :: Word8
     -- ^ Status of tracking channel
-  , _trackingChannelState_sid :: SBPGnssSignal
+  , _trackingChannelState_sid :: GnssSignal
     -- ^ GNSS signal being tracked
   , _trackingChannelState_cn0 :: Float
     -- ^ Carrier-to-noise density
@@ -115,7 +115,7 @@
 data MsgTrackingIq = MsgTrackingIq
   { _msgTrackingIq_channel :: Word8
     -- ^ Tracking channel of origin
-  , _msgTrackingIq_sid   :: SBPGnssSignal
+  , _msgTrackingIq_sid   :: GnssSignal
     -- ^ GNSS signal identifier
   , _msgTrackingIq_corrs :: [TrackingChannelCorrelation]
     -- ^ Early, Prompt and Late correlations