Fixing handling of keypair names