Fixed some naming issues.