Noramlize out synonyms that duplciate sample name
Changes to better structure grouping of derived nodes.