diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java b/webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java
index 4ba72515..41c6f6a3 100644
--- a/webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java
+++ b/webtester-core/src/main/java/info/novatec/testit/webtester/browser/WebDriverBrowser.java
@@ -17,7 +17,7 @@
 import info.novatec.testit.webtester.config.Configuration;
 import info.novatec.testit.webtester.config.builders.DefaultConfigurationBuilder;
 import info.novatec.testit.webtester.events.EventSystem;
-import info.novatec.testit.webtester.events.EventSystemImpl;
+import info.novatec.testit.webtester.events.DispatchingEventSystem;
 import info.novatec.testit.webtester.events.browser.ClosedBrowserEvent;
 import info.novatec.testit.webtester.internal.PageFactory;
 import info.novatec.testit.webtester.pages.Page;
@@ -74,7 +74,7 @@ private WebDriverBrowser(Configuration configuration, WebDriver webDriver) {
         this.pageSource = new PageSourceSaver(this);
         this.javaScript = new JavaScriptExecutor(this);
         this.focus = new FocusSetter(this);
-        this.eventSystem = new EventSystemImpl(this);
+        this.eventSystem = new DispatchingEventSystem(this);
 
         this.adHocFinder = new AdHocFinder(this);
         this.pageFactory = new PageFactory(this);
diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventSystemImpl.java b/webtester-core/src/main/java/info/novatec/testit/webtester/events/DispatchingEventSystem.java
similarity index 88%
rename from webtester-core/src/main/java/info/novatec/testit/webtester/events/EventSystemImpl.java
rename to webtester-core/src/main/java/info/novatec/testit/webtester/events/DispatchingEventSystem.java
index 4bd4f2e0..63ecef72 100644
--- a/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventSystemImpl.java
+++ b/webtester-core/src/main/java/info/novatec/testit/webtester/events/DispatchingEventSystem.java
@@ -3,22 +3,19 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import info.novatec.testit.webtester.browser.Browser;
 
 
 @Slf4j
-public class EventSystemImpl implements EventSystem {
+@AllArgsConstructor
+public class DispatchingEventSystem implements EventSystem {
 
-    private final List<EventListener> listeners;
+    private final List<EventListener> listeners = new LinkedList<>();
     private final Browser browser;
 
-    public EventSystemImpl(Browser browser) {
-        this.listeners = new LinkedList<>();
-        this.browser = browser;
-    }
-
     @Override
     public void register(EventListener listener) {
         listeners.add(listener);
diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/events/Event.java b/webtester-core/src/main/java/info/novatec/testit/webtester/events/Event.java
index d4d826e2..26a71729 100644
--- a/webtester-core/src/main/java/info/novatec/testit/webtester/events/Event.java
+++ b/webtester-core/src/main/java/info/novatec/testit/webtester/events/Event.java
@@ -11,7 +11,7 @@
  * I.e. this could be the text before and after for a text set event.
  *
  * @see EventListener
- * @see EventSystemImpl
+ * @see DispatchingEventSystem
  * @since 2.0
  */
 public interface Event {
diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventListener.java b/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventListener.java
index deab75fb..6ac32209 100644
--- a/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventListener.java
+++ b/webtester-core/src/main/java/info/novatec/testit/webtester/events/EventListener.java
@@ -1,23 +1,23 @@
 package info.novatec.testit.webtester.events;
 
 /**
- * Defines a listener that can be registered at the {@link EventSystemImpl event system}.
+ * Defines a listener that can be registered at the {@link DispatchingEventSystem event system}.
  * <p>
  * If an {@link Event event} is reported by the system the {@link #eventOccurred(Event)} method of all registered
  * listeners is invoked.
  *
  * @see Event
- * @see EventSystemImpl
+ * @see DispatchingEventSystem
  * @since 2.0
  */
 public interface EventListener {
 
     /**
-     * This method will be called if any {@link Event event} is reported by the {@link EventSystemImpl event system}.
+     * This method will be called if any {@link Event event} is reported by the {@link DispatchingEventSystem event system}.
      *
      * @param event the {@link Event event} that occurred.
      * @see Event
-     * @see EventSystemImpl
+     * @see DispatchingEventSystem
      * @since 2.0
      */
     void eventOccurred(Event event);
diff --git a/webtester-core/src/test/java/info/novatec/testit/webtester/events/EventSystemImplTest.java b/webtester-core/src/test/java/info/novatec/testit/webtester/events/DispatchingEventSystemTest.java
similarity index 98%
rename from webtester-core/src/test/java/info/novatec/testit/webtester/events/EventSystemImplTest.java
rename to webtester-core/src/test/java/info/novatec/testit/webtester/events/DispatchingEventSystemTest.java
index 7b8a4c9c..940cb082 100644
--- a/webtester-core/src/test/java/info/novatec/testit/webtester/events/EventSystemImplTest.java
+++ b/webtester-core/src/test/java/info/novatec/testit/webtester/events/DispatchingEventSystemTest.java
@@ -25,7 +25,7 @@
 
 
 @RunWith(MockitoJUnitRunner.class)
-public class EventSystemImplTest {
+public class DispatchingEventSystemTest {
 
     @Mock
     EventListener listener1;
@@ -41,7 +41,7 @@ public class EventSystemImplTest {
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     Browser browser;
     @InjectMocks
-    EventSystemImpl cut;
+    DispatchingEventSystem cut;
 
     @Before
     public void eventSystemIsEnabledByDefault() {