Fixing naming issues.