Removed IsRenameNeeded: Does not work as intended