UHM-937 Rename of messages