Fix some naming issues.