Message renames.
Merge pull request #132 from benma/renamings

Message renames.