Rename node,edge types to Node,Edge