Fixed enum and struct naming
Merge branch 'master' of github.com:joh06937/library