Slight tweaks.
Rename some cv function to cv2 equivalents.