Message/API renamings

One batch of renamings.

According to #423.