Cleaner project ID generation
Remove obsolete component
Fix subgraph node, fixes #343
More name harmonization