Fixing bad names