Fixes more naming issues.