diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 8b0a0c89..9c1983ff 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -38,9 +38,9 @@
 use OCP\IUserSession;
 use OCP\Profiler\IProfiler;
 use OCP\SabrePluginEvent;
-use OCP\Settings\GetDeclarativeSettingsValueEvent;
-use OCP\Settings\RegisterDeclarativeSettingsFormEvent;
-use OCP\Settings\SetDeclarativeSettingsValueEvent;
+use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
+use OCP\Settings\Events\DeclarativeSettingsRegisterFormEvent;
+use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
 use OCP\User\Events\UserDeletedEvent;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -70,9 +70,9 @@ public function register(IRegistrationContext $context): void {
 		$context->registerNotifierService(ExAppNotifier::class);
 		$context->registerNotifierService(ExAppAdminNotifier::class);
 
-		$context->registerEventListener(RegisterDeclarativeSettingsFormEvent::class, RegisterDeclarativeSettingsListener::class);
-		$context->registerEventListener(GetDeclarativeSettingsValueEvent::class, GetValueListener::class);
-		$context->registerEventListener(SetDeclarativeSettingsValueEvent::class, SetValueListener::class);
+		$context->registerEventListener(DeclarativeSettingsRegisterFormEvent::class, RegisterDeclarativeSettingsListener::class);
+		$context->registerEventListener(DeclarativeSettingsGetValueEvent::class, GetValueListener::class);
+		$context->registerEventListener(DeclarativeSettingsSetValueEvent::class, SetValueListener::class);
 
 		$container = $this->getContainer();
 		try {
diff --git a/lib/Listener/DeclarativeSettings/GetValueListener.php b/lib/Listener/DeclarativeSettings/GetValueListener.php
index 0a92b441..94ca0a98 100644
--- a/lib/Listener/DeclarativeSettings/GetValueListener.php
+++ b/lib/Listener/DeclarativeSettings/GetValueListener.php
@@ -10,7 +10,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Settings\DeclarativeSettingsTypes;
-use OCP\Settings\GetDeclarativeSettingsValueEvent;
+use OCP\Settings\Events\DeclarativeSettingsGetValueEvent;
 
 /**
  * @template-implements IEventListener<Event>
@@ -24,7 +24,7 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
-		if (!$event instanceof GetDeclarativeSettingsValueEvent) {
+		if (!$event instanceof DeclarativeSettingsGetValueEvent) {
 			return;
 		}
 
diff --git a/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php b/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php
index 22d39394..d788be9c 100644
--- a/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php
+++ b/lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php
@@ -7,7 +7,7 @@
 use OCA\AppAPI\Service\UI\SettingsService;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\Settings\RegisterDeclarativeSettingsFormEvent;
+use OCP\Settings\Events\DeclarativeSettingsRegisterFormEvent;
 
 /**
  * @template-implements IEventListener<Event>
@@ -19,7 +19,7 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
-		if (!$event instanceof RegisterDeclarativeSettingsFormEvent) {
+		if (!$event instanceof DeclarativeSettingsRegisterFormEvent) {
 			return;
 		}
 
diff --git a/lib/Listener/DeclarativeSettings/SetValueListener.php b/lib/Listener/DeclarativeSettings/SetValueListener.php
index b816a088..fe509fd4 100644
--- a/lib/Listener/DeclarativeSettings/SetValueListener.php
+++ b/lib/Listener/DeclarativeSettings/SetValueListener.php
@@ -10,7 +10,7 @@
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Settings\DeclarativeSettingsTypes;
-use OCP\Settings\SetDeclarativeSettingsValueEvent;
+use OCP\Settings\Events\DeclarativeSettingsSetValueEvent;
 
 /**
  * @template-implements IEventListener<Event>
@@ -24,7 +24,7 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
-		if (!$event instanceof SetDeclarativeSettingsValueEvent) {
+		if (!$event instanceof DeclarativeSettingsSetValueEvent) {
 			return;
 		}
 
diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
index 15c9a36f..f41b7881 100644
--- a/tests/psalm-baseline.xml
+++ b/tests/psalm-baseline.xml
@@ -51,6 +51,21 @@
       <code>VersionParser</code>
     </UndefinedClass>
   </file>
+  <file src="lib/Listener/DeclarativeSettings/GetValueListener.php">
+    <UndefinedClass>
+      <code>DeclarativeSettingsGetValueEvent</code>
+    </UndefinedClass>
+  </file>
+  <file src="lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php">
+    <UndefinedClass>
+      <code>DeclarativeSettingsRegisterFormEvent</code>
+    </UndefinedClass>
+  </file>
+  <file src="lib/Listener/DeclarativeSettings/SetValueListener.php">
+    <UndefinedClass>
+      <code>DeclarativeSettingsSetValueEvent</code>
+    </UndefinedClass>
+  </file>
   <file src="lib/Listener/LoadFilesPluginListener.php">
     <ImplementedParamTypeMismatch>
       <code>$event</code>
@@ -91,19 +106,4 @@
       <code>Request</code>
     </UndefinedClass>
   </file>
-  <file src="lib/Listener/DeclarativeSettings/GetValueListener.php">
-    <UndefinedClass>
-      <code>GetDeclarativeSettingsValueEvent</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Listener/DeclarativeSettings/RegisterDeclarativeSettingsListener.php">
-    <UndefinedClass>
-      <code>RegisterDeclarativeSettingsFormEvent</code>
-    </UndefinedClass>
-  </file>
-  <file src="lib/Listener/DeclarativeSettings/SetValueListener.php">
-    <UndefinedClass>
-      <code>SetDeclarativeSettingsValueEvent</code>
-    </UndefinedClass>
-  </file>
 </files>