modified some names and body of responses