--- a/python/prediction.py	Thu Jun 05 17:50:42 2014 -0400
+++ b/python/prediction.py	Fri Jun 06 14:10:42 2014 -0400
@@ -30,8 +30,8 @@
     def getPredictedSpeeds(self):
         return [so.norm for so in self.predictedSpeedOrientations.values()]
 
-    def draw(self, options = '', withOrigin = False, timeStep = 1, **kwargs):
-        self.getPredictedTrajectory().draw(options, withOrigin, timeStep, **kwargs)
+    def plot(self, options = '', withOrigin = False, timeStep = 1, **kwargs):
+        self.getPredictedTrajectory().plot(options, withOrigin, timeStep, **kwargs)
 
 class PredictedTrajectoryConstant(PredictedTrajectory):
     '''Predicted trajectory at constant speed or acceleration
@@ -170,13 +170,13 @@
             figure()
             for et in predictedTrajectories1:
                 et.predictPosition(timeHorizon)
-                et.draw('rx')
+                et.plot('rx')
 
             for et in predictedTrajectories2:
                 et.predictPosition(timeHorizon)
-                et.draw('bx')
-            obj1.draw('r')
-            obj2.draw('b')
+                et.plot('bx')
+            obj1.plot('r')
+            obj2.plot('b')
             title('instant {0}'.format(currentInstant))
             axis('equal')
 
@@ -222,13 +222,13 @@
                 figure()
                 for et in predictedTrajectories1:
                     et.predictPosition(timeHorizon)
-                    et.draw('rx')
+                    et.plot('rx')
 
                 for et in predictedTrajectories2:
                     et.predictPosition(timeHorizon)
-                    et.draw('bx')
-                obj1.draw('r')
-                obj2.draw('b')
+                    et.plot('bx')
+                obj1.plot('r')
+                obj2.plot('b')
                 title('instant {0}'.format(i))
                 axis('equal')
 
@@ -376,9 +376,9 @@
             figure()
             plot([p1.x, intersection.x], [p1.y, intersection.y], 'r')
             plot([p2.x, intersection.x], [p2.y, intersection.y], 'b')
-            intersection.draw()            
-            obj1.draw('r')
-            obj2.draw('b')
+            intersection.plot()            
+            obj1.plot('r')
+            obj2.plot('b')
             title('instant {0}'.format(currentInstant))
             axis('equal')