Add in a bunch of additional names that were being confused.