Fixing nameToId