Fixed problems with renaming and merging, improved label generation (fewer 1 word labels)