Renaming of some variables printed out, to make compatible the two ways of correcting the generator efficiency.