Changed Class Names
Merge branch 'master' of https://github.com/brimbox/core