fix all renaming problems in the current