diff --git a/java/src/pm/Application.java b/java/src/pm/Application.java
index e07594b..62ba052 100644
--- a/java/src/pm/Application.java
+++ b/java/src/pm/Application.java
@@ -22,10 +22,12 @@ public abstract class Application extends EventHandler implements Activatable {
 
     public void activate() {
         start();
+        active = true;
     }
 
     public void deactivate() {
         stop();
+        active = false;
     }
 
     public void exit() {
diff --git a/java/src/pm/Client.java b/java/src/pm/Client.java
index 0bf2eab..f86bf87 100644
--- a/java/src/pm/Client.java
+++ b/java/src/pm/Client.java
@@ -1,6 +1,6 @@
 package pm;
 
-import pm.event.spreader.NetworkSpreader;
+import pm.event.router.GlobalRouter;
 import pm.exception.event.spreader.NetworkSpreaderException;
 
 public class Client extends Manager {
@@ -10,7 +10,7 @@ public class Client extends Manager {
     public static final int PORT = 6789;
 
     public Client(String ip, int port) throws NetworkSpreaderException {
-        super(new NetworkSpreader(ip, port));
+        super(new GlobalRouter(ip, port));
     }
 
     public Client() throws NetworkSpreaderException {
diff --git a/java/src/pm/Device.java b/java/src/pm/Device.java
index ace9ba4..4187a23 100644
--- a/java/src/pm/Device.java
+++ b/java/src/pm/Device.java
@@ -18,7 +18,7 @@ public abstract class Device extends EventHandler implements Activatable {
     protected SequenceListener sequenceListener;
 
     static {
-        SequenceListener.initialise(eventSpreader);
+        SequenceListener.initialise(eventRouter);
     }
 
     public Device(String title) {
@@ -89,10 +89,12 @@ public abstract class Device extends EventHandler implements Activatable {
     
     public void activate() {
         start();
+        active = true;
     }
 
     public void deactivate() {
         stop();
+        active = false;
     }
 
     public void exit() {
diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index a646ada..90ea837 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -10,7 +10,7 @@ import pm.application.cmd.windows.wmp.WMPApplication;
 import pm.application.itunes.iTunesApplication;
 import pm.application.mpc.MPCApplication;
 import pm.application.vlc.VLCApplication;
-import pm.event.spreader.LocalSpreader;
+import pm.event.router.LocalRouter;
 import pm.util.ArrayCycle;
 import pm.value.Action;
 
@@ -20,18 +20,18 @@ public class Main extends Manager {
     protected ApplicationSelector applicationSelector;
 
     public Main() {
-        super(new LocalSpreader());
+        super(new LocalRouter());
     }
 
     protected void action(Action action) {
         log.debug(String.format("action(%s)", action));
         switch (action) {
             case NEXT:
-                eventSpreader.set(applicationCycle.next());
+                eventRouter.set(applicationCycle.next());
                 System.out.println(applicationCycle.current());
                 break;
             case PREVIOUS:
-                eventSpreader.set(applicationCycle.previous());
+                eventRouter.set(applicationCycle.previous());
                 System.out.println(applicationCycle.current());
                 break;
             case EXIT:
@@ -51,7 +51,7 @@ public class Main extends Manager {
             new WinampApplication()};        
         applicationSelector = new ApplicationSelector(applicationArray);
         applicationCycle = new ArrayCycle<Application>(applicationArray);
-        eventSpreader.set(applicationCycle.current());
+        eventRouter.set(applicationCycle.current());
         super.start(false);
     }
 
diff --git a/java/src/pm/Manager.java b/java/src/pm/Manager.java
index ed799d6..4c4940f 100644
--- a/java/src/pm/Manager.java
+++ b/java/src/pm/Manager.java
@@ -14,7 +14,7 @@ import pm.device.panel.PanelDevice;
 import pm.device.player.PlayerDevice;
 import pm.device.wiimote.WiimoteDevice;
 import pm.event.EventHandler;
-import pm.event.EventSpreader;
+import pm.event.EventRouter;
 
 public abstract class Manager extends EventHandler {
     protected Log log = LogFactory.getLog(getClass());
@@ -22,9 +22,9 @@ public abstract class Manager extends EventHandler {
 
     protected ArrayList<Device> deviceList;
 
-    public Manager(EventSpreader eventSpreader) {
-        EventHandler.initialise(eventSpreader);
-        eventSpreader.start();
+    public Manager(EventRouter eventRouter) {
+        EventHandler.initialise(eventRouter);
+        eventRouter.start();
     }
 
     public void start() {
diff --git a/java/src/pm/application/itunes/iTunesApplication.java b/java/src/pm/application/itunes/iTunesApplication.java
index 69c4404..460c8de 100644
--- a/java/src/pm/application/itunes/iTunesApplication.java
+++ b/java/src/pm/application/itunes/iTunesApplication.java
@@ -92,13 +92,13 @@ public class iTunesApplication extends Application implements iTunesEventsInterf
     public void onPlayerPlayEvent(ITTrack iTrack) {
         if (active) {
             System.out.println("iTunes play");
-            eventSpreader.add(new Feedback());
+            eventRouter.add(new Feedback());
         }
     }
     public void onPlayerStopEvent(ITTrack iTrack) {
         if (active) {
             System.out.println("iTunes stop");
-            eventSpreader.add(new Feedback());
+            eventRouter.add(new Feedback());
         }
     }
     public void onPlayerPlayingTrackChangedEvent(ITTrack iTrack) {}
diff --git a/java/src/pm/device/network/NetworkDevice.java b/java/src/pm/device/network/NetworkDevice.java
index fe20239..6aefdb3 100644
--- a/java/src/pm/device/network/NetworkDevice.java
+++ b/java/src/pm/device/network/NetworkDevice.java
@@ -100,7 +100,7 @@ public class NetworkDevice extends Device {
                     object = objectInputStream.readObject();
                     if (object instanceof Event) {
                         log.debug("event binnen!");
-                        eventSpreader.add((Event) object);
+                        eventRouter.add((Event) object);
                     }
                     log.debug("iets te lezen!");                    
                 } while (object != null);
diff --git a/java/src/pm/event/EventHandler.java b/java/src/pm/event/EventHandler.java
index 920365c..280f762 100644
--- a/java/src/pm/event/EventHandler.java
+++ b/java/src/pm/event/EventHandler.java
@@ -5,14 +5,14 @@ import pm.event.task.Continuous;
 import pm.value.Action;
 
 public abstract class EventHandler extends EventListener {
-    protected static EventSpreader eventSpreader;
+    protected static EventRouter eventRouter;
 
-    public static void initialise(EventSpreader eventSpreader) {
-        EventHandler.eventSpreader = eventSpreader;
+    public static void initialise(EventRouter eventRouter) {
+        EventHandler.eventRouter = eventRouter;
     }
 
     protected void initialise() {
-        eventSpreader.add(this);
+        eventRouter.add(this);
     }
 
     public void event(Event event) {
diff --git a/java/src/pm/event/EventListener.java b/java/src/pm/event/EventListener.java
index db88f85..abcee97 100644
--- a/java/src/pm/event/EventListener.java
+++ b/java/src/pm/event/EventListener.java
@@ -15,10 +15,6 @@ public abstract class EventListener extends Worker {
     }
 
     public void add(Event event) {
-        System.out.println("Eventlistener krijgt event via add()");
-        System.out.println(this);
-        System.out.println(event);
-        System.out.println(">>>");
         eventQueue.add(event);
         synchronized (available) {
             available.notifyAll();
diff --git a/java/src/pm/event/EventSpreader.java b/java/src/pm/event/EventRouter.java
similarity index 82%
rename from java/src/pm/event/EventSpreader.java
rename to java/src/pm/event/EventRouter.java
index f9a2ecc..05344de 100644
--- a/java/src/pm/event/EventSpreader.java
+++ b/java/src/pm/event/EventRouter.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 
 import pm.Application;
 
-public abstract class EventSpreader extends EventListener {
+public abstract class EventRouter extends EventListener {
     protected ArrayList<EventListener> eventListenerList;
     protected Application application;
 
@@ -12,7 +12,7 @@ public abstract class EventSpreader extends EventListener {
         this.application = application;
     }
 
-    public EventSpreader() {
+    public EventRouter() {
         eventListenerList = new ArrayList<EventListener>();
     }
 
diff --git a/java/src/pm/event/spreader/NetworkSpreader.java b/java/src/pm/event/router/GlobalRouter.java
similarity index 87%
rename from java/src/pm/event/spreader/NetworkSpreader.java
rename to java/src/pm/event/router/GlobalRouter.java
index ba44453..d5266db 100644
--- a/java/src/pm/event/spreader/NetworkSpreader.java
+++ b/java/src/pm/event/router/GlobalRouter.java
@@ -1,4 +1,4 @@
-package pm.event.spreader;
+package pm.event.router;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -7,16 +7,16 @@ import java.net.Socket;
 import java.net.UnknownHostException;
 import pm.Event;
 import pm.Worker;
-import pm.event.EventSpreader;
+import pm.event.EventRouter;
 import pm.event.Feedback;
 import pm.exception.event.spreader.NetworkSpreaderException;
 
-public class NetworkSpreader extends EventSpreader {
+public class GlobalRouter extends EventRouter {
     protected Socket socket;
     protected ObjectOutputStream objectOutputStream;
     protected ObjectInputStream objectInputStream;
 
-    public NetworkSpreader(String ip, int port) throws NetworkSpreaderException {
+    public GlobalRouter(String ip, int port) throws NetworkSpreaderException {
         try {
             socket = new Socket(ip, port);
             objectOutputStream = new ObjectOutputStream(socket.getOutputStream());
diff --git a/java/src/pm/event/spreader/LocalSpreader.java b/java/src/pm/event/router/LocalRouter.java
similarity index 83%
rename from java/src/pm/event/spreader/LocalSpreader.java
rename to java/src/pm/event/router/LocalRouter.java
index 8877a8e..7d8b0a5 100644
--- a/java/src/pm/event/spreader/LocalSpreader.java
+++ b/java/src/pm/event/router/LocalRouter.java
@@ -1,11 +1,11 @@
-package pm.event.spreader;
+package pm.event.router;
 
 import pm.Event;
 import pm.event.EventListener;
-import pm.event.EventSpreader;
+import pm.event.EventRouter;
 import pm.value.Target;
 
-public class LocalSpreader extends EventSpreader {
+public class LocalRouter extends EventRouter {
     public void event(Event event) {
         System.out.println("LocalSpreader krijgt event via evet()");
         System.out.println(application);