fixed some naming