Fixed name issues in SVG and Graph