Reorganize to standard {P,Sp,Fp}rint nomenclature