change naming of pair struct members