adapted structure names to the ones of GME-Format.md; some minor fixes