Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 1)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import java.util.StringTokenizer;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.WitnessEvent;
 
@@ -31,5 +31,5 @@
 
     
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (WitnessEvent) sei;
Index: trunk/src/event/editor/CCTVPanel.java
===================================================================
--- trunk/src/event/editor/CCTVPanel.java	(revision 1)
+++ trunk/src/event/editor/CCTVPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import scriptbuilder.structures.events.CCTVEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -64,5 +64,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CCTVEvent) sei;
Index: trunk/src/event/editor/AudioPanel.java
===================================================================
--- trunk/src/event/editor/AudioPanel.java	(revision 1)
+++ trunk/src/event/editor/AudioPanel.java	(revision 7)
@@ -5,5 +5,5 @@
 import javax.swing.*;
 import scriptbuilder.structures.events.AudioEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -26,5 +26,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (AudioEvent) sei;
Index: trunk/src/event/editor/GenericEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/GenericEvaluationPanel.java	(revision 1)
+++ trunk/src/event/editor/GenericEvaluationPanel.java	(revision 7)
@@ -7,6 +7,6 @@
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import scriptbuilder.structures.events.EvaluationEventInterface;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_EvaluationEvent;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -18,5 +18,5 @@
 
     private ActionListener removeListener;
-    private EvaluationEventInterface event;
+    private I_EvaluationEvent event;
     private JTable dialogTable;
 
@@ -37,9 +37,9 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
-        if (sei instanceof EvaluationEventInterface)
+        if (sei instanceof I_EvaluationEvent)
         {
-            event = (EvaluationEventInterface) sei;
+            event = (I_EvaluationEvent) sei;
             ArrayList<String> strs = event.getExpectedActions();
             for (String s : strs)
Index: trunk/src/event/editor/Editor.java
===================================================================
--- trunk/src/event/editor/Editor.java	(revision 1)
+++ trunk/src/event/editor/Editor.java	(revision 7)
@@ -392,5 +392,5 @@
     }
 
-    public void addProperty(Properties property, ScriptEventInterface se)
+    public void addProperty(Properties property, I_ScriptEvent se)
     {
         try
@@ -457,5 +457,5 @@
     }
 
-    public void addProperty(Properties property, ScriptEventInterface se)
+    public void addProperty(Properties property, I_ScriptEvent se)
     {
         model.addProperty(property, se);
Index: trunk/src/event/editor/ScriptEventEditorPanel.java
===================================================================
--- trunk/src/event/editor/ScriptEventEditorPanel.java	(revision 1)
+++ trunk/src/event/editor/ScriptEventEditorPanel.java	(revision 7)
@@ -7,5 +7,5 @@
 
 import java.util.Observer;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -16,4 +16,4 @@
 {
 
-    void getEventObject(ScriptEventInterface sei);
+    void getEventObject(I_ScriptEvent sei);
 }
Index: trunk/src/event/editor/UnitPanel.java
===================================================================
--- trunk/src/event/editor/UnitPanel.java	(revision 1)
+++ trunk/src/event/editor/UnitPanel.java	(revision 7)
@@ -3,5 +3,5 @@
 import java.awt.event.*;
 import java.util.Observable;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.UnitEvent;
 
@@ -44,5 +44,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (UnitEvent) sei;
Index: trunk/src/event/editor/TMTRadioPanel.java
===================================================================
--- trunk/src/event/editor/TMTRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/TMTRadioPanel.java	(revision 7)
@@ -23,5 +23,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TMTRadioEvent) sei;
Index: trunk/src/event/editor/CHPRadioPanel.java
===================================================================
--- trunk/src/event/editor/CHPRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/CHPRadioPanel.java	(revision 7)
@@ -31,5 +31,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CHPRadioEvent) sei;
Index: trunk/src/event/editor/CADLogPanel.java
===================================================================
--- trunk/src/event/editor/CADLogPanel.java	(revision 1)
+++ trunk/src/event/editor/CADLogPanel.java	(revision 7)
@@ -4,5 +4,5 @@
 import java.util.Observable;
 import scriptbuilder.structures.events.CADEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -29,5 +29,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CADEvent) sei;
Index: trunk/src/event/editor/ParamicsPanel.java
===================================================================
--- trunk/src/event/editor/ParamicsPanel.java	(revision 1)
+++ trunk/src/event/editor/ParamicsPanel.java	(revision 7)
@@ -6,5 +6,5 @@
 import javax.swing.JCheckBox;
 import scriptbuilder.structures.events.ParamicsEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -31,5 +31,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (ParamicsEvent) sei;
Index: trunk/src/event/editor/MaintenanceRadioPanel.java
===================================================================
--- trunk/src/event/editor/MaintenanceRadioPanel.java	(revision 1)
+++ trunk/src/event/editor/MaintenanceRadioPanel.java	(revision 7)
@@ -23,5 +23,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (MaintenanceRadioEvent) sei;
Index: trunk/src/event/editor/TowPanel.java
===================================================================
--- trunk/src/event/editor/TowPanel.java	(revision 1)
+++ trunk/src/event/editor/TowPanel.java	(revision 7)
@@ -3,5 +3,5 @@
 import java.awt.event.*;
 import java.util.Observable;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 import scriptbuilder.structures.events.TowEvent;
 
@@ -60,5 +60,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TowEvent) sei;
Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 1)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 7)
@@ -7,5 +7,5 @@
 import javax.swing.event.TableModelListener;
 import scriptbuilder.structures.events.CMSEvaluationEvent;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -36,5 +36,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (CMSEvaluationEvent) sei;
Index: trunk/src/event/editor/RemoveablePanel.java
===================================================================
--- trunk/src/event/editor/RemoveablePanel.java	(revision 1)
+++ trunk/src/event/editor/RemoveablePanel.java	(revision 7)
@@ -2,5 +2,5 @@
 
 import java.awt.event.*;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 public interface RemoveablePanel
Index: trunk/src/event/editor/TelephonePanel.java
===================================================================
--- trunk/src/event/editor/TelephonePanel.java	(revision 1)
+++ trunk/src/event/editor/TelephonePanel.java	(revision 7)
@@ -33,5 +33,5 @@
     }
 
-    public void getEventObject(ScriptEventInterface sei)
+    public void getEventObject(I_ScriptEvent sei)
     {
         event = (TelephoneEvent) sei;