Naming fixes and message structure improvement
Merge branch 'master' of https://github.com/jvalduvieco/HackmanServer