Replace references to responses with messages