Index: trunk/src/scriptbuilder/structures/MyScriptHandler.java
===================================================================
--- trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 7)
@@ -195,5 +195,5 @@
      * Event object.
      */
-    private TreeMap<ELEMENT, ScriptEventInterface> eventMap;
+    private TreeMap<ELEMENT, I_ScriptEvent> eventMap;
 
     /**
@@ -335,5 +335,5 @@
      * The most recent element which contains dialog or other sub-elements.
      */
-    private ScriptEventInterface trackedEvent = null;
+    private I_ScriptEvent trackedEvent = null;
 
     /**
@@ -369,5 +369,5 @@
         script = s;
         incidentMap = new TreeMap<Integer, ScriptIncident>();
-        eventMap = new TreeMap<ELEMENT, ScriptEventInterface>();
+        eventMap = new TreeMap<ELEMENT, I_ScriptEvent>();
         pcData = new TreeMap<ELEMENT, String>();
         docPosition = new Stack<ELEMENT>();
@@ -727,5 +727,5 @@
 
         currentElement = docPosition.pop();
-        ScriptEventInterface newEvent = null;
+        I_ScriptEvent newEvent = null;
         try
         {
@@ -804,7 +804,7 @@
             else if (currentElement == ELEMENT.EXPECTED_ACTION)
             {
-                if (trackedEvent instanceof EvaluationEventInterface)
-                {
-                    ((EvaluationEventInterface) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION));
+                if (trackedEvent instanceof I_EvaluationEvent)
+                {
+                    ((I_EvaluationEvent) trackedEvent).addAction(pcData.remove(ELEMENT.EXPECTED_ACTION));
                 }
             }