Modified some names before creating intermediate graph form