Why the change from `message` to `text`?  If no reason, can we keep it as before (to minimize changes [for now])?