Per r35510: Rename right message too