--- a/python/events.py	Tue Jul 23 05:05:06 2013 -0400
+++ b/python/events.py	Wed Jul 24 12:48:12 2013 -0400
@@ -87,11 +87,11 @@
             collisionCourseAngles[instant] = arccos(collisionCourseDotProducts[instant]/(distances[instant]*speedDifferentials[instant]))
 
         # todo shorten the time intervals based on the interaction definition
-        self.addIndicator(indicators.SeverityIndicator('Collision Course Dot Product', collisionCourseDotProducts))
-        self.addIndicator(indicators.SeverityIndicator('Collision Course Angle', collisionCourseAngles))
-        self.addIndicator(indicators.SeverityIndicator('Distance', distances))
-        self.addIndicator(indicators.SeverityIndicator('Velocity Angle', velocityAngles))
-        self.addIndicator(indicators.SeverityIndicator('Speed Differential', speedDifferentials))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[0], collisionCourseDotProducts))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[1], collisionCourseAngles))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[2], distances))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[4], velocityAngles))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials))
 
         # todo test for interaction instants and interval, compute indicators
 
@@ -100,7 +100,7 @@
             minDistance={}
             for instant in self.timeInterval:
                 minDistance[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant)
-            self.addIndicator(indicators.SeverityIndicator('Minimum Distance', minDistance))
+            self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[3], minDistance))
 
     def computeCrossingsCollisions(self, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None):
         '''Computes all crossing and collision points at each common instant for two road users. '''
@@ -117,14 +117,14 @@
             if len(self.collisionPoints[i]) > 0:
                 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(self.collisionPoints[i])
         # add probability of collision, and probability of successful evasive action
-        self.addIndicator(indicators.SeverityIndicator('TTC', TTCs))
+        self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[7], TTCs))
         
         if computeCZ:
             pPETs = {}
             for i in list(commonTimeInterval)[:-1]:
                 if len(self.crossingZones[i]) > 0:
                     pPETs[i] = prediction.SafetyPoint.computeExpectedIndicator(self.crossingZones[i])
-            self.addIndicator(indicators.SeverityIndicator('pPET', pPETs))
+            self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[9], pPETs))
 
     def addVideoFilename(self,videoFilename):
         self.videoFilename= videoFilename