Add source of message to message type

Fix all the resulting fallout