Fix tag name for messages with intents