Update autoRename to search for all swappable words

Plus more tests.