Rename methods and conf for new Chaos
Update Marathon version