Could you change naming convention of configuration variables from  ``CFG_WEBMESSAGE_<NAME>`` (old style) to ``MESSAGES_<NAME>`` (new style). You can do this in a new separate pull request.