gi: follow local variable name change