diff --git a/current.txt b/current.txt
index 089f128..82a1626 100644
--- a/current.txt
+++ b/current.txt
@@ -87,9 +87,9 @@
 e6dd0c8416e523ab9cbd14d56ab6f016481a8aef3bc8a750051122d31075f6c7 android.hardware.gnss@1.0::IGnssGeofenceCallback
 f90e4ddc652706299d8e3d8ba18e0745c3bae9bf4d1be6bd06d9c1f50ec8d28a android.hardware.gnss@1.0::IGnssGeofencing
 9ea8987bb1089c8c5d7b67866575b866ef516045021d9efcc37c6352bce072a3 android.hardware.gnss@1.0::IGnssMeasurement
-d6a00007b30f0e3ed196df677f311b3e25b15082c5e82756f392677d3b66ec0a android.hardware.gnss@1.0::IGnssMeasurementCallback
+cf20492673d6a423e4c2e87fdfb5a4c4a602431721978db852e246f258e25edb android.hardware.gnss@1.0::IGnssMeasurementCallback
 af85aa0f48ae99a39f4688c344e4419304f681f9af818a5c8d759286fc4418de android.hardware.gnss@1.0::IGnssNavigationMessage
-649b1b0fb98bdd3a1ace84f4e08bfa2df813afdd4862856693f107c281a929ba android.hardware.gnss@1.0::IGnssNavigationMessageCallback
+76b0874ea4c06b29f66418c59820f4286b3be9629cd872923d0dfbb602cd432d android.hardware.gnss@1.0::IGnssNavigationMessageCallback
 248bcf51da4273d64f367bf6877baef2feeaca365459842fd3c214a2dc6e0224 android.hardware.gnss@1.0::IGnssNi
 c781b7b125f68be5db8a8c3d412d526acdbdf77dcc592a4c0ed70b8ce4fe6c49 android.hardware.gnss@1.0::IGnssNiCallback
 c1142657de16fdb292a502372fe938614d65270ab8359217d6e13604fe4dbca4 android.hardware.gnss@1.0::IGnssXtra
diff --git a/gnss/1.0/IGnssMeasurementCallback.hal b/gnss/1.0/IGnssMeasurementCallback.hal
index 467bf19..4031664 100644
--- a/gnss/1.0/IGnssMeasurementCallback.hal
+++ b/gnss/1.0/IGnssMeasurementCallback.hal
@@ -556,7 +556,7 @@
 
         /**
          * Signal-to-noise ratio at correlator output in dB.
-         * If the data is available, gnssClockFlags must contain MEASUREMENT_HAS_SNR.
+         * If the data is available, GnssMeasurementFlags must contain HAS_SNR.
          * This is the power ratio of the "correlation peak height above the
          * observed noise floor" to "the noise RMS".
          */
diff --git a/gnss/1.0/IGnssNavigationMessageCallback.hal b/gnss/1.0/IGnssNavigationMessageCallback.hal
index e18f7e2..3fdae9f 100644
--- a/gnss/1.0/IGnssNavigationMessageCallback.hal
+++ b/gnss/1.0/IGnssNavigationMessageCallback.hal
@@ -28,14 +28,14 @@
     @export(name="", value_prefix="GNSS_NAVIGATION_MESSAGE_TYPE_")
     enum GnssNavigationMessageType : int16_t {
         UNKNOWN    = 0,
-        /** GNSS L1 C/A message contained in the structure.  */
-        GNSS_L1CA       = 0x0101,
-        /** GNSS L2-CNAV message contained in the structure. */
-        GNSS_L2CNAV     = 0x0102,
-        /** GNSS L5-CNAV message contained in the structure. */
-        GNSS_L5CNAV     = 0x0103,
-        /** GNSS CNAV-2 message contained in the structure. */
-        GNSS_CNAV2      = 0x0104,
+        /** GPS L1 C/A message contained in the structure.  */
+        GPS_L1CA       = 0x0101,
+        /** GPS L2-CNAV message contained in the structure. */
+        GPS_L2CNAV     = 0x0102,
+        /** GPS L5-CNAV message contained in the structure. */
+        GPS_L5CNAV     = 0x0103,
+        /** GPS CNAV-2 message contained in the structure. */
+        GPS_CNAV2      = 0x0104,
         /** Glonass L1 CA message contained in the structure. */
         GLO_L1CA        = 0x0301,
         /** Beidou D1 message contained in the structure. */