consistent naming convention for responses
clear up naming
Make naming convention consistent
Merge pull request #399 from matin/revision1

Remove expires_at and clean up naming