Trying to improve nameToId