diff --git a/keyboards/islandworks/island_chalice/config.h b/keyboards/islandworks/13u-keyboard/config.h
similarity index 100%
rename from keyboards/islandworks/island_chalice/config.h
rename to keyboards/islandworks/13u-keyboard/config.h
diff --git a/keyboards/islandworks/islandworks_13u/info.json b/keyboards/islandworks/13u-keyboard/info.json
similarity index 98%
rename from keyboards/islandworks/islandworks_13u/info.json
rename to keyboards/islandworks/13u-keyboard/info.json
index d22b83eb519..e7ad71f27f3 100644
--- a/keyboards/islandworks/islandworks_13u/info.json
+++ b/keyboards/islandworks/13u-keyboard/info.json
@@ -1,6 +1,6 @@
 {
     "manufacturer": "islandworks",
-    "keyboard_name": "13U",
+    "keyboard_name": "13u-keyboard",
     "maintainer": "zhol0777",
     "processor": "RP2040",
     "bootloader": "rp2040",
diff --git a/keyboards/islandworks/islandworks_13u/keymaps/default/keymap.c b/keyboards/islandworks/13u-keyboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/keymaps/default/keymap.c
rename to keyboards/islandworks/13u-keyboard/keymaps/default/keymap.c
diff --git a/keyboards/islandworks/islandworks_13u/keymaps/vial/config.h b/keyboards/islandworks/13u-keyboard/keymaps/vial/config.h
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/keymaps/vial/config.h
rename to keyboards/islandworks/13u-keyboard/keymaps/vial/config.h
diff --git a/keyboards/islandworks/islandworks_13u/keymaps/vial/keymap.c b/keyboards/islandworks/13u-keyboard/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/keymaps/vial/keymap.c
rename to keyboards/islandworks/13u-keyboard/keymaps/vial/keymap.c
diff --git a/keyboards/islandworks/islandworks_13u/keymaps/vial/rules.mk b/keyboards/islandworks/13u-keyboard/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/keymaps/vial/rules.mk
rename to keyboards/islandworks/13u-keyboard/keymaps/vial/rules.mk
diff --git a/keyboards/islandworks/islandworks_13u/keymaps/vial/vial.json b/keyboards/islandworks/13u-keyboard/keymaps/vial/vial.json
similarity index 98%
rename from keyboards/islandworks/islandworks_13u/keymaps/vial/vial.json
rename to keyboards/islandworks/13u-keyboard/keymaps/vial/vial.json
index f3523010696..b4af663fc5a 100644
--- a/keyboards/islandworks/islandworks_13u/keymaps/vial/vial.json
+++ b/keyboards/islandworks/13u-keyboard/keymaps/vial/vial.json
@@ -1,5 +1,5 @@
 {
-    "name": "13U",
+    "name": "13u-keyboard",
     "vendorId": "0x0777",
     "productId": "0x0003",
     "lighting": "none",
diff --git a/keyboards/islandworks/islandworks_13u/readme.md b/keyboards/islandworks/13u-keyboard/readme.md
similarity index 92%
rename from keyboards/islandworks/islandworks_13u/readme.md
rename to keyboards/islandworks/13u-keyboard/readme.md
index ed003ec8b9e..cc9763c9914 100644
--- a/keyboards/islandworks/islandworks_13u/readme.md
+++ b/keyboards/islandworks/13u-keyboard/readme.md
@@ -1,6 +1,6 @@
-# zhol/islandworks_13u
+# islandworks/13u
 
-![zhol/islandworks_13u](imgur.com image replace me!)
+![islandworks/13u](imgur.com image replace me!)
 
 *Some 13u hhkb i don't know *
 
diff --git a/keyboards/islandworks/island_chalice/rules.mk b/keyboards/islandworks/13u-keyboard/rules.mk
similarity index 100%
rename from keyboards/islandworks/island_chalice/rules.mk
rename to keyboards/islandworks/13u-keyboard/rules.mk
diff --git a/keyboards/islandworks/arena/readme.md b/keyboards/islandworks/arena/readme.md
index 808732aaa1f..fbe137b61c6 100644
--- a/keyboards/islandworks/arena/readme.md
+++ b/keyboards/islandworks/arena/readme.md
@@ -1,4 +1,4 @@
-# arena
+# islandworks arena
 
 ![arena](imgur.com image replace me!)
 
@@ -10,11 +10,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make zhol:arena:default
+    make islandworks:arena:default
 
 Flashing example for this keyboard:
 
-    make zhol:arena:default:flash
+    make islandworks:arena:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/islandworks/islandworks_13u/config.h b/keyboards/islandworks/chalice-rep/config.h
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/config.h
rename to keyboards/islandworks/chalice-rep/config.h
diff --git a/keyboards/islandworks/island_chalice/info.json b/keyboards/islandworks/chalice-rep/info.json
similarity index 98%
rename from keyboards/islandworks/island_chalice/info.json
rename to keyboards/islandworks/chalice-rep/info.json
index a75c3b22f38..30a1a18f115 100644
--- a/keyboards/islandworks/island_chalice/info.json
+++ b/keyboards/islandworks/chalice-rep/info.json
@@ -1,6 +1,6 @@
 {
     "manufacturer": "islandworks",
-    "keyboard_name": "island chalice",
+    "keyboard_name": "chalice-rep",
     "maintainer": "zhol0777",
     "processor": "RP2040",
     "bootloader": "rp2040",
diff --git a/keyboards/islandworks/island_chalice/keymaps/default/keymap.c b/keyboards/islandworks/chalice-rep/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/islandworks/island_chalice/keymaps/default/keymap.c
rename to keyboards/islandworks/chalice-rep/keymaps/default/keymap.c
diff --git a/keyboards/islandworks/island_chalice/keymaps/vial/config.h b/keyboards/islandworks/chalice-rep/keymaps/vial/config.h
similarity index 100%
rename from keyboards/islandworks/island_chalice/keymaps/vial/config.h
rename to keyboards/islandworks/chalice-rep/keymaps/vial/config.h
diff --git a/keyboards/islandworks/island_chalice/keymaps/vial/keymap.c b/keyboards/islandworks/chalice-rep/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/islandworks/island_chalice/keymaps/vial/keymap.c
rename to keyboards/islandworks/chalice-rep/keymaps/vial/keymap.c
diff --git a/keyboards/islandworks/island_chalice/keymaps/vial/rules.mk b/keyboards/islandworks/chalice-rep/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/islandworks/island_chalice/keymaps/vial/rules.mk
rename to keyboards/islandworks/chalice-rep/keymaps/vial/rules.mk
diff --git a/keyboards/islandworks/island_chalice/keymaps/vial/vial.json b/keyboards/islandworks/chalice-rep/keymaps/vial/vial.json
similarity index 99%
rename from keyboards/islandworks/island_chalice/keymaps/vial/vial.json
rename to keyboards/islandworks/chalice-rep/keymaps/vial/vial.json
index 415d86880c6..2521012c7df 100644
--- a/keyboards/islandworks/island_chalice/keymaps/vial/vial.json
+++ b/keyboards/islandworks/chalice-rep/keymaps/vial/vial.json
@@ -1,5 +1,5 @@
 {
-    "name": "island chalice",
+    "name": "chalice-rep",
     "vendorId": "0xDFC8",
     "productId": "0x0042",
     "lighting": "none",
diff --git a/keyboards/islandworks/island_chalice/readme.md b/keyboards/islandworks/chalice-rep/readme.md
similarity index 85%
rename from keyboards/islandworks/island_chalice/readme.md
rename to keyboards/islandworks/chalice-rep/readme.md
index f08aa279c86..9b585e50093 100644
--- a/keyboards/islandworks/island_chalice/readme.md
+++ b/keyboards/islandworks/chalice-rep/readme.md
@@ -1,6 +1,4 @@
-# zhol/island_chalice
-
-![zhol/island_chalice](imgur.com image replace me!)
+# islandworks chalice-rep
 
 *PCB replacement for Owlabs Chalice40 that supports 2.25u Left Shift*
 
@@ -10,11 +8,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make zhol/island_chalice:default
+    make islandworks/chalice-rep:default
 
 Flashing example for this keyboard:
 
-    make zhol/island_chalice:default:flash
+    make islandworks/chalice-rep:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
diff --git a/keyboards/islandworks/islandworks_13u/rules.mk b/keyboards/islandworks/chalice-rep/rules.mk
similarity index 100%
rename from keyboards/islandworks/islandworks_13u/rules.mk
rename to keyboards/islandworks/chalice-rep/rules.mk