diff --git a/nearby/framework/java/android/nearby/NearbyFrameworkInitializer.java b/nearby/framework/java/android/nearby/NearbyFrameworkInitializer.java
index 80d1005..3780fbb 100644
--- a/nearby/framework/java/android/nearby/NearbyFrameworkInitializer.java
+++ b/nearby/framework/java/android/nearby/NearbyFrameworkInitializer.java
@@ -25,7 +25,7 @@
  *
  * @hide
  */
-@SystemApi
+@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class NearbyFrameworkInitializer {
 
     private NearbyFrameworkInitializer() {}
diff --git a/nearby/framework/java/android/nearby/ScanRequest.java b/nearby/framework/java/android/nearby/ScanRequest.java
index 7ff0631..37285d5 100644
--- a/nearby/framework/java/android/nearby/ScanRequest.java
+++ b/nearby/framework/java/android/nearby/ScanRequest.java
@@ -89,15 +89,15 @@
 
     private final @ScanType int mScanType;
     private final @ScanMode int mScanMode;
-    private final boolean mEnableBle;
+    private final boolean mBleEnabled;
     private final @NonNull WorkSource mWorkSource;
     private final List<ScanFilter> mScanFilters;
 
-    private ScanRequest(@ScanType int scanType, @ScanMode int scanMode, boolean enableBle,
+    private ScanRequest(@ScanType int scanType, @ScanMode int scanMode, boolean bleEnabled,
             @NonNull WorkSource workSource, List<ScanFilter> scanFilters) {
         mScanType = scanType;
         mScanMode = scanMode;
-        mEnableBle = enableBle;
+        mBleEnabled = bleEnabled;
         mWorkSource = workSource;
         mScanFilters = scanFilters;
     }
@@ -160,8 +160,8 @@
     /**
      * Returns if Bluetooth Low Energy enabled for scanning.
      */
-    public boolean isEnableBle() {
-        return mEnableBle;
+    public boolean isBleEnabled() {
+        return mBleEnabled;
     }
 
     /**
@@ -200,7 +200,7 @@
         stringBuilder.append("Request[")
                 .append("scanType=").append(mScanType);
         stringBuilder.append(", scanMode=").append(scanModeToString(mScanMode));
-        stringBuilder.append(", enableBle=").append(mEnableBle);
+        stringBuilder.append(", enableBle=").append(mBleEnabled);
         stringBuilder.append(", workSource=").append(mWorkSource);
         stringBuilder.append(", scanFilters=").append(mScanFilters);
         stringBuilder.append("]");
@@ -211,7 +211,7 @@
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeInt(mScanType);
         dest.writeInt(mScanMode);
-        dest.writeBoolean(mEnableBle);
+        dest.writeBoolean(mBleEnabled);
         dest.writeTypedObject(mWorkSource, /* parcelableFlags= */0);
         dest.writeTypedList(mScanFilters);
     }
@@ -222,7 +222,7 @@
             ScanRequest otherRequest = (ScanRequest) other;
             return mScanType == otherRequest.mScanType
                     && (mScanMode == otherRequest.mScanMode)
-                    && (mEnableBle == otherRequest.mEnableBle)
+                    && (mBleEnabled == otherRequest.mBleEnabled)
                     && (Objects.equals(mWorkSource, otherRequest.mWorkSource));
         }
         return false;
@@ -230,7 +230,7 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(mScanType, mScanMode, mEnableBle, mWorkSource);
+        return Objects.hash(mScanType, mScanMode, mBleEnabled, mWorkSource);
     }
 
     /** @hide **/
@@ -253,14 +253,14 @@
         private @ScanType int mScanType;
         private @ScanMode int mScanMode;
 
-        private boolean mEnableBle;
+        private boolean mBleEnabled;
         private WorkSource mWorkSource;
         private List<ScanFilter> mScanFilters;
 
         /** Creates a new Builder with the given scan type. */
         public Builder() {
             mScanType = INVALID_SCAN_TYPE;
-            mEnableBle = true;
+            mBleEnabled = true;
             mWorkSource = new WorkSource();
             mScanFilters = new ArrayList<>();
         }
@@ -292,11 +292,11 @@
         /**
          * Sets if the ble is enabled for scanning.
          *
-         * @param enableBle If the BluetoothLe is enabled in the device.
+         * @param bleEnabled If the BluetoothLe is enabled in the device.
          */
         @NonNull
-        public Builder setEnableBle(boolean enableBle) {
-            mEnableBle = enableBle;
+        public Builder setBleEnabled(boolean bleEnabled) {
+            mBleEnabled = bleEnabled;
             return this;
         }
 
@@ -355,7 +355,7 @@
             Preconditions.checkState(isValidScanMode(mScanMode),
                     "invalid scan mode : " + mScanMode
                             + ", scan mode must be one of ScanMode#SCAN_MODE_");
-            return new ScanRequest(mScanType, mScanMode, mEnableBle, mWorkSource, mScanFilters);
+            return new ScanRequest(mScanType, mScanMode, mBleEnabled, mWorkSource, mScanFilters);
         }
     }
 }
diff --git a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
index 825a4ab..fbbfae1 100644
--- a/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
+++ b/nearby/service/java/com/android/server/nearby/provider/DiscoveryProviderManager.java
@@ -160,7 +160,7 @@
     }
 
     private void startProviders(ScanRequest scanRequest) {
-        if (scanRequest.isEnableBle()) {
+        if (scanRequest.isBleEnabled()) {
             startBleProvider(scanRequest);
         }
     }
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
index eedcce1..31df7b3 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/NearbyManagerTest.java
@@ -78,7 +78,7 @@
         ScanRequest scanRequest = new ScanRequest.Builder()
                 .setScanType(ScanRequest.SCAN_TYPE_FAST_PAIR)
                 .setScanMode(ScanRequest.SCAN_MODE_LOW_LATENCY)
-                .setEnableBle(true)
+                .setBleEnabled(true)
                 .build();
         ScanCallback scanCallback = new ScanCallback() {
             @Override
diff --git a/nearby/tests/cts/fastpair/src/android/nearby/cts/ScanRequestTest.java b/nearby/tests/cts/fastpair/src/android/nearby/cts/ScanRequestTest.java
index 86e764c..11de5ae 100644
--- a/nearby/tests/cts/fastpair/src/android/nearby/cts/ScanRequestTest.java
+++ b/nearby/tests/cts/fastpair/src/android/nearby/cts/ScanRequestTest.java
@@ -96,7 +96,7 @@
         ScanRequest request = new ScanRequest.Builder()
                 .setScanType(SCAN_TYPE_NEARBY_SHARE)
                 .setScanMode(SCAN_MODE_BALANCED)
-                .setEnableBle(true)
+                .setBleEnabled(true)
                 .setWorkSource(workSource)
                 .build();
 
@@ -125,7 +125,7 @@
                 .setScanType(SCAN_TYPE_FAST_PAIR)
                 .build();
 
-        assertThat(request.isEnableBle()).isTrue();
+        assertThat(request.isBleEnabled()).isTrue();
     }
 
     @Test
diff --git a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
index 8f5d120..f445638 100644
--- a/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
+++ b/nearby/tests/multidevices/clients/src/android/nearby/multidevices/fastpair/seeker/FastPairSeekerSnippet.kt
@@ -45,7 +45,7 @@
         val scanRequest = ScanRequest.Builder()
             .setScanMode(ScanRequest.SCAN_MODE_LOW_LATENCY)
             .setScanType(ScanRequest.SCAN_TYPE_FAST_PAIR)
-            .setEnableBle(true)
+            .setBleEnabled(true)
             .build()
         scanCallback = ScanCallbackEvents(callbackId)
 
diff --git a/nearby/tests/unit/src/android/nearby/ScanRequestTest.java b/nearby/tests/unit/src/android/nearby/ScanRequestTest.java
index 509fa1e..020f6d6 100644
--- a/nearby/tests/unit/src/android/nearby/ScanRequestTest.java
+++ b/nearby/tests/unit/src/android/nearby/ScanRequestTest.java
@@ -108,7 +108,7 @@
         ScanRequest request = new ScanRequest.Builder()
                 .setScanType(SCAN_TYPE_NEARBY_SHARE)
                 .setScanMode(SCAN_MODE_BALANCED)
-                .setEnableBle(true)
+                .setBleEnabled(true)
                 .setWorkSource(workSource)
                 .build();
 
@@ -137,7 +137,7 @@
         ScanRequest originalRequest = new ScanRequest.Builder()
                 .setScanType(scanType)
                 .setScanMode(SCAN_MODE_BALANCED)
-                .setEnableBle(true)
+                .setBleEnabled(true)
                 .setWorkSource(workSource)
                 .build();
 
diff --git a/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java b/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
index c20cf22..bdde630 100644
--- a/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
+++ b/nearby/tests/unit/src/com/android/server/nearby/NearbyServiceTest.java
@@ -58,7 +58,7 @@
     private ScanRequest createScanRequest() {
         return new ScanRequest.Builder()
                 .setScanType(ScanRequest.SCAN_TYPE_FAST_PAIR)
-                .setEnableBle(true)
+                .setBleEnabled(true)
                 .build();
     }
 }