Board Thread:Wiki-Related Discussion/@comment-2153169-20140516005552/@comment-24892981-20140709211020

Keep the affiliations. Just put villain (formerly) then put hero underneath. Delete them from locations though.