change variable names

angle to ANGLE, velocity to VELOCITY