Some minor renaming
Merge branch 'master' of https://github.com/joshbeitler/mirus