improve ResolveUnitName