Rationalized class names
Merge branch 'master' of github.com:jmochel/canon-scala