More cleanup of FP class prefix.