Message/API renamings

See #423