Merge pull request #131 from benma/renamings

Message renames.