Small fixes to names