It would probably be best to move these over to the CfgFunction system as well. Variables weren't considered during this process for naming upgrades.