diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 8e7a710dec..8b72a9f0fd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -24798,12 +24798,6 @@ parameters:
 			count: 1
 			path: tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php
 
-		-
-			message: '#^Property Ibexa\\Tests\\Bundle\\IO\\DependencyInjection\\ConfigurationFactory\\BaseFlysystemTestCase\:\:\$filesystemServiceId has no type specified\.$#'
-			identifier: missingType.property
-			count: 1
-			path: tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php
-
 		-
 			message: '#^Property Ibexa\\Tests\\Bundle\\IO\\DependencyInjection\\ConfigurationFactory\\BaseFlysystemTestCase\:\:\$flysystemAdapterServiceId has no type specified\.$#'
 			identifier: missingType.property
diff --git a/src/bundle/IO/DependencyInjection/ConfigurationFactory/Flysystem.php b/src/bundle/IO/DependencyInjection/ConfigurationFactory/Flysystem.php
index 99b5bc208c..ecf4d39901 100644
--- a/src/bundle/IO/DependencyInjection/ConfigurationFactory/Flysystem.php
+++ b/src/bundle/IO/DependencyInjection/ConfigurationFactory/Flysystem.php
@@ -65,7 +65,7 @@ private function createFilesystem(ContainerBuilder $container, $name, $adapter):
             throw new InvalidConfigurationException("Unknown flysystem adapter $adapter");
         }
 
-        $filesystemId = sprintf('ezpublish.core.io.flysystem.%s_filesystem', $name);
+        $filesystemId = sprintf('ibexa.core.io.flysystem.%s_filesystem', $name);
         $filesystemServiceDefinition = new ChildDefinition('ibexa.core.io.flysystem.base_filesystem');
         $definition = $container->setDefinition(
             $filesystemId,
diff --git a/tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php b/tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php
index d60cc45603..f574fd6429 100644
--- a/tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php
+++ b/tests/bundle/IO/DependencyInjection/ConfigurationFactory/BaseFlysystemTestCase.php
@@ -15,7 +15,7 @@ abstract class BaseFlysystemTestCase extends ConfigurationFactoryTestCase
 {
     private $flysystemAdapterServiceId = 'oneup_flysystem.test_adapter';
 
-    private $filesystemServiceId = 'ezpublish.core.io.flysystem.my_test_handler_filesystem';
+    private string $filesystemServiceId = 'ibexa.core.io.flysystem.my_test_handler_filesystem';
 
     public function provideHandlerConfiguration()
     {