corrects the client helper references to ::CF