Revert "Moving hierarchical name creation to series (not yet completed!)"

This reverts commit 80517428f631d2850ce5d6fd5300ce3cb679ebd5.
Review only - no real change; reverted previous change: sorting becomes to hard!