Changed naming convention for message types.