fixed some naming issues