Fix Trac #4534: renamer bug