Switch to using IDs as keys rather than names. Prevents collisions.

I know, I broke everyone's tools, but it;s for the best.