Fix naming issues.