[GAIA BUG946750-FORM] - Unified names of the broadcasted messages
Merge pull request #389 from michalbe/Bug946750-form-temp

[GAIA BUG946750-FORM] - Unified names of the broadcasted messages