Replace subject pairings with subject mappings.

This will facilitate running SomVal and other pipelines in more
circumstances.
Tag the move from pairings to mappings.