fixed some naming errors