Rename keypairs to keypair to be more consistent

Change-Id: I429c83c421aa6b04e4bb4379bfedbc7feeb2d8f0
Merge "Rename keypairs to keypair to be more consistent"