Index: trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java
===================================================================
--- trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 1)
+++ trunk/src/scriptbuilder/gui/panels/IncidentTimelinePanel.java	(revision 7)
@@ -20,5 +20,5 @@
 import scriptbuilder.structures.ScriptIncident;
 import scriptbuilder.structures.TimeSlice;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -129,5 +129,5 @@
             }
 
-            for (ScriptEventInterface se : incident.slices.get(newSlice).events)
+            for (I_ScriptEvent se : incident.slices.get(newSlice).events)
             {
                 ed.addProperty(eventTypeToPropertyMap.get(se.getScriptEventType()), se);
@@ -141,5 +141,5 @@
                 if (f.currentEventType != null)
                 {
-                    ScriptEventInterface s = ScriptEvent.factoryByType(f.currentEventType);
+                    I_ScriptEvent s = ScriptEvent.factoryByType(f.currentEventType);
                     ed.addProperty(eventTypeToPropertyMap.get(f.currentEventType), s);
                     incident.slices.get(newSlice).addEvent(s);
Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 1)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 7)
@@ -31,5 +31,5 @@
 import scriptbuilder.structures.SimulationScript;
 import scriptbuilder.structures.TimeSlice;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -360,5 +360,5 @@
 
             DefaultListModel model = new DefaultListModel();
-            for (ScriptEventInterface e : slice.events)
+            for (I_ScriptEvent e : slice.events)
             {
                 model.addElement(e);
Index: trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java
===================================================================
--- trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java	(revision 1)
+++ trunk/src/scriptbuilder/gui/drawers/TimeSliceDrawer.java	(revision 7)
@@ -12,5 +12,5 @@
 import scriptbuilder.structures.ScriptEvent;
 import scriptbuilder.structures.TimeSlice;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -88,5 +88,5 @@
                 }
 
-                ScriptEventInterface event = slice.events.get(i);
+                I_ScriptEvent event = slice.events.get(i);
                 EventIconDrawer.DrawEventIcon(g2d, event, slice.getX()
                         - ScriptBuilderGuiConstants.EVENT_ICON_WIDTH,
Index: trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java
===================================================================
--- trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java	(revision 1)
+++ trunk/src/scriptbuilder/gui/drawers/EventIconDrawer.java	(revision 7)
@@ -13,5 +13,5 @@
 import scriptbuilder.structures.ScriptEvent.ScriptEventType;
 import images.*;
-import scriptbuilder.structures.events.ScriptEventInterface;
+import scriptbuilder.structures.events.I_ScriptEvent;
 
 /**
@@ -138,5 +138,5 @@
      * y)
      */
-    public static void DrawEventIcon(Graphics2D g2d, ScriptEventInterface event,
+    public static void DrawEventIcon(Graphics2D g2d, I_ScriptEvent event,
             int x, int y)
     {