AAF common name bug fix