Renaming to c4m_message