names fixes