Couple of name changes and fix the race