Made some struct name clean up
Merge branch 'master' of github.com:Mithrandir0x/so2