diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo_csa/keymap.c
similarity index 99%
rename from keyboard/ergodox_ez/keymaps/bepo/keymap.c
rename to keyboards/ergodox/keymaps/bepo_csa/keymap.c
index 7097d641d..495242adb 100644
--- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c
+++ b/keyboards/ergodox/keymaps/bepo_csa/keymap.c
@@ -1,5 +1,5 @@
 /* TypeMatrix-2030-like keymap  */
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "action_util.h"
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index c720088e8..0bc20c7b9 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -1,7 +1,7 @@
 #ifndef KEYMAP_CANADIAN_MULTILINGUAG_H
 #define KEYMAP_CANADIAN_MULTILINGUAG_H
 
-#include "keymap_common.h"
+#include "keymap.h"
 
 // Alt gr
 #ifndef ALTGR