fixed some naming issues.