diff --git a/layout_builder_ids.info.yml b/layout_builder_ids.info.yml
index da7479af35c43f45176d3a72c9b19b5a6003cec2..4517853f203b26fc3213e47ea7269bbc2a7519ae 100644
--- a/layout_builder_ids.info.yml
+++ b/layout_builder_ids.info.yml
@@ -4,4 +4,4 @@ type: module
 core_version_requirement: ^8.8 || ^9
 dependencies:
   - drupal:layout_builder
-  - hook_event_dispatcher
+  - hook_event_dispatcher:core_event_dispatcher
diff --git a/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php b/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
index 1c501645cd12f91f674f151b28bb26ce19451f18..b24e382f991418aaa192ea09307a844b6eeb8fee 100644
--- a/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
+++ b/src/EventSubscriber/LayoutBuilderIdsConfigureBlock.php
@@ -3,7 +3,9 @@
 namespace Drupal\layout_builder_ids\EventSubscriber;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormBaseAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent;
 use Drupal\hook_event_dispatcher\HookEventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Drupal\Component\Utility\Html;
@@ -16,10 +18,10 @@ class LayoutBuilderIdsConfigureBlock implements EventSubscriberInterface {
   /**
    * Alter form.
    *
-   * @param \Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent $event
+   * @param \Drupal\core_event_dispatcher\Event\Form\FormAlterEvent $event
    *   The event.
    */
-  public function alterForm(FormAlterEvent $event) {
+  public function alterForm(FormAlterEvent $event): void {
 
     // Get the form from the event.
     $form = &$event->getForm();
@@ -67,7 +69,8 @@ class LayoutBuilderIdsConfigureBlock implements EventSubscriberInterface {
   /**
    * {@inheritdoc}
    */
-  public static function getSubscribedEvents() {
+  public static function getSubscribedEvents(): array {
+
     return [
       HookEventDispatcherInterface::FORM_ALTER => 'alterForm',
     ];
diff --git a/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php b/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
index 41a9cedfc3a694dc46bd25fa3324673fa4f2040e..cf2cdec45f4ba6d35eacf370f5fdcab805317845 100644
--- a/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
+++ b/src/EventSubscriber/LayoutBuilderIdsConfigureSection.php
@@ -3,10 +3,11 @@
 namespace Drupal\layout_builder_ids\EventSubscriber;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormBaseAlterEvent;
+use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent;
 use Drupal\hook_event_dispatcher\HookEventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Routing\RouteCollection;
 use Drupal\Component\Utility\Html;
 
 
@@ -18,10 +19,10 @@ class LayoutBuilderIdsConfigureSection implements EventSubscriberInterface {
   /**
    * Alter form.
    *
-   * @param \Drupal\hook_event_dispatcher\Event\Form\FormAlterEvent $event
+   * @param \Drupal\core_event_dispatcher\Event\Form\FormAlterEvent $event
    *   The event.
    */
-  public function alterForm(FormAlterEvent $event) {
+  public function alterForm(FormAlterEvent $event): void {
 
     // Get the form from the event.
     $form = &$event->getForm();