Standardize enum cfgcontrol -> CommonControl