Corrected some naming issues.