replaced some more overlooked “owner” terms