Rename cvars to match code changes