Update messages so they are less painful in specs