A few fixes to names and comments