diff --git a/blk_box.cpp b/blk_box.cpp
index aba6d53..d0ac5ba 100644
--- a/blk_box.cpp
+++ b/blk_box.cpp
@@ -10,7 +10,7 @@
 // #include "blk_box_drivers/radio.hpp"
 // #include "blk_box_drivers/.hpp"
 #include "blk_box_drivers/wifi.hpp"
-#include "bbnow_driver.hpp"
+#include "bbnow/driver.h"
 
 void init_blk_box(BlkBoxInitConfig cfg) {
     init_main_i2c();
diff --git a/drivers/bbnow_old.cpp b/drivers/bbnow_old.cpp
index 2386b6e..b3c61ab 100644
--- a/drivers/bbnow_old.cpp
+++ b/drivers/bbnow_old.cpp
@@ -1,5 +1,5 @@
 #include "blk_box_drivers/bbnow_old.hpp"
-#include "bbnow_pub.hpp"
+#include "bbnow/pub.h"
 #include "esp_now.h"
 #include "esp_log.h"
 #include "esp_mac.h"
diff --git a/include/blk_box_drivers/bbnow_old.hpp b/include/blk_box_drivers/bbnow_old.hpp
index ef9f375..f07159d 100644
--- a/include/blk_box_drivers/bbnow_old.hpp
+++ b/include/blk_box_drivers/bbnow_old.hpp
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 #include "esp_now.h"
-#include "bbnow_pub.hpp" // BBNowPubPacket, BBNowPubPacketType
+#include "bbnow/pub.h" // BBNowPubPacket, BBNowPubPacketType
 
 /// The channel to use if not on a WIFI network
 #define BBNOW_DEFAULT_CHANNEL 6