Some fix and designation renaming handling