some fixes to names