fixed some naming conventions