Updated some CFP language