fixed some names
more name fixes