Please do the rename in a separate commit.  It looks like only one line of change here applies to the issue.