Merge pull request #436 from benma/renamings

Message/API renamings