Updated to latest renamings in typed-graphs