use named afi/safi for consistency