renamer fixes