diff --git a/app/tests/hold-tap/balanced/1/events.patterns b/app/tests/hold-tap/balanced/1-dn-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/1/events.patterns
rename to app/tests/hold-tap/balanced/1-dn-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/1/keycode_events.snapshot b/app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/1/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/1-dn-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/1/native_posix.keymap b/app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/1/native_posix.keymap
rename to app/tests/hold-tap/balanced/1-dn-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/2/events.patterns b/app/tests/hold-tap/balanced/2-dn-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/2/events.patterns
rename to app/tests/hold-tap/balanced/2-dn-timer-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/2/keycode_events.snapshot b/app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/2/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/2-dn-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/2/native_posix.keymap b/app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/2/native_posix.keymap
rename to app/tests/hold-tap/balanced/2-dn-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/3a/events.patterns b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/3a/events.patterns
rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/3a/keycode_events.snapshot b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/3a/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/3a/native_posix.keymap b/app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/3a/native_posix.keymap
rename to app/tests/hold-tap/balanced/3a-moddn-dn-modup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/3b/events.patterns b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/3b/events.patterns
rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/3b/keycode_events.snapshot b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/3b/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/3b/native_posix.keymap b/app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/3b/native_posix.keymap
rename to app/tests/hold-tap/balanced/3b-moddn-dn-modup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/3c/events.patterns b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/3c/events.patterns
rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/3c/keycode_events.snapshot b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/3c/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/3c/native_posix.keymap b/app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/3c/native_posix.keymap
rename to app/tests/hold-tap/balanced/3c-kcdn-dn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/3d/events.patterns b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/3d/events.patterns
rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/3d/keycode_events.snapshot b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/3d/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/3d/native_posix.keymap b/app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/3d/native_posix.keymap
rename to app/tests/hold-tap/balanced/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/4a-nested/events.patterns b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/4a-nested/events.patterns
rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/4a-nested/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/4a-nested/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/4a-nested/native_posix.keymap
rename to app/tests/hold-tap/balanced/4a-dn-htdn-timer-htup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/4a/events.patterns b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/4a/events.patterns
rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/4a/keycode_events.snapshot b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/4a/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/4a/native_posix.keymap b/app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/4a/native_posix.keymap
rename to app/tests/hold-tap/balanced/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/4b/events.patterns b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/4b/events.patterns
rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/4b/keycode_events.snapshot b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/4b/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/4b/native_posix.keymap b/app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/4b/native_posix.keymap
rename to app/tests/hold-tap/balanced/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/4c/events.patterns b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/4c/events.patterns
rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/balanced/4c/keycode_events.snapshot b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/4c/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/4c/native_posix.keymap b/app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/4c/native_posix.keymap
rename to app/tests/hold-tap/balanced/4c-dn-kcdn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/balanced/4d/events.patterns b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/events.patterns
similarity index 100%
rename from app/tests/hold-tap/balanced/4d/events.patterns
rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/events.patterns
diff --git a/app/tests/hold-tap/balanced/4d/keycode_events.snapshot b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/balanced/4d/keycode_events.snapshot
rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
diff --git a/app/tests/hold-tap/balanced/4d/native_posix.keymap b/app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/balanced/4d/native_posix.keymap
rename to app/tests/hold-tap/balanced/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/1/events.patterns b/app/tests/hold-tap/hold-preferred/1-dn-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/1/events.patterns
rename to app/tests/hold-tap/hold-preferred/1-dn-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/1/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/1-dn-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/1/native_posix.keymap b/app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/1/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/1-dn-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/2/events.patterns b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/2/events.patterns
rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/2/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/2/native_posix.keymap b/app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/2/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/2-dn-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3a/events.patterns b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3a/events.patterns
rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3a/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/3a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3a/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/3a-moddn-dn-modup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3b/events.patterns b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3b/events.patterns
rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3b/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/3b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3b/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3c/events.patterns b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3c/events.patterns
rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3c/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/3c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3c/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/3d/events.patterns b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3d/events.patterns
rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3d/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/3d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/3d/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/events.patterns b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a-nested/events.patterns
rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a-nested/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a-nested/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4a/events.patterns b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a/events.patterns
rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/4a/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4a/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4b/events.patterns b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4b/events.patterns
rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4b/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/4b/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4b/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4c/events.patterns b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4c/events.patterns
rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4c/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/4c/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4c/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/hold-preferred/4d/events.patterns b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4d/events.patterns
rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns
diff --git a/app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4d/keycode_events.snapshot
rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
diff --git a/app/tests/hold-tap/hold-preferred/4d/native_posix.keymap b/app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/hold-preferred/4d/native_posix.keymap
rename to app/tests/hold-tap/hold-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/1/events.patterns b/app/tests/hold-tap/tap-preferred/1-dn-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/1/events.patterns
rename to app/tests/hold-tap/tap-preferred/1-dn-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/1/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/1-dn-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/1/native_posix.keymap b/app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/1/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/1-dn-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/2/events.patterns b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/2/events.patterns
rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/2/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/2/native_posix.keymap b/app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/2/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/2-dn-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3a/events.patterns b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3a/events.patterns
rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3a/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/3a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3a/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/3a-moddn-dn-modup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3b/events.patterns b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3b/events.patterns
rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3b/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/3b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3b/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/3b-moddn-dn-modup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3c/events.patterns b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3c/events.patterns
rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3c/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/3c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3c/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/3c-kcdn-dn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/3d/events.patterns b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3d/events.patterns
rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3d/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/3d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/3d/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/3d-kcdn-dn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/events.patterns b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a-nested/events.patterns
rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a-nested/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a-nested/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/4a-dn-htdn-timer-htup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4a/events.patterns b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a/events.patterns
rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/4a/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4a/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/4a-dn-kcdn-timer-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4b/events.patterns b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4b/events.patterns
rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4b/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/4b/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4b/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/4b-dn-kcdn-kcup-timer-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4c/events.patterns b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4c/events.patterns
rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4c/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/4c/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4c/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/4c-dn-kcdn-kcup-up/native_posix.keymap
diff --git a/app/tests/hold-tap/tap-preferred/4d/events.patterns b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4d/events.patterns
rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/events.patterns
diff --git a/app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4d/keycode_events.snapshot
rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/keycode_events.snapshot
diff --git a/app/tests/hold-tap/tap-preferred/4d/native_posix.keymap b/app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
similarity index 100%
rename from app/tests/hold-tap/tap-preferred/4d/native_posix.keymap
rename to app/tests/hold-tap/tap-preferred/4d-dn-kcdn-timer-up-kcup/native_posix.keymap
diff --git a/app/tests/tap-hold/balanced/behavior_keymap.dtsi b/app/tests/tap-hold/balanced/behavior_keymap.dtsi
deleted file mode 100644
index df56fb5b..00000000
--- a/app/tests/tap-hold/balanced/behavior_keymap.dtsi
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <dt-bindings/zmk/keys.h>
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
-
-/ {
-	behaviors {
-		ht_bal: behavior_hold_tap_balanced {
-			compatible = "zmk,behavior-hold-tap";
-			label = "HOLD_TAP_BALANCED";
-			#binding-cells = <2>;
-			flavor = "balanced";
-			tapping_term_ms = <300>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
-
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-
-		default_layer {
-			bindings = <
-				&ht_bal LSFT F &ht_bal LCTL J
-				&kp D &kp RCTL>;
-		};
-	};
-};
diff --git a/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi
deleted file mode 100644
index 375ffd93..00000000
--- a/app/tests/tap-hold/hold-preferred/behavior_keymap.dtsi
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <dt-bindings/zmk/keys.h>
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
-
-
-
-/ {
-	behaviors {
-		ht_hold: behavior_hold_hold_tap {
-			compatible = "zmk,behavior-hold-tap";
-			label = "hold_hold_tap";
-			#binding-cells = <2>;
-			flavor = "hold-preferred";
-			tapping_term_ms = <300>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
-
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-
-		default_layer {
-			bindings = <
-				&ht_hold LSFT F &ht_hold LCTL J
-				&kp D &kp RCTL>;
-		};
-	};
-};
diff --git a/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi b/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi
deleted file mode 100644
index e514fa65..00000000
--- a/app/tests/tap-hold/tap-preferred/behavior_keymap.dtsi
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <dt-bindings/zmk/keys.h>
-#include <behaviors.dtsi>
-#include <dt-bindings/zmk/kscan-mock.h>
-
-/ {
-	behaviors {
-		tp: behavior_tap_preferred {
-			compatible = "zmk,behavior-hold-tap";
-			label = "MOD_TAP";
-			#binding-cells = <2>;
-			flavor = "tap-preferred";
-			tapping_term_ms = <300>;
-			bindings = <&kp>, <&kp>;
-		};
-	};
-
-	keymap {
-		compatible = "zmk,keymap";
-		label ="Default keymap";
-
-		default_layer {
-			bindings = <
-				&tp LSFT F &tp LCTL J
-				&kp D &kp RCTL>;
-		};
-	};
-};