Lots and lots of renamings
Merge branch 'master' of https://github.com/lihaoyi/scala-parser