4 files changed, 11 insertions, 11 deletions
diff --git a/app/src/display/main.c b/app/src/display/main.c
index 0bef656..90789f9 100644
--- a/app/src/display/main.c
+++ b/app/src/display/main.c
@@ -75,8 +75,8 @@ int zmk_display_init() {
     return 0;
 }
 
-int display_event_handler(const struct zmk_event_header *eh) {
-    struct activity_state_changed *ev = cast_activity_state_changed(eh);
+int display_event_handler(const zmk_event_t *eh) {
+    struct zmk_activity_state_changed *ev = cast_zmk_activity_state_changed(eh);
     switch (ev->state) {
     case ZMK_ACTIVITY_ACTIVE:
         start_display_updates();
@@ -93,4 +93,4 @@ int display_event_handler(const struct zmk_event_header *eh) {
 }
 
 ZMK_LISTENER(display, display_event_handler);
-ZMK_SUBSCRIPTION(display, activity_state_changed);
-\ No newline at end of file
+ZMK_SUBSCRIPTION(display, zmk_activity_state_changed);
+\ No newline at end of file
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c
index f1f1c9f..309c3e9 100644
--- a/app/src/display/widgets/battery_status.c
+++ b/app/src/display/widgets/battery_status.c
@@ -75,14 +75,14 @@ lv_obj_t *zmk_widget_battery_status_obj(struct zmk_widget_battery_status *widget
     return widget->obj;
 }
 
-int battery_status_listener(const struct zmk_event_header *eh) {
+int battery_status_listener(const zmk_event_t *eh) {
     struct zmk_widget_battery_status *widget;
     SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_battery_symbol(widget->obj); }
     return ZMK_EV_EVENT_BUBBLE;
 }
 
 ZMK_LISTENER(widget_battery_status, battery_status_listener)
-ZMK_SUBSCRIPTION(widget_battery_status, battery_state_changed);
+ZMK_SUBSCRIPTION(widget_battery_status, zmk_battery_state_changed);
 #if IS_ENABLED(CONFIG_USB)
-ZMK_SUBSCRIPTION(widget_battery_status, usb_conn_state_changed);
+ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed);
 #endif /* IS_ENABLED(CONFIG_USB) */
diff --git a/app/src/display/widgets/layer_status.c b/app/src/display/widgets/layer_status.c
index 6700bb3..9960f2a 100644
--- a/app/src/display/widgets/layer_status.c
+++ b/app/src/display/widgets/layer_status.c
@@ -69,11 +69,11 @@ lv_obj_t *zmk_widget_layer_status_obj(struct zmk_widget_layer_status *widget) {
     return widget->obj;
 }
 
-int layer_status_listener(const struct zmk_event_header *eh) {
+int layer_status_listener(const zmk_event_t *eh) {
     struct zmk_widget_layer_status *widget;
     SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_layer_symbol(widget->obj); }
     return 0;
 }
 
 ZMK_LISTENER(widget_layer_status, layer_status_listener)
-ZMK_SUBSCRIPTION(widget_layer_status, layer_state_changed);
-\ No newline at end of file
+ZMK_SUBSCRIPTION(widget_layer_status, zmk_layer_state_changed);
+\ No newline at end of file
diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c
index 716228b..7e37f90 100644
--- a/app/src/display/widgets/output_status.c
+++ b/app/src/display/widgets/output_status.c
@@ -79,7 +79,7 @@ lv_obj_t *zmk_widget_output_status_obj(struct zmk_widget_output_status *widget)
     return widget->obj;
 }
 
-int output_status_listener(const struct zmk_event_header *eh) {
+int output_status_listener(const zmk_event_t *eh) {
     struct zmk_widget_output_status *widget;
     SYS_SLIST_FOR_EACH_CONTAINER(&widgets, widget, node) { set_status_symbol(widget->obj); }
     return ZMK_EV_EVENT_BUBBLE;
@@ -87,8 +87,8 @@ int output_status_listener(const struct zmk_event_header *eh) {
 
 ZMK_LISTENER(widget_output_status, output_status_listener)
 #if defined(CONFIG_USB)
-ZMK_SUBSCRIPTION(widget_output_status, usb_conn_state_changed);
+ZMK_SUBSCRIPTION(widget_output_status, zmk_usb_conn_state_changed);
 #endif
 #if defined(CONFIG_ZMK_BLE)
-ZMK_SUBSCRIPTION(widget_output_status, ble_active_profile_changed);
+ZMK_SUBSCRIPTION(widget_output_status, zmk_ble_active_profile_changed);
 #endif