Rename FP* to FpCategory::* following std changes