Finished renaming SubGraph* to Subgraph*