diff --git a/app/boards/shields/nice_view/Kconfig.defconfig b/app/boards/shields/nice_view/Kconfig.defconfig
index 27938ee5..622c7498 100644
--- a/app/boards/shields/nice_view/Kconfig.defconfig
+++ b/app/boards/shields/nice_view/Kconfig.defconfig
@@ -14,12 +14,8 @@ config SPI
 config LS0XX
 	default y
 
-if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
-
 config ZMK_WIDGET_WPM_STATUS
-	default y
-
-endif # !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
+	default y if !ZMK_SPLIT || ZMK_SPLIT_ROLE_CENTRAL
 
 endif # ZMK_DISPLAY
 
diff --git a/app/boards/shields/nice_view/nice_view.zmk.yml b/app/boards/shields/nice_view/nice_view.zmk.yml
index 92be3547..04b98a8a 100644
--- a/app/boards/shields/nice_view/nice_view.zmk.yml
+++ b/app/boards/shields/nice_view/nice_view.zmk.yml
@@ -3,6 +3,6 @@ id: nice_view
 name: nice!view
 type: shield
 url: https://nicekeyboards.com/nice-view
-requires: [nice_view]
+requires: [nice_view_header]
 features:
   - display
diff --git a/app/boards/shields/nice_view_oled/Kconfig.defconfig b/app/boards/shields/nice_view_adapter/Kconfig.defconfig
similarity index 100%
rename from app/boards/shields/nice_view_oled/Kconfig.defconfig
rename to app/boards/shields/nice_view_adapter/Kconfig.defconfig
diff --git a/app/boards/shields/nice_view_adapter/Kconfig.shield b/app/boards/shields/nice_view_adapter/Kconfig.shield
new file mode 100644
index 00000000..bf9ba7cb
--- /dev/null
+++ b/app/boards/shields/nice_view_adapter/Kconfig.shield
@@ -0,0 +1,5 @@
+# Copyright (c) 2022 The ZMK Contributors
+# SPDX-License-Identifier: MIT
+
+config SHIELD_NICE_VIEW_ADAPTER
+	def_bool $(shields_list_contains,nice_view_adapter)
diff --git a/app/boards/shields/nice_view_oled/boards/nice_nano.overlay b/app/boards/shields/nice_view_adapter/boards/nice_nano.overlay
similarity index 100%
rename from app/boards/shields/nice_view_oled/boards/nice_nano.overlay
rename to app/boards/shields/nice_view_adapter/boards/nice_nano.overlay
diff --git a/app/boards/shields/nice_view_oled/boards/nice_nano_v2.overlay b/app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay
similarity index 100%
rename from app/boards/shields/nice_view_oled/boards/nice_nano_v2.overlay
rename to app/boards/shields/nice_view_adapter/boards/nice_nano_v2.overlay
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.conf b/app/boards/shields/nice_view_adapter/nice_view_adapter.conf
similarity index 100%
rename from app/boards/shields/nice_view_oled/nice_view_oled.conf
rename to app/boards/shields/nice_view_adapter/nice_view_adapter.conf
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.overlay b/app/boards/shields/nice_view_adapter/nice_view_adapter.overlay
similarity index 100%
rename from app/boards/shields/nice_view_oled/nice_view_oled.overlay
rename to app/boards/shields/nice_view_adapter/nice_view_adapter.overlay
diff --git a/app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml b/app/boards/shields/nice_view_adapter/nice_view_adapter.zmk.yml
similarity index 72%
rename from app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml
rename to app/boards/shields/nice_view_adapter/nice_view_adapter.zmk.yml
index bb057e92..5106a53f 100644
--- a/app/boards/shields/nice_view_oled/nice_view_oled.zmk.yml
+++ b/app/boards/shields/nice_view_adapter/nice_view_adapter.zmk.yml
@@ -1,9 +1,9 @@
 file_format: "1"
-id: nice_view_oled
+id: nice_view_adapter
 name: nice!view
 type: shield
 url: https://nicekeyboards.com/nice-view
 requires: [i2c_oled]
-exposes: [nice_view]
+exposes: [nice_view_header]
 features:
   - display
diff --git a/app/boards/shields/nice_view_oled/Kconfig.shield b/app/boards/shields/nice_view_oled/Kconfig.shield
deleted file mode 100644
index a7e195df..00000000
--- a/app/boards/shields/nice_view_oled/Kconfig.shield
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2022 The ZMK Contributors
-# SPDX-License-Identifier: MIT
-
-config SHIELD_NICE_VIEW_OLED
-	def_bool $(shields_list_contains,nice_view_oled)
diff --git a/app/core-coverage.yml b/app/core-coverage.yml
index 3579d568..12c03613 100644
--- a/app/core-coverage.yml
+++ b/app/core-coverage.yml
@@ -31,5 +31,5 @@ include:
   cmake-args: "-DCONFIG_ZMK_RGB_UNDERGLOW=y -DCONFIG_WS2812_STRIP=y"
   nickname: "underglow"
 - board: nice_nano_v2
-  shield: lily58_left nice_view_oled nice_view
+  shield: lily58_left nice_view_adapter nice_view
   nickname: "niceview"