diff --git a/bbdev b/bbdev
index 400172eeb..c1e179613 160000
--- a/bbdev
+++ b/bbdev
@@ -1 +1 @@
-Subproject commit 400172eebf83fd9ee1bbf9f0612fbd73d4a5cdc6
+Subproject commit c1e17961356fe68960c91a5997ff37c665059a6c
diff --git a/examples/cores/pebble/emu/src/lib.rs b/examples/cores/pebble/emu/src/lib.rs
index 6a4f91897..e78963189 100644
--- a/examples/cores/pebble/emu/src/lib.rs
+++ b/examples/cores/pebble/emu/src/lib.rs
@@ -1,4 +1,4 @@
-pub const BEMU_TOP_CONFIG: &str = "../../core.toml";
+pub const BEMU_TOP_CONFIG: &str = "../../../../chips/pebble/configs/pebble.toml";
 
 pub fn bemu_top_config() -> &'static str {
     BEMU_TOP_CONFIG
diff --git a/examples/cores/toy/emu/src/lib.rs b/examples/cores/toy/emu/src/lib.rs
index 6a4f91897..37998770d 100644
--- a/examples/cores/toy/emu/src/lib.rs
+++ b/examples/cores/toy/emu/src/lib.rs
@@ -1,4 +1,4 @@
-pub const BEMU_TOP_CONFIG: &str = "../../core.toml";
+pub const BEMU_TOP_CONFIG: &str = "../../../../chips/toy/configs/toy.toml";
 
 pub fn bemu_top_config() -> &'static str {
     BEMU_TOP_CONFIG