clean up bad renaming