Changed nicknames to be swagger-codegen friendly
Merge pull request #82 from willemt/swagger-codegen-friendly-nicknames

Changed nicknames to be swagger-codegen friendly