Fix bug with conflicting names.
Fix bug with conflicting names.

If you have @pop and @popcorn then with "I'd like a @pop and @popcorn" you can end up with "I'd like a Coke and Pepsicorn" instead of "I'd like a Coke and a Caramel Corn".
jaqattaq/jaqattaq.github.io,soulwire/WTFEngine,jaqattaq/jaqattaq.github.io,soulwire/WTFEngine