diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceManager.java
index 6bf1306002..7cf962948a 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultNamespaceManager.java
@@ -24,9 +24,9 @@
 
 package sonia.scm.repository;
 
-import com.github.legman.EventBus;
 import com.github.legman.Subscribe;
 import sonia.scm.HandlerEventType;
+import sonia.scm.event.ScmEventBus;
 
 import javax.inject.Inject;
 import java.util.Collection;
@@ -40,10 +40,10 @@ public class DefaultNamespaceManager implements NamespaceManager {
 
   private final RepositoryManager repositoryManager;
   private final NamespaceDao dao;
-  private final EventBus eventBus;
+  private final ScmEventBus eventBus;
 
   @Inject
-  public DefaultNamespaceManager(RepositoryManager repositoryManager, NamespaceDao dao, EventBus eventBus) {
+  public DefaultNamespaceManager(RepositoryManager repositoryManager, NamespaceDao dao, ScmEventBus eventBus) {
     this.repositoryManager = repositoryManager;
     this.dao = dao;
     this.eventBus = eventBus;
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceManagerTest.java
index 6bc6381278..80e0e26c8a 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultNamespaceManagerTest.java
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import sonia.scm.HandlerEventType;
+import sonia.scm.event.ScmEventBus;
 import sonia.scm.store.InMemoryDataStore;
 import sonia.scm.store.InMemoryDataStoreFactory;
 
@@ -52,7 +53,7 @@ class DefaultNamespaceManagerTest {
   @Mock
   RepositoryManager repositoryManager;
   @Mock
-  EventBus eventBus;
+  ScmEventBus eventBus;
 
   Namespace life;