Update response templates for consistency.  See f12794d60fdf57545ee7d711395349f8a98d40d3