renamed functions in Message
todo-alias "@fixme" with high priority