Fixes bad names