Changed nicknames to be swagger-codegen friendly
Fixes