diff --git a/app/boards/shields/ergos1_ose/Kconfig.defconfig b/app/boards/shields/ergos1_oe/Kconfig.defconfig
similarity index 72%
rename from app/boards/shields/ergos1_ose/Kconfig.defconfig
rename to app/boards/shields/ergos1_oe/Kconfig.defconfig
index 3a252f49..105b00c6 100644
--- a/app/boards/shields/ergos1_ose/Kconfig.defconfig
+++ b/app/boards/shields/ergos1_oe/Kconfig.defconfig
@@ -1,6 +1,6 @@
 # Copyright (c) 2021 The ZMK Contributors
 # SPDX-License-Identifier: MIT
-if SHIELD_ERGOS1_OSE_LEFT
+if SHIELD_ERGOS1_OE_LEFT
 
 config ZMK_KEYBOARD_NAME
 	default "Ergo S-1"
@@ -10,7 +10,7 @@ config ZMK_SPLIT_ROLE_CENTRAL
 
 endif
 
-if SHIELD_ERGOS1_OSE_LEFT || SHIELD_ERGOS1_OSE_RIGHT
+if SHIELD_ERGOS1_OE_LEFT || SHIELD_ERGOS1_OE_RIGHT
 
 config ZMK_SPLIT
 	default y
diff --git a/app/boards/shields/ergos1_oe/Kconfig.shield b/app/boards/shields/ergos1_oe/Kconfig.shield
new file mode 100644
index 00000000..bdb85705
--- /dev/null
+++ b/app/boards/shields/ergos1_oe/Kconfig.shield
@@ -0,0 +1,7 @@
+# Copyright (c) 2021 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+config SHIELD_ERGOS1_OE_LEFT
+	def_bool $(shields_list_contains,ergos1_oe_left)
+
+config SHIELD_ERGOS1_OE_RIGHT
+	def_bool $(shields_list_contains,ergos1_oe_right)
diff --git a/app/boards/shields/ergos1_ose/boards/nice_nano.overlay b/app/boards/shields/ergos1_oe/boards/nice_nano.overlay
similarity index 100%
rename from app/boards/shields/ergos1_ose/boards/nice_nano.overlay
rename to app/boards/shields/ergos1_oe/boards/nice_nano.overlay
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.conf b/app/boards/shields/ergos1_oe/ergos1_oe.conf
similarity index 78%
rename from app/boards/shields/ergos1_ose/ergos1_ose.conf
rename to app/boards/shields/ergos1_oe/ergos1_oe.conf
index dd3c4c3e..71ff719f 100644
--- a/app/boards/shields/ergos1_ose/ergos1_ose.conf
+++ b/app/boards/shields/ergos1_oe/ergos1_oe.conf
@@ -1,3 +1,3 @@
-# Uncommenting the following lines won't do anything because the Ergo S-1 OSE doesn't have LEDs
+# Uncommenting the following lines won't do anything because the Ergo S-1 OE doesn't have LEDs
 # CONFIG_ZMK_RGB_UNDERGLOW=y
 # CONFIG_WS2812_STRIP=y
\ No newline at end of file
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.dtsi b/app/boards/shields/ergos1_oe/ergos1_oe.dtsi
similarity index 100%
rename from app/boards/shields/ergos1_ose/ergos1_ose.dtsi
rename to app/boards/shields/ergos1_oe/ergos1_oe.dtsi
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.keymap b/app/boards/shields/ergos1_oe/ergos1_oe.keymap
similarity index 100%
rename from app/boards/shields/ergos1_ose/ergos1_ose.keymap
rename to app/boards/shields/ergos1_oe/ergos1_oe.keymap
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml b/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml
similarity index 61%
rename from app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml
rename to app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml
index 09cf4255..2d6ebabd 100644
--- a/app/boards/shields/ergos1_ose/ergos1_ose.zmk.yml
+++ b/app/boards/shields/ergos1_oe/ergos1_oe.zmk.yml
@@ -1,11 +1,11 @@
 file_format: "1"
-id: ergos1_ose
-name: Ergo S-1 OSE
+id: ergos1_oe
+name: Ergo S-1 OE
 type: shield
 url: https://github.com/wizarddata/Ergo-S-1
 requires: [pro_micro]
 features:
   - keys
 siblings:
-  - ergo_s1_ose_left
-  - ergo_s1_ose_right
+  - ergo_s1_oe_left
+  - ergo_s1_oe_right
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay
similarity index 93%
rename from app/boards/shields/ergos1_ose/ergos1_ose_left.overlay
rename to app/boards/shields/ergos1_oe/ergos1_oe_left.overlay
index 01c80d99..2fe0f4b4 100644
--- a/app/boards/shields/ergos1_ose/ergos1_ose_left.overlay
+++ b/app/boards/shields/ergos1_oe/ergos1_oe_left.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ergos1_ose.dtsi"
+#include "ergos1_oe.dtsi"
 
 &kscan0 {
 	col-gpios
diff --git a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay b/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay
similarity index 94%
rename from app/boards/shields/ergos1_ose/ergos1_ose_right.overlay
rename to app/boards/shields/ergos1_oe/ergos1_oe_right.overlay
index e26e9856..48f820f3 100644
--- a/app/boards/shields/ergos1_ose/ergos1_ose_right.overlay
+++ b/app/boards/shields/ergos1_oe/ergos1_oe_right.overlay
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ergos1_ose.dtsi"
+#include "ergos1_oe.dtsi"
 
 &default_transform {
 	col-offset = <8>;
diff --git a/app/boards/shields/ergos1_ose/Kconfig.shield b/app/boards/shields/ergos1_ose/Kconfig.shield
deleted file mode 100644
index c9c9c950..00000000
--- a/app/boards/shields/ergos1_ose/Kconfig.shield
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2021 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-config SHIELD_ERGOS1_OSE_LEFT
-	def_bool $(shields_list_contains,ergos1_ose_left)
-
-config SHIELD_ERGOS1_OSE_RIGHT
-	def_bool $(shields_list_contains,ergos1_ose_right)