fixed some naming junk