cc-mode main: revert name to the old version