Add better documentation to renaming structures
Renaming: fix value of avoids set by mk_from_nmap

avoids should contain the range of nmap, not its domain.