Refinement of gof naming