corrected some naming issues