Some namechanges
Merge branch 'master' of https://github.com/mikma949/Commission