Keep names consistent.
Update PrimaryIdentifier to save pairs.
Update TypeList to use pairs.