Rename according to message type