Fixed other naming issues.