Small refactor of the graph
Namespaces edges and nodes by query name.