Index: trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 7)
@@ -14,5 +14,5 @@
  * @author Bryan McGuffin
  */
-public class ATMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class ATMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/CMSEvaluationEvent.java	(revision 7)
@@ -15,5 +15,5 @@
  * @author Bryan McGuffin
  */
-public class CMSEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class CMSEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java	(revision 7)
+++ trunk/src/scriptbuilder/structures/events/I_ScriptEvent.java	(revision 7)
@@ -0,0 +1,28 @@
+package scriptbuilder.structures.events;
+
+import scriptbuilder.structures.ScriptEvent;
+import scriptbuilder.structures.ScriptEvent.ScriptEventType;
+
+/**
+ * Generic interface for ScriptEvent objects. Script Events have an event type,
+ * a length, and several data values unique to the event.
+ *
+ * @author Bryan McGuffin
+ */
+public interface I_ScriptEvent extends Comparable
+{
+
+    /**
+     * Get the time length of this event.
+     *
+     * @return number of seconds the event takes place; default is 1
+     */
+    int getLength();
+
+    /**
+     * Get the event type.
+     *
+     * @return the enum script event type of this event
+     */
+    ScriptEventType getScriptEventType();
+}
Index: trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java	(revision 7)
+++ trunk/src/scriptbuilder/structures/events/I_EvaluationEvent.java	(revision 7)
@@ -0,0 +1,42 @@
+package scriptbuilder.structures.events;
+
+import java.util.ArrayList;
+
+/**
+ * Generic interface for an evaluation event. An evaluation event has some set
+ * of expected actions.
+ *
+ * @author Bryan McGuffin
+ */
+public interface I_EvaluationEvent
+{
+
+    /**
+     * Get all the expected actions stored in this event.
+     * 
+     * @return a list of expected actions
+     */
+    ArrayList<String> getExpectedActions();
+
+    /**
+     * Add a new action to the list of expected actions.
+     * 
+     * @param act the new expected action
+     */
+    void addAction(String act);
+
+    /**
+     * Update the description of an existing expected action.
+     * 
+     * @param index The zero-based index of the action to update.
+     * @param act the new description of that action
+     */
+    void updateAction(int index, String act);
+
+    /**
+     * Remove an action from the list.
+     * 
+     * @param index the zero-based index of the action to remove
+     */
+    void removeAction(int index);
+}
Index: trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 7)
@@ -14,5 +14,5 @@
  * @author Bryan McGuffin
  */
-public class CADEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class CADEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 7)
@@ -14,5 +14,5 @@
  * @author Bryan McGuffin
  */
-public class ActivityLogEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class ActivityLogEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 7)
@@ -15,5 +15,5 @@
  * @author Bryan McGuffin
  */
-public class RadioEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class RadioEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 1)
+++ trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 7)
@@ -14,5 +14,5 @@
  * @author Bryan McGuffin
  */
-public class FacilitatorEvaluationEvent extends ScriptEvent implements EvaluationEventInterface
+public class FacilitatorEvaluationEvent extends ScriptEvent implements I_EvaluationEvent
 {
 
Index: trunk/src/scriptbuilder/structures/events/ScriptEventInterface.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/ScriptEventInterface.java	(revision 1)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package scriptbuilder.structures.events;
-
-import scriptbuilder.structures.ScriptEvent;
-import scriptbuilder.structures.ScriptEvent.ScriptEventType;
-
-/**
- * Generic interface for ScriptEvent objects. Script Events have an event type,
- * a length, and several data values unique to the event.
- *
- * @author Bryan McGuffin
- */
-public interface ScriptEventInterface extends Comparable
-{
-
-    /**
-     * Get the time length of this event.
-     *
-     * @return number of seconds the event takes place; default is 1
-     */
-    int getLength();
-
-    /**
-     * Get the event type.
-     *
-     * @return the enum script event type of this event
-     */
-    ScriptEventType getScriptEventType();
-}
Index: trunk/src/scriptbuilder/structures/events/EvaluationEventInterface.java
===================================================================
--- trunk/src/scriptbuilder/structures/events/EvaluationEventInterface.java	(revision 1)
+++ 	(revision )
@@ -1,47 +1,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package scriptbuilder.structures.events;
-
-import java.util.ArrayList;
-
-/**
- * Generic interface for an evaluation event. An evaluation event has some set
- * of expected actions.
- *
- * @author Bryan McGuffin
- */
-public interface EvaluationEventInterface
-{
-
-    /**
-     * Get all the expected actions stored in this event.
-     * 
-     * @return a list of expected actions
-     */
-    ArrayList<String> getExpectedActions();
-
-    /**
-     * Add a new action to the list of expected actions.
-     * 
-     * @param act the new expected action
-     */
-    void addAction(String act);
-
-    /**
-     * Update the description of an existing expected action.
-     * 
-     * @param index The zero-based index of the action to update.
-     * @param act the new description of that action
-     */
-    void updateAction(int index, String act);
-
-    /**
-     * Remove an action from the list.
-     * 
-     * @param index the zero-based index of the action to remove
-     */
-    void removeAction(int index);
-}