diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index e691a58..2692e1b 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -400,11 +400,11 @@
     method public default void onError(int);
     method public void onLost(@NonNull android.nearby.NearbyDevice);
     method public void onUpdated(@NonNull android.nearby.NearbyDevice);
+    field public static final int ERROR_INVALID_ARGUMENT = 2; // 0x2
+    field public static final int ERROR_PERMISSION_DENIED = 3; // 0x3
+    field public static final int ERROR_RESOURCE_EXHAUSTED = 4; // 0x4
     field public static final int ERROR_UNKNOWN = 0; // 0x0
     field public static final int ERROR_UNSUPPORTED = 1; // 0x1
-    field public static final int INVALID_ARGUMENT = 2; // 0x2
-    field public static final int PERMISSION_DENIED = 3; // 0x3
-    field public static final int RESOURCE_EXHAUSTED = 4; // 0x4
   }
 
   public abstract class ScanFilter {
diff --git a/nearby/framework/java/android/nearby/ScanCallback.java b/nearby/framework/java/android/nearby/ScanCallback.java
index 1e93c6e..7b66607 100644
--- a/nearby/framework/java/android/nearby/ScanCallback.java
+++ b/nearby/framework/java/android/nearby/ScanCallback.java
@@ -47,22 +47,22 @@
     /**
      * Invalid argument such as out-of-range, illegal format etc.
      */
-    int INVALID_ARGUMENT = 2;
+    int ERROR_INVALID_ARGUMENT = 2;
 
     /**
      * Request from clients who do not have permissions.
      */
-    int PERMISSION_DENIED = 3;
+    int ERROR_PERMISSION_DENIED = 3;
 
     /**
      * Request cannot be fulfilled due to limited resource.
      */
-    int RESOURCE_EXHAUSTED = 4;
+    int ERROR_RESOURCE_EXHAUSTED = 4;
 
     /** @hide **/
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef({ERROR_UNKNOWN, ERROR_UNSUPPORTED, INVALID_ARGUMENT, PERMISSION_DENIED,
-            RESOURCE_EXHAUSTED})
+    @IntDef({ERROR_UNKNOWN, ERROR_UNSUPPORTED, ERROR_INVALID_ARGUMENT, ERROR_PERMISSION_DENIED,
+            ERROR_RESOURCE_EXHAUSTED})
     @interface ErrorCode {
     }