Fix unstrucured GP name handling