Normalize class names
Merge branch 'master' of github.com:Nuwen/mafia