barrier: strive for consistency between barrierGF and the inGF assumptions; also change some instance names