diff --git a/gnss-converters.cabal b/gnss-converters.cabal
--- a/gnss-converters.cabal
+++ b/gnss-converters.cabal
@@ -1,5 +1,5 @@
 name:                  gnss-converters
-version:               0.1.15
+version:               0.1.16
 synopsis:              GNSS Converters.
 description:           Haskell bindings for GNSS converters.
 homepage:              http://github.com/swift-nav/gnss-converters
diff --git a/src/Data/RTCM3/SBP.hs b/src/Data/RTCM3/SBP.hs
--- a/src/Data/RTCM3/SBP.hs
+++ b/src/Data/RTCM3/SBP.hs
@@ -112,18 +112,32 @@
 codeIndicator_L2C :: Word8
 codeIndicator_L2C = 0
 
--- | L2P code indicator value
+-- | L2P code direct indicator value
 --
 -- See DF016, pg. 3-17 of the RTCM3 spec
-codeIndicator_L2PD :: Word8
-codeIndicator_L2PD = 1
+codeIndicator_L2P :: Word8
+codeIndicator_L2P = 1
 
+-- | L2P code cross-correlated indicator value
+--
+-- See DF016, pg. 3-17 of the RTCM3 spec
+codeIndicator_L2D :: Word8
+codeIndicator_L2D = 2
+
+-- | L2P code correlated indicator value
+--
+-- See DF016, pg. 3-17 of the RTCM3 spec
+codeIndicator_L2W :: Word8
+codeIndicator_L2W = 3
+
 -- | Map L2 codes to SBP GnssSignal codes
 --
 l2codeToSBPSignalCode :: HashMap Word8 Word8
 l2codeToSBPSignalCode = M.fromList
-  [ (codeIndicator_L2C,  l2CMSidCode)
-  , (codeIndicator_L2PD, l2PSidCode)
+  [ (codeIndicator_L2C, l2CMSidCode)
+  , (codeIndicator_L2P, l2PSidCode)
+  , (codeIndicator_L2D, l2PSidCode)
+  , (codeIndicator_L2W, l2PSidCode)
   ]
 
 -- | Maximum number of packed observations to allow in a single SBP message.
@@ -344,7 +358,7 @@
                            -> m PackedObsContent
 fromL1SatelliteObservation station sat l1 l1e = do
   -- Checks GPS L1 code indicator for RTCM message 1002.
-  -- See DF016, pg. 3-17 of the RTCM3 spec.
+  -- See DF010, pg. 3-17 of the RTCM3 spec.
   let sid = toL1GnssSignal sat l1
   lock    <- toLock station sid $ l1 ^. gpsL1Observation_lockTime
   return PackedObsContent