Single source of truth

Giving each key record one authoritative home, so systems and reports agree.