diff --git a/keyboards/crkbd/keymaps/r-okm/config.h b/keyboards/crkbd/keymaps/r_okm/config.h
similarity index 100%
rename from keyboards/crkbd/keymaps/r-okm/config.h
rename to keyboards/crkbd/keymaps/r_okm/config.h
diff --git a/keyboards/crkbd/keymaps/r-okm/keymap.c b/keyboards/crkbd/keymaps/r_okm/keymap.c
similarity index 98%
rename from keyboards/crkbd/keymaps/r-okm/keymap.c
rename to keyboards/crkbd/keymaps/r_okm/keymap.c
index b828438d..4765be14 100755
--- a/keyboards/crkbd/keymaps/r-okm/keymap.c
+++ b/keyboards/crkbd/keymaps/r_okm/keymap.c
@@ -23,7 +23,7 @@ enum layer_NUMBER {
 };
 
 #include QMK_KEYBOARD_H
-#include "r-okm.h"
+#include "r_okm.h"
 #include "keymap_japanese.h"  // For JP_ keycodes
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -65,5 +65,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user_rokm(keycode, record);
+    return process_record_user_r_okm(keycode, record);
 }
diff --git a/keyboards/crkbd/keymaps/r-okm/rules.mk b/keyboards/crkbd/keymaps/r_okm/rules.mk
similarity index 100%
rename from keyboards/crkbd/keymaps/r-okm/rules.mk
rename to keyboards/crkbd/keymaps/r_okm/rules.mk
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/r-okm/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/r_okm/keymap.c
similarity index 98%
rename from keyboards/salicylic_acid3/7skb/keymaps/r-okm/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/r_okm/keymap.c
index b4dfedee..a63ef7a6 100644
--- a/keyboards/salicylic_acid3/7skb/keymaps/r-okm/keymap.c
+++ b/keyboards/salicylic_acid3/7skb/keymaps/r_okm/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "r-okm.h"
+#include "r_okm.h"
 #include "keymap_japanese.h"  // For JP_ keycodes
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
@@ -72,5 +72,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user_rokm(keycode, record);
+    return process_record_user_r_okm(keycode, record);
 }
diff --git a/keyboards/salicylic_acid3/7skb/keymaps/r-okm/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/r_okm/rules.mk
similarity index 100%
rename from keyboards/salicylic_acid3/7skb/keymaps/r-okm/rules.mk
rename to keyboards/salicylic_acid3/7skb/keymaps/r_okm/rules.mk
diff --git a/qmk.json b/qmk.json
index 3afc389f..261446d4 100644
--- a/qmk.json
+++ b/qmk.json
@@ -1,4 +1,7 @@
 {
-    "userspace_version": "1.0",
-    "build_targets": []
+    "userspace_version": "1.1",
+    "build_targets": [
+        ["salicylic_acid3/7skb/rev1", "r_okm"],
+        ["crkbd/rev1", "r_okm"]
+    ]
 }
\ No newline at end of file
diff --git a/users/r-okm/config.h b/users/r_okm/config.h
similarity index 100%
rename from users/r-okm/config.h
rename to users/r_okm/config.h
diff --git a/users/r-okm/r-okm.c b/users/r_okm/r_okm.c
similarity index 97%
rename from users/r-okm/r-okm.c
rename to users/r_okm/r_okm.c
index 10762b45..483932c6 100644
--- a/users/r-okm/r-okm.c
+++ b/users/r_okm/r_okm.c
@@ -1,8 +1,8 @@
 #include QMK_KEYBOARD_H
-#include "r-okm.h"
+#include "r_okm.h"
 #include "sendstring_japanese.h"  // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避
 
-bool process_record_user_rokm(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user_r_okm(uint16_t keycode, keyrecord_t *record) {
     static bool is_lalt_pressed = false;
     static bool is_lwin_pressed = false;
     bool result = false;
diff --git a/users/r-okm/r-okm.h b/users/r_okm/r_okm.h
similarity index 68%
rename from users/r-okm/r-okm.h
rename to users/r_okm/r_okm.h
index 37fe8f6f..0880fadf 100644
--- a/users/r-okm/r-okm.h
+++ b/users/r_okm/r_okm.h
@@ -3,7 +3,7 @@
 #include "action.h"
 #include "quantum_keycodes.h"
 
-enum rokm_custom_keycodes {
+enum r_okm_custom_keycodes {
     ARROW_1 = SAFE_RANGE,
     ARROW_2,
     Z_TAB,
@@ -19,7 +19,7 @@ enum rokm_custom_keycodes {
     X_SIX,
     X_SEVEN,
     ESC_MHEN,
-    ROKM_SAFE_RANGE
+    R_OKM_SAFE_RANGE
 };
 
-bool process_record_user_rokm(uint16_t keycode, keyrecord_t *record);
+bool process_record_user_r_okm(uint16_t keycode, keyrecord_t *record);
diff --git a/users/r-okm/rules.mk b/users/r_okm/rules.mk
similarity index 83%
rename from users/r-okm/rules.mk
rename to users/r_okm/rules.mk
index 095ec934..b43f9e3d 100644
--- a/users/r-okm/rules.mk
+++ b/users/r_okm/rules.mk
@@ -1,4 +1,4 @@
-SRC += r-okm.c
+SRC += r_okm.c
 
 ifeq ($(strip $(MACROS_ENABLE)), yes)
     OPT_DEFS += -DMACROS_ENABLE