Use message_tag rather than operation_name

Fixes #553