Login responses names clarified
Merge branch 'server' into develop