fixes for names