Refactored module names.
Refactored for multi-message.