updated class names to cf- prefix