Modified the MQTT Message type names and added comments.