sloved some naming problems
Merge branch 'master' of https://github.com/bazaargaming/bazaarworldofgaming