Improve IFUnitName