Remove "C" prefix in class names