small fixes to names