Fixing nameToId
Fixing nameToId