rename some classes and packages for consistency
Merge branch 'master' of github.com:sanity/quickml