Changed class prefix to CDF