Rename non static function C_* Cvgd_* issue #21