--- a/python/tests/moving.txt	Wed Jun 18 23:40:47 2014 -0400
+++ b/python/tests/moving.txt	Thu Jun 19 13:31:00 2014 -0400
@@ -95,12 +95,12 @@
 True
 
 >>> o1 = MovingObject(positions = Trajectory([[0]*3,[2]*3]), velocities = Trajectory([[0]*3,[1]*3]))
->>> o1.classifyUserTypeSpeed(0.5, np.median)
+>>> o1.classifyUserTypeSpeedMotorized(0.5, np.median)
 >>> userTypeNames[o1.getUserType()]
 'car'
->>> o1.classifyUserTypeSpeed(0.5, np.mean)
+>>> o1.classifyUserTypeSpeedMotorized(0.5, np.mean)
 >>> userTypeNames[o1.getUserType()]
 'car'
->>> o1.classifyUserTypeSpeed(1.5, np.median)
+>>> o1.classifyUserTypeSpeedMotorized(1.5, np.median)
 >>> userTypeNames[o1.getUserType()]
 'pedestrian'