Rename name and rename

Thumbs up for commit message.