This is fine for this pull request, but please send renaming change-sets as separate pull request. It makes it easier to review.