Modify CCD variable and function name