some names fixes