Fixed minor naming issues.