Refactor part of the renamer to fix Trac #3901