fixed some names