diff --git a/ads1015/src/main/java/com/example/android/things/ads1015/BoardDefaults.java b/ads1015/src/main/java/com/example/android/things/ads1015/BoardDefaults.java
index d63d749..670559a 100644
--- a/ads1015/src/main/java/com/example/android/things/ads1015/BoardDefaults.java
+++ b/ads1015/src/main/java/com/example/android/things/ads1015/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,13 +30,12 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/apa102/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/apa102/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 358bc21..beea07d 100644
--- a/apa102/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/apa102/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
     /**
      * Return the preferred I2C port for each board.
@@ -29,13 +29,12 @@ public class BoardDefaults {
     public static String getSPIPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "SPI0.0";
-            case DEVICE_IMX6UL_PICO:
-                return "SPI3.0";
             case DEVICE_IMX7D_PICO:
                 return "SPI3.1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/bmx280/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/bmx280/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index f1c0dc0..10d780b 100644
--- a/bmx280/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/bmx280/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,13 +30,12 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/cap1xxx/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/cap1xxx/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index faa13f6..10d780b 100644
--- a/cap1xxx/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/cap1xxx/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,9 +30,8 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
diff --git a/gps/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/gps/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 3f34579..5c65f96 100644
--- a/gps/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/gps/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,9 +30,8 @@ public class BoardDefaults {
     public static String getUartName() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "UART0";
-            case DEVICE_IMX6UL_PICO:
-                return "UART3";
             case DEVICE_IMX7D_PICO:
                 return "UART6";
             default:
diff --git a/ht16k33/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/ht16k33/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index f1c0dc0..10d780b 100644
--- a/ht16k33/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/ht16k33/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,13 +30,12 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/matrixkeypad/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/matrixkeypad/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 0cef4ab..2ec8757 100644
--- a/matrixkeypad/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/matrixkeypad/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -20,17 +20,16 @@
 
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     public static String[] getRowPins() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return new String[] {"BCM27", "BCM5", "BCM6", "BCM26"};
             case DEVICE_IMX7D_PICO:
                 return new String[] {"GPIO2_IO03", "GPIO2_IO01", "GPIO2_IO02", "GPIO2_IO05"};
-            case DEVICE_IMX6UL_PICO:
-                return new String[] {"GPIO4_IO23", "GPIO4_IO21", "GPIO4_IO22", "GPIO4_IO18"};
             default:
                 throw new UnsupportedOperationException("Unknown device: " + Build.DEVICE);
         }
@@ -39,11 +38,10 @@ public static String[] getRowPins() {
     public static String[] getColPins() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return new String[] {"BCM16", "BCM24", "BCM23"};
             case DEVICE_IMX7D_PICO:
                 return new String[] {"GPIO2_IO07", "GPIO6_IO12", "GPIO6_IO13"};
-            case DEVICE_IMX6UL_PICO:
-                return new String[] {"GPIO5_IO02", "GPIO2_IO01", "GPIO2_IO00"};
             default:
                 throw new UnsupportedOperationException("Unknown device: " + Build.DEVICE);
         }
diff --git a/mma7660fc/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/mma7660fc/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index f1c0dc0..10d780b 100644
--- a/mma7660fc/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/mma7660fc/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,13 +30,12 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/pwmservo/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/pwmservo/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 9d5e884..5cc1b2c 100644
--- a/pwmservo/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/pwmservo/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,15 +21,14 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     public static String getPwmPin() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "PWM0";
-            case DEVICE_IMX6UL_PICO:
-                return "PWM7";
             case DEVICE_IMX7D_PICO:
                 return "PWM1";
             default:
diff --git a/pwmspeaker/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/pwmspeaker/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 95b2c19..9918fb3 100644
--- a/pwmspeaker/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/pwmspeaker/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,15 +21,14 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     public static String getPwmPin() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "PWM1";
-            case DEVICE_IMX6UL_PICO:
-                return "PWM8";
             case DEVICE_IMX7D_PICO:
                 return "PWM2";
             default:
diff --git a/ssd1306/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/ssd1306/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index f1c0dc0..10d780b 100644
--- a/ssd1306/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/ssd1306/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -30,13 +30,12 @@ public class BoardDefaults {
     public static String getI2CPort() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "I2C1";
-            case DEVICE_IMX6UL_PICO:
-                return "I2C2";
             case DEVICE_IMX7D_PICO:
                 return "I2C1";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tm1637/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java b/tm1637/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
index 894cbb2..b7d9c80 100644
--- a/tm1637/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
+++ b/tm1637/src/main/java/com/example/androidthings/driversamples/BoardDefaults.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("WeakerAccess")
 public class BoardDefaults {
     private static final String DEVICE_RPI3 = "rpi3";
-    private static final String DEVICE_IMX6UL_PICO = "imx6ul_pico";
+    private static final String DEVICE_RPI3BP = "rpi3bp";
     private static final String DEVICE_IMX7D_PICO = "imx7d_pico";
 
     /**
@@ -31,9 +31,8 @@ public static String getGPIOforData() {
 
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "BCM20";
-            case DEVICE_IMX6UL_PICO:
-                return "GPIO2_IO02";
             case DEVICE_IMX7D_PICO:
                 return "GPIO6_IO15";
             default:
@@ -47,13 +46,12 @@ public static String getGPIOforData() {
     public static String getGPIOforClock() {
         switch (Build.DEVICE) {
             case DEVICE_RPI3:
+            case DEVICE_RPI3BP:
                 return "BCM21";
-            case DEVICE_IMX6UL_PICO:
-                return "GPIO2_IO03";
             case DEVICE_IMX7D_PICO:
                 return "GPIO6_IO14";
             default:
                 throw new IllegalStateException("Unknown Build.DEVICE " + Build.DEVICE);
         }
     }
-}
\ No newline at end of file
+}