diff --git a/streamdeck/contexts.py b/streamdeck/contexts.py
index 785684a..26f9428 100644
--- a/streamdeck/contexts.py
+++ b/streamdeck/contexts.py
@@ -9,9 +9,9 @@
 from streamdeck.event_handlers.actions import GlobalAction
 from streamdeck.models.events import DEFAULT_EVENT_MODELS
 from streamdeck.models.events.common import (
+    ActionInstanceEventMixin,
+    ActionInstancePayloadEventMixin,
     BasePayload,
-    ContextualEventMixin,
-    ContextualPayloadEventMixin,
     ControllerType,
     Coordinates,
     CoordinatesPayloadMixin,
@@ -165,8 +165,8 @@ def _update_device_disconnected(self, event_data: DeviceDidDisconnect) -> None:
         self.get_device_context(event_data.device).connected = False
 
     @update_from_event.register
-    def _update_contextual_event(self, event_data: ContextualEventMixin) -> None:
-        """Update action-instance identity for a contextual event.
+    def _update_action_instance_event(self, event_data: ActionInstanceEventMixin) -> None:
+        """Update action-instance identity from an event.
 
         Args:
             event_data: Event identifying an action and one of its instances.
@@ -174,14 +174,14 @@ def _update_contextual_event(self, event_data: ContextualEventMixin) -> None:
         self._get_or_create_action_instance_context(event_data)
 
     @update_from_event.register
-    def _update_contextual_payload_event(
+    def _update_action_instance_payload_event(
         self,
-        event_data: ContextualPayloadEventMixin,
+        event_data: ActionInstancePayloadEventMixin,
     ) -> None:
-        """Update action-instance context values from a contextual event payload.
+        """Update cached action-instance values from an event payload.
 
         Args:
-            event_data: Contextual event with payload data that may update the context.
+            event_data: Event with payload data that may update the cached action instance.
         """
         instance = self._get_or_create_action_instance_context(event_data)
         payload = event_data.payload
@@ -234,7 +234,7 @@ def get_action_context(self, action_uuid: str) -> ActionContext:
 
     def _get_or_create_action_instance_context(
         self,
-        event_data: ContextualEventMixin,
+        event_data: ActionInstanceEventMixin,
     ) -> ActionInstanceContext:
         """Get or create an action-instance context using event identity fields.
 
@@ -282,7 +282,7 @@ def resolve_device_context(self, event_data: EventBase) -> DeviceContext:
         return self.get_device_context(event_data.device)
 
     def resolve_action_context(self, event_data: EventBase) -> ActionContext:
-        """Resolve the action context identified by a contextual event.
+        """Resolve the action context identified by an action-instance event.
 
         Args:
             event_data: Event expected to identify an action.
@@ -293,13 +293,13 @@ def resolve_action_context(self, event_data: EventBase) -> ActionContext:
         Raises:
             TypeError: If the event does not identify an action.
         """
-        if not isinstance(event_data, ContextualEventMixin):
+        if not isinstance(event_data, ActionInstanceEventMixin):
             msg = f"Event {event_data.event!r} does not identify an action"
             raise TypeError(msg)
         return self.get_action_context(event_data.action)
 
     def resolve_action_instance_context(self, event_data: EventBase) -> ActionInstanceContext:
-        """Resolve the action-instance context identified by a contextual event.
+        """Resolve the action-instance context identified by an action-instance event.
 
         Args:
             event_data: Event expected to identify an action instance.
@@ -310,7 +310,7 @@ def resolve_action_instance_context(self, event_data: EventBase) -> ActionInstan
         Raises:
             TypeError: If the event does not identify an action instance.
         """
-        if not isinstance(event_data, ContextualEventMixin):
+        if not isinstance(event_data, ActionInstanceEventMixin):
             msg = f"Event {event_data.event!r} does not identify an action instance"
             raise TypeError(msg)
 
@@ -333,7 +333,7 @@ def update_context(event_data: EventBase) -> None:
         context_store.update_from_event(event_data)
 
     for event_model in DEFAULT_EVENT_MODELS:
-        # Skip sendToPlugin: its arbitrary payload is the only contextual event payload not used
+        # Skip sendToPlugin: its arbitrary payload is the only action-instance event payload not used
         # to update cached context values.
         if event_model is DidReceivePropertyInspectorMessage:
             continue
@@ -341,7 +341,7 @@ def update_context(event_data: EventBase) -> None:
         # Only register events that identify an action instance, a device, or global settings.
         if not issubclass(
             event_model,
-            (ContextualEventMixin, DeviceSpecificEventMixin, DidReceiveGlobalSettings),
+            (ActionInstanceEventMixin, DeviceSpecificEventMixin, DidReceiveGlobalSettings),
         ):
             continue
 
diff --git a/streamdeck/event_handlers/scopes.py b/streamdeck/event_handlers/scopes.py
index 6cd6475..267cdd7 100644
--- a/streamdeck/event_handlers/scopes.py
+++ b/streamdeck/event_handlers/scopes.py
@@ -5,7 +5,7 @@
 from enum import Flag, auto
 from typing import TYPE_CHECKING, Literal
 
-from streamdeck.models.events.common import ContextualEventMixin, DeviceSpecificEventMixin
+from streamdeck.models.events.common import ActionInstanceEventMixin, DeviceSpecificEventMixin
 
 
 if TYPE_CHECKING:
@@ -75,7 +75,7 @@ def scope_for_event(event_or_model: EventBase | type[EventBase]) -> Scope:
         issubclass if isinstance(event_or_model, type) else isinstance
     )
 
-    if scope_check(event_or_model, ContextualEventMixin):
+    if scope_check(event_or_model, ActionInstanceEventMixin):
         scope |= Scope.ACTION_INSTANCE
     if scope_check(event_or_model, DeviceSpecificEventMixin):
         scope |= Scope.DEVICE
diff --git a/streamdeck/manager.py b/streamdeck/manager.py
index 115643d..fb8b9d2 100644
--- a/streamdeck/manager.py
+++ b/streamdeck/manager.py
@@ -13,7 +13,7 @@
 from streamdeck.event_handlers.scopes import ScopeName, scope_for_event
 from streamdeck.event_listener import EventListener, EventListenerManager
 from streamdeck.models.events.adapter import EventAdapter
-from streamdeck.models.events.common import ContextualEventMixin
+from streamdeck.models.events.common import ActionInstanceEventMixin
 from streamdeck.utils.logging import configure_streamdeck_logger
 from streamdeck.websocket import WebSocketClient
 
@@ -164,10 +164,10 @@ def _dispatch_event(self, event: EventBase) -> None:
             event (EventBase): The event data model for the event to dispatch.
         """
         # If the event is action-specific, we'll pass the action's uuid to the handler to ensure only the correct action is triggered.
-        event_action_uuid = event.action if isinstance(event, ContextualEventMixin) else None
+        event_action_uuid = event.action if isinstance(event, ActionInstanceEventMixin) else None
         for event_handler in self._handlers_registry.get_event_handlers(event_name=event.event, event_action_uuid=event_action_uuid):
             injected_params = self._injectable_handler_param_store.resolve_for_handler(event_handler, event)
-            # TODO: from contextual event occurrences, save metadata to the action's properties.
+            # TODO: from action-instance event occurrences, save metadata to the action's properties.
 
             event_handler(event, **injected_params)
 
diff --git a/streamdeck/models/events/common.py b/streamdeck/models/events/common.py
index 292615e..c1739db 100644
--- a/streamdeck/models/events/common.py
+++ b/streamdeck/models/events/common.py
@@ -16,8 +16,8 @@
 
 ## Mixin classes for common event model fields.
 
-class ContextualEventMixin:
-    """Mixin class for event models that have action and context fields."""
+class ActionInstanceEventMixin:
+    """Mixin for events that identify an action and one of its instances."""
     action: EventNameStr
     """Unique identifier of the action"""
     context: ActionInstanceUUIDStr
@@ -113,24 +113,26 @@ class StatefulActionPayloadMixin:
     """
 
 
-ContextualPayload: TypeAlias = (
+ActionInstancePayload: TypeAlias = (
     SettingsPayloadMixin | StatefulActionPayloadMixin | CoordinatesPayloadMixin
 )
 """Payload mixins that provide values copied into action-instance contexts."""
 
 
-ContextualPayloadT = TypeVar(
-    "ContextualPayloadT",
-    bound=ContextualPayload,
-    default=ContextualPayload,
+ActionInstancePayloadT = TypeVar(
+    "ActionInstancePayloadT",
+    bound=ActionInstancePayload,
+    default=ActionInstancePayload,
 )
 
 
-class ContextualPayloadEventMixin(ContextualEventMixin, Generic[ContextualPayloadT]):
-    """Mixin for contextual event models with payloads that update action-instance context."""
+class ActionInstancePayloadEventMixin(
+    ActionInstanceEventMixin, Generic[ActionInstancePayloadT]
+):
+    """Mixin for action-instance event models with payloads that update action-instance context."""
 
-    payload: ContextualPayloadT
-    """Payload data associated with the contextual event."""
+    payload: ActionInstancePayloadT
+    """Payload data associated with the action-instance event."""
 
 
 class SingleActionPayloadMixin:
diff --git a/streamdeck/models/events/dials.py b/streamdeck/models/events/dials.py
index 581747e..dc8a23d 100644
--- a/streamdeck/models/events/dials.py
+++ b/streamdeck/models/events/dials.py
@@ -4,8 +4,8 @@
 
 from streamdeck.models.events.base import EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     EncoderControllerType,
@@ -16,11 +16,11 @@
 
 
 class EncoderPayload(BasePayload[EncoderControllerType], CoordinatesPayloadMixin):
-    """Contextualized information for a DialDown or DialUp event."""
+    """Action-instance event data for a DialDown or DialUp event."""
 
 
 class DialRotatePayload(EncoderPayload):
-    """Contextualized information for a DialRotate event."""
+    """Action-instance event data for a DialRotate event."""
 
     pressed: bool
     """Determines whether the dial was pressed whilst the rotation occurred."""
@@ -31,22 +31,22 @@ class DialRotatePayload(EncoderPayload):
 ## Event models for DialDown, DialRotate, and DialUp events
 
 
-class DialDown(EventBase[Literal["dialDown"]], ContextualPayloadEventMixin[EncoderPayload], DeviceSpecificEventMixin):  # fmt: skip
+class DialDown(EventBase[Literal["dialDown"]], ActionInstancePayloadEventMixin[EncoderPayload], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user presses a dial (Stream Deck +)."""
 
     payload: EncoderPayload
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
 
 
-class DialRotate(EventBase[Literal["dialRotate"]], ContextualPayloadEventMixin[DialRotatePayload], DeviceSpecificEventMixin):  # fmt: skip
+class DialRotate(EventBase[Literal["dialRotate"]], ActionInstancePayloadEventMixin[DialRotatePayload], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user rotates a dial (Stream Deck +)."""
 
     payload: DialRotatePayload
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
 
 
-class DialUp(EventBase[Literal["dialUp"]], ContextualPayloadEventMixin[EncoderPayload], DeviceSpecificEventMixin):  # fmt: skip
+class DialUp(EventBase[Literal["dialUp"]], ActionInstancePayloadEventMixin[EncoderPayload], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user releases a pressed dial (Stream Deck +)."""
 
     payload: EncoderPayload
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
diff --git a/streamdeck/models/events/keys.py b/streamdeck/models/events/keys.py
index be3440a..e05ff9c 100644
--- a/streamdeck/models/events/keys.py
+++ b/streamdeck/models/events/keys.py
@@ -6,9 +6,9 @@
 
 from streamdeck.models.events.base import EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
     CardinalityDiscriminated,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     KeypadControllerType,
@@ -30,7 +30,7 @@ class SingleActionKeyGesturePayload(
     StatefulActionPayloadMixin,
     CoordinatesPayloadMixin,
 ):
-    """Contextualized information for a KeyDown or KeyUp event that is not part of a multi-action."""
+    """Action-instance event data for a KeyDown or KeyUp event that is not part of a multi-action."""
 
 
 class MultiActionKeyGesturePayload(
@@ -38,7 +38,7 @@ class MultiActionKeyGesturePayload(
     MultiActionPayloadMixin,
     StatefulActionPayloadMixin,
 ):
-    """Contextualized information for a KeyDown or KeyUp event that is part of a multi-action."""
+    """Action-instance event data for a KeyDown or KeyUp event that is part of a multi-action."""
 
     user_desired_state: Annotated[int, Field(alias="userDesiredState")]
     """Desired state as specified by the user.
@@ -50,15 +50,15 @@ class MultiActionKeyGesturePayload(
 ## Event models for KeyDown and KeyUp events
 
 
-class KeyDown(EventBase[Literal["keyDown"]], ContextualPayloadEventMixin[CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]], DeviceSpecificEventMixin):  # fmt: skip
+class KeyDown(EventBase[Literal["keyDown"]], ActionInstancePayloadEventMixin[CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user presses a action down."""
 
     payload: CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
 
 
-class KeyUp(EventBase[Literal["keyUp"]], ContextualPayloadEventMixin[CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]], DeviceSpecificEventMixin):  # fmt: skip
+class KeyUp(EventBase[Literal["keyUp"]], ActionInstancePayloadEventMixin[CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user releases a pressed action."""
 
     payload: CardinalityDiscriminated[SingleActionKeyGesturePayload, MultiActionKeyGesturePayload]
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
diff --git a/streamdeck/models/events/property_inspector.py b/streamdeck/models/events/property_inspector.py
index d879845..9d5d1cb 100644
--- a/streamdeck/models/events/property_inspector.py
+++ b/streamdeck/models/events/property_inspector.py
@@ -4,13 +4,13 @@
 
 from streamdeck.models.events.base import EventBase
 from streamdeck.models.events.common import (
-    ContextualEventMixin,
+    ActionInstanceEventMixin,
     DeviceSpecificEventMixin,
 )
 from streamdeck.types import PluginDefinedData  # noqa: TC001
 
 
-class DidReceivePropertyInspectorMessage(EventBase[Literal["sendToPlugin"]], ContextualEventMixin):
+class DidReceivePropertyInspectorMessage(EventBase[Literal["sendToPlugin"]], ActionInstanceEventMixin):
     """Occurs when a message was received from the UI."""
 
     payload: PluginDefinedData
@@ -19,7 +19,7 @@ class DidReceivePropertyInspectorMessage(EventBase[Literal["sendToPlugin"]], Con
 
 class PropertyInspectorDidAppear(
     EventBase[Literal["propertyInspectorDidAppear"]],
-    ContextualEventMixin,
+    ActionInstanceEventMixin,
     DeviceSpecificEventMixin,
 ):
     """Occurs when the property inspector associated with the action becomes visible.
@@ -28,7 +28,7 @@ class PropertyInspectorDidAppear(
     """
 
 
-class PropertyInspectorDidDisappear(EventBase[Literal["propertyInspectorDidDisappear"]], ContextualEventMixin, DeviceSpecificEventMixin):  # fmt: skip
+class PropertyInspectorDidDisappear(EventBase[Literal["propertyInspectorDidDisappear"]], ActionInstanceEventMixin, DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the property inspector associated with the action becomes invisible.
 
     I.e. the user unselected the action in the Stream Deck application.
diff --git a/streamdeck/models/events/settings.py b/streamdeck/models/events/settings.py
index 2f1ace9..da63d76 100644
--- a/streamdeck/models/events/settings.py
+++ b/streamdeck/models/events/settings.py
@@ -4,9 +4,9 @@
 
 from streamdeck.models.events.base import ConfiguredBaseModel, EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
     CardinalityDiscriminated,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     KeypadControllerType,
@@ -26,7 +26,7 @@ class SingleActionSettingsPayload(
     StatefulActionPayloadMixin,
     CoordinatesPayloadMixin,
 ):
-    """Contextualized information for a didReceiveSettings events that are not part of a multi-action."""
+    """Action-instance event data for a didReceiveSettings events that are not part of a multi-action."""
 
 
 class MultiActionSettingsPayload(
@@ -34,17 +34,17 @@ class MultiActionSettingsPayload(
     MultiActionPayloadMixin,
     StatefulActionPayloadMixin,
 ):
-    """Contextualized information for a didReceiveSettings events that are part of a multi-action.
+    """Action-instance event data for a didReceiveSettings events that are part of a multi-action.
 
     NOTE: Action instances that are part of a multi-action are only applicable to the 'Keypad' controller type.
     """
 
 
-class DidReceiveSettings(EventBase[Literal["didReceiveSettings"]], ContextualPayloadEventMixin[CardinalityDiscriminated[SingleActionSettingsPayload, MultiActionSettingsPayload]], DeviceSpecificEventMixin):  # fmt: skip
+class DidReceiveSettings(EventBase[Literal["didReceiveSettings"]], ActionInstancePayloadEventMixin[CardinalityDiscriminated[SingleActionSettingsPayload, MultiActionSettingsPayload]], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the settings associated with an action instance are requested, or when the the settings were updated by the property inspector."""
 
     payload: CardinalityDiscriminated[SingleActionSettingsPayload, MultiActionSettingsPayload]
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
 
 
 ## Models for didReceiveGlobalSettings event and its specific payload.
diff --git a/streamdeck/models/events/title_parameters.py b/streamdeck/models/events/title_parameters.py
index 4480c6c..500262c 100644
--- a/streamdeck/models/events/title_parameters.py
+++ b/streamdeck/models/events/title_parameters.py
@@ -6,8 +6,8 @@
 
 from streamdeck.models.events.base import ConfiguredBaseModel, EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     StatefulActionPayloadMixin,
@@ -42,7 +42,7 @@ class TitleParametersDidChangePayload(
     CoordinatesPayloadMixin,
     StatefulActionPayloadMixin,
 ):
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
 
     title: str
     """Title of the action, as specified by the user or dynamically by the plugin."""
@@ -50,7 +50,7 @@ class TitleParametersDidChangePayload(
     """Defines aesthetic properties that determine how the title should be rendered."""
 
 
-class TitleParametersDidChange(EventBase[Literal["titleParametersDidChange"]], ContextualPayloadEventMixin[TitleParametersDidChangePayload], DeviceSpecificEventMixin):  # fmt: skip
+class TitleParametersDidChange(EventBase[Literal["titleParametersDidChange"]], ActionInstancePayloadEventMixin[TitleParametersDidChangePayload], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user updates an action's title settings in the Stream Deck application."""
 
     payload: TitleParametersDidChangePayload
diff --git a/streamdeck/models/events/touch_tap.py b/streamdeck/models/events/touch_tap.py
index 82526d0..f7b7fb0 100644
--- a/streamdeck/models/events/touch_tap.py
+++ b/streamdeck/models/events/touch_tap.py
@@ -6,8 +6,8 @@
 
 from streamdeck.models.events.base import EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     EncoderControllerType,
@@ -15,7 +15,7 @@
 
 
 class TouchTapPayload(BasePayload[EncoderControllerType], CoordinatesPayloadMixin):
-    """Contextualized information for a TouchTap event."""
+    """Action-instance event data for a TouchTap event."""
 
     hold: bool
     """Determines whether the tap was considered 'held'."""
@@ -23,8 +23,8 @@ class TouchTapPayload(BasePayload[EncoderControllerType], CoordinatesPayloadMixi
     """Coordinates of where the touchscreen tap occurred, relative to the canvas of the action."""
 
 
-class TouchTap(EventBase[Literal["touchTap"]], ContextualPayloadEventMixin[TouchTapPayload], DeviceSpecificEventMixin):  # fmt: skip
+class TouchTap(EventBase[Literal["touchTap"]], ActionInstancePayloadEventMixin[TouchTapPayload], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when the user taps the touchscreen (Stream Deck +)."""
 
     payload: TouchTapPayload
-    """Contextualized information for this event."""
+    """Action-instance event data for this event."""
diff --git a/streamdeck/models/events/visibility.py b/streamdeck/models/events/visibility.py
index 8c107f6..2c59a4a 100644
--- a/streamdeck/models/events/visibility.py
+++ b/streamdeck/models/events/visibility.py
@@ -4,9 +4,9 @@
 
 from streamdeck.models.events.base import EventBase
 from streamdeck.models.events.common import (
+    ActionInstancePayloadEventMixin,
     BasePayload,
     CardinalityDiscriminated,
-    ContextualPayloadEventMixin,
     CoordinatesPayloadMixin,
     DeviceSpecificEventMixin,
     KeypadControllerType,
@@ -22,7 +22,7 @@ class SingleActionVisibilityPayload(
     StatefulActionPayloadMixin,
     CoordinatesPayloadMixin,
 ):
-    """Contextualized information for willAppear and willDisappear events that is not part of a multi-action."""
+    """Action-instance event data for willAppear and willDisappear events that is not part of a multi-action."""
 
 
 class MultiActionVisibilityPayload(
@@ -30,13 +30,13 @@ class MultiActionVisibilityPayload(
     MultiActionPayloadMixin,
     StatefulActionPayloadMixin,
 ):
-    """Contextualized information for willAppear and willDisappear events that is part of a multi-action."""
+    """Action-instance event data for willAppear and willDisappear events that is part of a multi-action."""
 
 
 ## Event models for WillAppear and WillDisappear events
 
 
-class WillAppear(EventBase[Literal["willAppear"]], ContextualPayloadEventMixin[CardinalityDiscriminated[SingleActionVisibilityPayload, MultiActionVisibilityPayload]], DeviceSpecificEventMixin):  # fmt: skip
+class WillAppear(EventBase[Literal["willAppear"]], ActionInstancePayloadEventMixin[CardinalityDiscriminated[SingleActionVisibilityPayload, MultiActionVisibilityPayload]], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when an action appears on the Stream Deck due to the user navigating to another page, profile, folder, etc.
 
     This also occurs during startup if the action is on the "front page".
@@ -46,7 +46,7 @@ class WillAppear(EventBase[Literal["willAppear"]], ContextualPayloadEventMixin[C
     payload: CardinalityDiscriminated[SingleActionVisibilityPayload, MultiActionVisibilityPayload]
 
 
-class WillDisappear(EventBase[Literal["willDisappear"]], ContextualPayloadEventMixin[CardinalityDiscriminated[SingleActionVisibilityPayload, MultiActionVisibilityPayload]], DeviceSpecificEventMixin):  # fmt: skip
+class WillDisappear(EventBase[Literal["willDisappear"]], ActionInstancePayloadEventMixin[CardinalityDiscriminated[SingleActionVisibilityPayload, MultiActionVisibilityPayload]], DeviceSpecificEventMixin):  # fmt: skip
     """Occurs when an action disappears from the Stream Deck due to the user navigating to another page, profile, folder, etc.
 
     An action refers to all types of actions, e.g. keys, dials, touchscreens, pedals, etc.
diff --git a/tests/event_handlers/test_action_event_handler_filtering.py b/tests/event_handlers/test_action_event_handler_filtering.py
index 17ebd2a..f1ed681 100644
--- a/tests/event_handlers/test_action_event_handler_filtering.py
+++ b/tests/event_handlers/test_action_event_handler_filtering.py
@@ -6,7 +6,7 @@
 import pytest
 from streamdeck.event_handlers.actions import Action, GlobalAction
 from streamdeck.event_handlers.registry import HandlersRegistry
-from streamdeck.models.events.common import ContextualEventMixin
+from streamdeck.models.events.common import ActionInstanceEventMixin
 
 from tests.test_utils.fake_event_factories import (
     ApplicationDidLaunchEventFactory,
@@ -69,7 +69,7 @@ def test_action_gets_triggered_by_event(
     Actions should only be triggered by events that have the same unique identifier properties as the action.
     """
     # Extract the action UUID from the fake event data, or use a default value
-    action_uuid: str = fake_event_data.action if isinstance(fake_event_data, ContextualEventMixin) else "my-fake-action-uuid"
+    action_uuid: str = fake_event_data.action if isinstance(fake_event_data, ActionInstanceEventMixin) else "my-fake-action-uuid"
 
     action = Action(uuid=action_uuid)
 
@@ -92,7 +92,7 @@ def test_global_handlers_registry_get_event_handlers_filtering(
     fake_event_data: events.EventBase,
 ) -> None:
     # Extract the action UUID from the fake event data, or use a default value
-    action_uuid: str | None = fake_event_data.action if isinstance(fake_event_data, ContextualEventMixin) else None
+    action_uuid: str | None = fake_event_data.action if isinstance(fake_event_data, ActionInstanceEventMixin) else None
 
     registry = HandlersRegistry()
     # Create an Action instance, without an action UUID as global actions aren't associated with a specific action
@@ -119,7 +119,7 @@ def test_handlers_registry_get_event_handlers_filtering(
     fake_event_data: events.EventBase,
 ) -> None:
     # Extract the action UUID from the fake event data, or use a default value
-    action_uuid: str | None = fake_event_data.action if isinstance(fake_event_data, ContextualEventMixin) else None
+    action_uuid: str | None = fake_event_data.action if isinstance(fake_event_data, ActionInstanceEventMixin) else None
 
     registry = HandlersRegistry()
     # Create an Action instance, using either the fake event's action UUID or a default value