Rename EmbeddedMessage -> Message