Reduce duplicated code, fix module name in the graph view.