More fixes for names