Reworked message and action types to be more direct.

Reworked message and action types to be more direct. #382