From d8a75b727991cce5ea4bd6d096050047d6c50fa8 Mon Sep 17 00:00:00 2001
From: urob <978080+urob@users.noreply.github.com>
Date: Mon, 11 Jul 2022 16:08:37 -0400
Subject: [PATCH] Make behavior labels consistent

---
 config/base.keymap  | 20 ++++++++++----------
 config/unicode.dtsi |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/base.keymap b/config/base.keymap
index d99e9d8..f40fa07 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -62,22 +62,22 @@ TODOs and ISSUES
 
     macros {
         // Windows sleep key
-        win_sleep: win_sleep {
+        win_sleep: win_sleep_macro {
             wait-ms = <50>;
             tap-ms = <5>;
             compatible = "zmk,behavior-macro";
-            label = "WIN_SLEEP_KEY";
+            label = "WIN_SLEEP_MACRO";
             #binding-cells = <0>;
             bindings = <&kp LG(X) &kp U &kp S>;
         };
 
         // Make sticky shift cancel capsword. Alternatively: mod-morph ss_cw into CANCEL
         // to cancel capsword without triggering sticky-shift when capsword is active.
-        sticky_shift: sticky_shift {
+        sticky_shift: sticky_shift_cancel_capsword_macro {
             wait-ms = <0>;
             tap-ms = <1>;
             compatible = "zmk,behavior-macro";
-            label = "STICKY_SHIFT_CANCEL_CAPSWORD";
+            label = "STICKY_SHIFT_CANCEL_CAPSWORD_MACRO";
             #binding-cells = <0>;
             bindings = <&macro_tap CANCEL>         // cancel caps_word;
                      , <&macro_press &sk LSHFT>    // then tap sticky-shift and hold
@@ -98,7 +98,7 @@ TODOs and ISSUES
 
         hml: left_hand_home_row_mods {
             compatible = "zmk,behavior-hold-tap";
-            label = "LEFT_HOME_ROW_MODS";
+            label = "LEFT_HAND_HOME_ROW_MODS";
             #binding-cells = <2>;
             flavor = "balanced";
             tapping-term-ms = <280>;
@@ -110,7 +110,7 @@ TODOs and ISSUES
 
         hmr: right_hand_home_row_mods {
             compatible = "zmk,behavior-hold-tap";
-            label = "RIGHT_HOME_ROW_MODS";
+            label = "RIGHT_HAND_HOME_ROW_MODS";
             #binding-cells = <2>;
             flavor = "balanced";
             tapping-term-ms = <280>;
@@ -123,9 +123,9 @@ TODOs and ISSUES
         /* custom keys */
 
         // tap: backspace | lshft + tap: delete | rshft + tap: shift-delete | hold: num layer
-        bs_del_num: backspace_del_num {
+        bs_del_num: backspace_del_num_key {
             compatible = "zmk,behavior-mod-morph";
-            label = "BSPC_DEL_NUM";
+            label = "BACKSPACE_DEL_NUM_KEY";
             #binding-cells = <0>;
             bindings = <&lt NUM BSPC>, <&kp DEL>;
             mods = <(MOD_LSFT|MOD_RSFT)>;
@@ -133,9 +133,9 @@ TODOs and ISSUES
         };
 
         // tap: sticky shift | double tap: capsword | triple tap: cancel capsword
-        ss_cw: sticky_shift_capsword {
+        ss_cw: sticky_shift_capsword_key {
             compatible = "zmk,behavior-tap-dance";
-            label = "STICKY_SHIFT_CAPSWORD";
+            label = "STICKY_SHIFT_CAPSWORD_KEY";
             #binding-cells = <0>;
             tapping-term-ms = <200>;
             // bindings = <&sticky_shift>, <&caps_word>, <CANCEL>;
diff --git a/config/unicode.dtsi b/config/unicode.dtsi
index c4c3469..e6307c5 100644
--- a/config/unicode.dtsi
+++ b/config/unicode.dtsi
@@ -7,10 +7,10 @@
 #define UC_MACRO(NAME, UNICODE_BINDING) \
     macros { \
         NAME: NAME { \
-            wait-ms = <0>; \
-            tap-ms = <1>; \
             compatible = "zmk,behavior-macro"; \
             label = STRINGIFY(ZM_ ## NAME); \
+            wait-ms = <0>; \
+            tap-ms = <1>; \
             #binding-cells = <0>; \
             bindings = <OS_LEAD UNICODE_BINDING OS_TRAIL>; \
         }; \