Simplify duplicate use of the term keypairs

Change-Id: I0e2fc629c2fa4e918962b5132c4f3fd250c23e69
Merge "Simplify duplicate use of the term keypairs"