renamed ,XT and ,CFA to XT, and CFA, to be consistent with C, et al