Some renames and fix for Mac vsync