rename class variables
fix uvc