6 files changed, 10 insertions, 10 deletions
diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c
index c70cbba819..e9d89d1bbc 100644
--- a/layouts/community/ergodox/ishigoya-jp/keymap.c
+++ b/layouts/community/ergodox/ishigoya-jp/keymap.c
@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 static uint16_t start;
 
diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c
index c3bb9e047a..3fdccb790a 100644
--- a/layouts/community/ergodox/kristian/keymap.c
+++ b/layouts/community/ergodox/kristian/keymap.c
@@ -2,10 +2,10 @@
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
-#include "keymap_fr_ch.h"
+#include "keymap_swiss_fr.h"
 #include "keymap_french.h"
 #include "keymap_german.h"
-#include "keymap_german_ch.h"
+#include "keymap_swiss_de.h"
 #include "keymap_nordic.h"
 #include "keymap_norwegian.h"
 #include "keymap_spanish.h"
diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c
index 581aecf2d3..5c3d7e49ea 100644
--- a/layouts/community/ergodox/osx_de/keymap.c
+++ b/layouts/community/ergodox/osx_de/keymap.c
@@ -1,7 +1,7 @@
 #include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_german_osx.h"
+#include "keymap_german_mac_iso.h"
 
 #define BASE 0
 #define SYMB 1
diff --git a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
index 18335652ff..b8ffc2e51f 100644
--- a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
+++ b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c
@@ -5,13 +5,13 @@
 #include "keymap_neo2.h"
 #include "keymap_uk.h"
 #include "keymap_colemak.h"
-#include "keymap_french_osx.h"
+#include "keymap_french_mac_iso.h"
 #include "keymap_nordic.h"
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
 #include "keymap_norwegian.h"
-#include "keymap_fr_ch.h"
-#include "keymap_german_osx.h"
+#include "keymap_swiss_fr.h"
+#include "keymap_german_mac_iso.h"
 #include "keymap_spanish.h"
 #include "keymap_bepo.h"
 
diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c
index 17ca4362e6..8228b5e371 100644
--- a/layouts/community/ergodox/osx_de_experimental/keymap.c
+++ b/layouts/community/ergodox/osx_de_experimental/keymap.c
@@ -8,8 +8,8 @@
 #include "keymap_dvorak.h"
 #include "keymap_german.h"
 #include "keymap_norwegian.h"
-#include "keymap_fr_ch.h"
-#include "keymap_german_osx.h"
+#include "keymap_swiss_fr.h"
+#include "keymap_german_mac_iso.h"
 #include "keymap_spanish.h"
 #include "keymap_bepo.h"
 
diff --git a/layouts/community/ergodox/osx_fr/keymap.c b/layouts/community/ergodox/osx_fr/keymap.c
index 924e9ee8ae..886e54208a 100644
--- a/layouts/community/ergodox/osx_fr/keymap.c
+++ b/layouts/community/ergodox/osx_fr/keymap.c
@@ -2,7 +2,7 @@
 #include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
-#include "keymap_french_osx.h"
+#include "keymap_french_mac_iso.h"
 
 #define BASE 0 // default layer
 #define SYMB 1 // symbols