diff --git a/java/src/mimis/Device.java b/java/src/mimis/Device.java
index 0f0fdd0..0395ed2 100644
--- a/java/src/mimis/Device.java
+++ b/java/src/mimis/Device.java
@@ -1,19 +1,17 @@
 package mimis;
 
-import mimis.device.EventMapCycle;
 import mimis.event.EventHandler;
 import mimis.exception.worker.ActivateException;
 import mimis.exception.worker.DeactivateException;
 import mimis.manager.Exitable;
 import mimis.manager.Titled;
 import mimis.sequence.EventMap;
-import mimis.sequence.EventParser;
+import mimis.sequence.SequenceParser;
 import mimis.sequence.State;
 
 public abstract class Device extends EventHandler implements Titled, Exitable {
     protected String title;
-    protected EventMapCycle eventMapCycle;
-    protected EventParser eventParser;
+    protected SequenceParser sequenceParser;
 
     public Device(String title) {
         this.title = title;
@@ -26,12 +24,12 @@ public abstract class Device extends EventHandler implements Titled, Exitable {
     /* Worker */
     public void activate() throws ActivateException {
         super.activate();
-        eventParser = new EventParser(this);
+        sequenceParser = new SequenceParser(this);
     }
 
     public void deactivate() throws DeactivateException {
         super.deactivate();
-        eventParser.reset();
+        sequenceParser.reset();
     }
 
     public void stop() {
@@ -45,20 +43,20 @@ public abstract class Device extends EventHandler implements Titled, Exitable {
         super.stop();
     }
 
-    /* EventParser */
+    /* SequenceParser */
     protected void add(EventMap eventMap) {
-        eventParser.add(eventMap);
+        sequenceParser.add(eventMap);
     }
 
     protected void remove(EventMap eventMap) {
-        eventParser.remove(eventMap);
+        sequenceParser.remove(eventMap);
     }
 
     protected void reset() {
-        eventParser.reset();
+        sequenceParser.reset();
     }
     
     protected void add(State state) {
-        eventParser.add(state);
+        sequenceParser.add(state);
     }
 }
diff --git a/java/src/mimis/Mimis.java b/java/src/mimis/Mimis.java
index 6626b6b..e0c88cc 100644
--- a/java/src/mimis/Mimis.java
+++ b/java/src/mimis/Mimis.java
@@ -5,7 +5,7 @@ import mimis.event.EventRouter;
 import mimis.event.Feedback;
 import mimis.exception.worker.ActivateException;
 import mimis.feedback.TextFeedback;
-import mimis.sequence.EventParser;
+import mimis.sequence.SequenceParser;
 import mimis.util.ArrayCycle;
 import mimis.value.Action;
 
@@ -40,9 +40,9 @@ public class Mimis extends EventHandler {
         this.deviceArray = deviceArray;
         applicationCycle = new ArrayCycle<Application>(applicationArray);
 
-        log.debug("Initialise EventHandler and EventParser");
+        log.debug("Initialise EventHandler and SequenceParser");
         EventHandler.initialise(eventRouter);
-        EventParser.initialise(eventRouter);
+        SequenceParser.initialise(eventRouter);
 
         log.debug("Add EventListeners to EventRouter");
         eventRouter.add(this);
diff --git a/java/src/mimis/sequence/EventParser.java b/java/src/mimis/sequence/SequenceParser.java
similarity index 91%
rename from java/src/mimis/sequence/EventParser.java
rename to java/src/mimis/sequence/SequenceParser.java
index 22896db..1e65809 100644
--- a/java/src/mimis/sequence/EventParser.java
+++ b/java/src/mimis/sequence/SequenceParser.java
@@ -13,7 +13,7 @@ import mimis.event.Task;
 import mimis.value.Signal;
 import mimis.value.Target;
 
-public class EventParser {
+public class SequenceParser {
     protected Log log = LogFactory.getLog(getClass());
 
     protected EventHandler self;
@@ -23,7 +23,7 @@ public class EventParser {
 
     protected static EventListener eventListener;
 
-    public EventParser(EventHandler self) {
+    public SequenceParser(EventHandler self) {
         this.self = self;
         eventMap = new EventMap();
         sequenceList = new ArrayList<Sequence>();
@@ -31,7 +31,7 @@ public class EventParser {
     }
 
     public static void initialise(EventListener eventListener) {
-        EventParser.eventListener = eventListener;
+        SequenceParser.eventListener = eventListener;
     }
 
     public synchronized void add(EventMap eventMap) {