renaming messages_base to base_messages to be more conistent