More consistent naming (and easier to find)
Merge branch 'master' of github.com:LitusProject/Litus