Performing the file renames and the class renames in separate changelists can make it easier for tools to track a single file's history.
Michael Handschuh