Resolving avail renaming