Made request/response naming consistent