5 files changed, 17 insertions, 17 deletions
diff --git a/shared-module/busdevice/I2CDevice.c b/shared-module/adafruit_bus_device/I2CDevice.c
index b9f8ee25c..d790ff53a 100644
--- a/shared-module/busdevice/I2CDevice.c
+++ b/shared-module/adafruit_bus_device/I2CDevice.c
@@ -24,18 +24,18 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/busdevice/I2CDevice.h"
+#include "shared-bindings/adafruit_bus_device/I2CDevice.h"
 #include "shared-bindings/busio/I2C.h"
 #include "py/mperrno.h"
 #include "py/nlr.h"
 #include "py/runtime.h"
 
-void common_hal_busdevice_i2cdevice_construct(busdevice_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address) {
+void common_hal_adafruit_bus_device_i2cdevice_construct(adafruit_bus_device_i2cdevice_obj_t *self, busio_i2c_obj_t *i2c, uint8_t device_address) {
     self->i2c = i2c;
     self->device_address = device_address;
 }
 
-void common_hal_busdevice_i2cdevice_lock(busdevice_i2cdevice_obj_t *self) {
+void common_hal_adafruit_bus_device_i2cdevice_lock(adafruit_bus_device_i2cdevice_obj_t *self) {
     bool success = false;
     while (!success) {
         success = common_hal_busio_i2c_try_lock(self->i2c);
@@ -44,31 +44,31 @@ void common_hal_busdevice_i2cdevice_lock(busdevice_i2cdevice_obj_t *self) {
     }
 }
 
-void common_hal_busdevice_i2cdevice_unlock(busdevice_i2cdevice_obj_t *self) {
+void common_hal_adafruit_bus_device_i2cdevice_unlock(adafruit_bus_device_i2cdevice_obj_t *self) {
     common_hal_busio_i2c_unlock(self->i2c);
 }
 
-uint8_t common_hal_busdevice_i2cdevice_readinto(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length) {
+uint8_t common_hal_adafruit_bus_device_i2cdevice_readinto(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length) {
     return common_hal_busio_i2c_read(self->i2c, self->device_address, buffer, length);
 }
 
-uint8_t common_hal_busdevice_i2cdevice_write(busdevice_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length) {
+uint8_t common_hal_adafruit_bus_device_i2cdevice_write(adafruit_bus_device_i2cdevice_obj_t *self, mp_obj_t buffer, size_t length) {
     return common_hal_busio_i2c_write(self->i2c, self->device_address, buffer, length, true);
 }
 
-void common_hal_busdevice_i2cdevice_probe_for_device(busdevice_i2cdevice_obj_t *self) {
-    common_hal_busdevice_i2cdevice_lock(self);
+void common_hal_adafruit_bus_device_i2cdevice_probe_for_device(adafruit_bus_device_i2cdevice_obj_t *self) {
+    common_hal_adafruit_bus_device_i2cdevice_lock(self);
 
     mp_buffer_info_t bufinfo;
     mp_obj_t buffer = mp_obj_new_bytearray_of_zeros(1);
 
     mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE);
 
-    uint8_t status = common_hal_busdevice_i2cdevice_readinto(self, (uint8_t*)bufinfo.buf, 1);
+    uint8_t status = common_hal_adafruit_bus_device_i2cdevice_readinto(self, (uint8_t*)bufinfo.buf, 1);
     if (status != 0) {
-        common_hal_busdevice_i2cdevice_unlock(self);
+        common_hal_adafruit_bus_device_i2cdevice_unlock(self);
         mp_raise_ValueError_varg(translate("No I2C device at address: %x"), self->device_address);
     }
 
-    common_hal_busdevice_i2cdevice_unlock(self);
+    common_hal_adafruit_bus_device_i2cdevice_unlock(self);
 }
diff --git a/shared-module/busdevice/I2CDevice.h b/shared-module/adafruit_bus_device/I2CDevice.h
index 918dc7719..d06adb9f5 100644
--- a/shared-module/busdevice/I2CDevice.h
+++ b/shared-module/adafruit_bus_device/I2CDevice.h
@@ -34,6 +34,6 @@ typedef struct {
     mp_obj_base_t base;
     busio_i2c_obj_t *i2c;
     uint8_t device_address;
-} busdevice_i2cdevice_obj_t;
+} adafruit_bus_device_i2cdevice_obj_t;
 
 #endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSDEVICE_I2CDEVICE_H
diff --git a/shared-module/busdevice/SPIDevice.c b/shared-module/adafruit_bus_device/SPIDevice.c
index d9b63a007..e489fc7c0 100644
--- a/shared-module/busdevice/SPIDevice.c
+++ b/shared-module/adafruit_bus_device/SPIDevice.c
@@ -24,14 +24,14 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/busdevice/SPIDevice.h"
+#include "shared-bindings/adafruit_bus_device/SPIDevice.h"
 #include "shared-bindings/busio/SPI.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
 #include "py/mperrno.h"
 #include "py/nlr.h"
 #include "py/runtime.h"
 
-void common_hal_busdevice_spidevice_construct(busdevice_spidevice_obj_t *self, busio_spi_obj_t *spi,  digitalio_digitalinout_obj_t *cs,
+void common_hal_adafruit_bus_device_spidevice_construct(adafruit_bus_device_spidevice_obj_t *self, busio_spi_obj_t *spi,  digitalio_digitalinout_obj_t *cs,
     uint32_t baudrate, uint8_t polarity, uint8_t phase, uint8_t extra_clocks) {
     self->spi = spi;
     self->baudrate = baudrate;
@@ -41,7 +41,7 @@ void common_hal_busdevice_spidevice_construct(busdevice_spidevice_obj_t *self, b
     self->chip_select = cs;
 }
 
-void common_hal_busdevice_spidevice_enter(busdevice_spidevice_obj_t *self) {
+void common_hal_adafruit_bus_device_spidevice_enter(adafruit_bus_device_spidevice_obj_t *self) {
     bool success = false;
     while (!success) {
         success = common_hal_busio_spi_try_lock(self->spi);
@@ -56,7 +56,7 @@ void common_hal_busdevice_spidevice_enter(busdevice_spidevice_obj_t *self) {
     }
 }
 
-void common_hal_busdevice_spidevice_exit(busdevice_spidevice_obj_t *self) {
+void common_hal_adafruit_bus_device_spidevice_exit(adafruit_bus_device_spidevice_obj_t *self) {
     if (self->chip_select != MP_OBJ_NULL) {
         common_hal_digitalio_digitalinout_set_value(MP_OBJ_TO_PTR(self->chip_select), true);
     }
diff --git a/shared-module/busdevice/SPIDevice.h b/shared-module/adafruit_bus_device/SPIDevice.h
index ffabf79df..1a7c70fa7 100644
--- a/shared-module/busdevice/SPIDevice.h
+++ b/shared-module/adafruit_bus_device/SPIDevice.h
@@ -39,6 +39,6 @@ typedef struct {
     uint8_t phase;
     uint8_t extra_clocks;
     digitalio_digitalinout_obj_t *chip_select;
-} busdevice_spidevice_obj_t;
+} adafruit_bus_device_spidevice_obj_t;
 
 #endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSDEVICE_SPIDEVICE_H
diff --git a/shared-module/busdevice/__init__.c b/shared-module/adafruit_bus_device/__init__.c
index e69de29bb..e69de29bb 100644
--- a/shared-module/busdevice/__init__.c
+++ b/shared-module/adafruit_bus_device/__init__.c