fixed gi name handling, for reals