Remove duplicate commodity/technology naming logic

[trevorb1]

In a few places in the code base, we are assembling commodity and technology names like shown below...

Canada-U.S.-ElecTrade/scripts/InOutActivityRatio.py

Lines 83 to 86 in 3873057

	for year in years:
	for subregion in canSubregions:
	for fuel in pwrTechs:
	techName = 'PWR' + fuel + 'CAN' + subregion + '01'

We already have functions to do this, and should have created the appropriate set CSV files by this point in the workflow. Lets remove the duplicate naming so everything is being generated by the same source