[Refactor] Improve message name