Swap order of calls in genInst just to make
the two cases the same

Plus some alpha-renaming