diff --git a/config/boards/shields/totem/Kconfig.defconfig b/config/boards/shields/totem/Kconfig.defconfig
index d6059f0..9871440 100644
--- a/config/boards/shields/totem/Kconfig.defconfig
+++ b/config/boards/shields/totem/Kconfig.defconfig
@@ -10,7 +10,7 @@ endif # LEFT
 
 
 
-if SHIELD_TOTEM
+if SHIELD_TOTEM_LEFT || SHIELD_TOTEM_RIGHT
 
     config ZMK_SPLIT
         default y
diff --git a/config/boards/shields/totem/Kconfig.shield b/config/boards/shields/totem/Kconfig.shield
index f6431b9..489b208 100644
--- a/config/boards/shields/totem/Kconfig.shield
+++ b/config/boards/shields/totem/Kconfig.shield
@@ -1,10 +1,5 @@
-config SHIELD_TOTEM
-    bool
-
 config SHIELD_TOTEM_LEFT
     def_bool $(shields_list_contains,totem_left)
-    select SHIELD_TOTEM
 
 config SHIELD_TOTEM_RIGHT
-    def_bool $(shields_list_contains,totem_right)
-    select SHIELD_TOTEM
\ No newline at end of file
+    def_bool $(shields_list_contains,totem_right)
\ No newline at end of file
diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi
index 571542d..f0e1735 100644
--- a/config/boards/shields/totem/totem.dtsi
+++ b/config/boards/shields/totem/totem.dtsi
@@ -12,7 +12,7 @@
 		zmk,matrix_transform = &default_transform;
 	};
 
-	default_transform: keymap_transform_0 {
+	default_transform: keymap_transform {
 		compatible = "zmk,matrix-transform";
 		columns = <10>;
 		rows = <4>;
@@ -25,7 +25,7 @@
 	};
 
 
-	kscan0: kscan_0 {
+	kscan0: kscan {
 		compatible = "zmk,kscan-gpio-matrix";
 		label = "KSCAN";
 		diode-direction = "col2row";