Change some conf names to make sense.
Merge branch 'master' of https://github.com/FlorianDeconinck/AcrossProject