diff --git a/keyboards/ai03/jp60/keymaps/via/keymap.c b/keyboards/ai03/jp60/keymaps/via/keymap.c
index 5c8f9ecf..efce7acf 100644
--- a/keyboards/ai03/jp60/keymaps/via/keymap.c
+++ b/keyboards/ai03/jp60/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
diff --git a/keyboards/aozora/keymaps/via/keymap.c b/keyboards/aozora/keymaps/via/keymap.c
index 3376f2e8..a6e20e0e 100644
--- a/keyboards/aozora/keymaps/via/keymap.c
+++ b/keyboards/aozora/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "sendstring_jis.h"  // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
+#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
diff --git a/keyboards/barracuda/keymaps/via/keymap.c b/keyboards/barracuda/keymaps/via/keymap.c
index ebe2e8b4..a3170c1b 100644
--- a/keyboards/barracuda/keymaps/via/keymap.c
+++ b/keyboards/barracuda/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 /* keymap layers */
 enum _layers {
diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
index 900f1b3b..57b94c5b 100644
--- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
+++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
diff --git a/keyboards/gl516/j73gl/keymaps/via/keymap.c b/keyboards/gl516/j73gl/keymaps/via/keymap.c
index 3e8fba92..942775e4 100644
--- a/keyboards/gl516/j73gl/keymaps/via/keymap.c
+++ b/keyboards/gl516/j73gl/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
diff --git a/keyboards/halfcliff/keymaps/via/keymap.c b/keyboards/halfcliff/keymaps/via/keymap.c
index e0a825e7..424c56ab 100644
--- a/keyboards/halfcliff/keymaps/via/keymap.c
+++ b/keyboards/halfcliff/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 #define RAISE FN_MO13
 #define LOWER FN_MO23
diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
index a7b127f0..934ca4be 100644
--- a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
+++ b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 
-#include "keymap_br_abnt2.h"
+#include "keymap_brazilian_abnt2.h"
 
 enum { 
     LAYER_BASE, 
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
index 7cd1434b..a326a782 100644
--- a/keyboards/jones/v1/keymaps/via/keymap.c
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 // Defines names for use in layer keycodes and the keymap
 enum layer_number {
diff --git a/keyboards/pisces/keymaps/via/keymap.c b/keyboards/pisces/keymaps/via/keymap.c
index 39226d2f..a347a2e7 100644
--- a/keyboards/pisces/keymaps/via/keymap.c
+++ b/keyboards/pisces/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 /* keymap layers */
 enum _layers {
diff --git a/keyboards/rate/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
index 357253ac..376a9b37 100644
--- a/keyboards/rate/pistachio/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 
 enum layer_names {
diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
index f3025432..62e6dc96 100644
--- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #include <stdio.h>
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 #include "lib/bme280.h"
 
 // Defines names for use in layer keycodes and the keymap
diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
index b2ceacb0..41f90afe 100644
--- a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
index 660fb2a1..35c78c71 100644
--- a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
+++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 extern uint8_t is_master;
 
diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
index 796d2791..b351d57c 100644
--- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "keymap_jp.h"
+#include "keymap_japanese.h"
 
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {