some more fixes around names