Additional CSWITCH instances have been added and variable names like H_HE were changed to _COOLANT