More CVARS capitalization fixes.