diff --git a/src/gtest/test_keystore.cpp b/src/gtest/test_keystore.cpp
index 987bdd13a..8baf02cab 100644
--- a/src/gtest/test_keystore.cpp
+++ b/src/gtest/test_keystore.cpp
@@ -16,9 +16,9 @@ TEST(keystore_tests, store_and_retrieve_spending_key) {
     auto addr = sk.address();
     ASSERT_TRUE(keyStore.HaveSpendingKey(addr));
 
-    libzcash::SpendingKey keyOut;
-    keyStore.GetSpendingKey(addr, keyOut);
-    ASSERT_EQ(sk, keyOut);
+    libzcash::SpendingKey skOut;
+    keyStore.GetSpendingKey(addr, skOut);
+    ASSERT_EQ(sk, skOut);
 
     keyStore.GetPaymentAddresses(addrs);
     ASSERT_EQ(1, addrs.size());
diff --git a/src/keystore.h b/src/keystore.h
index 4beba84fe..927ebe221 100644
--- a/src/keystore.h
+++ b/src/keystore.h
@@ -51,7 +51,7 @@ public:
 
     //! Check whether a spending key corresponding to a given payment address is present in the store.
     virtual bool HaveSpendingKey(const libzcash::PaymentAddress &address) const =0;
-    virtual bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey& keyOut) const =0;
+    virtual bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey& skOut) const =0;
     virtual void GetPaymentAddresses(std::set<libzcash::PaymentAddress> &setAddress) const =0;
 };
 
@@ -125,14 +125,14 @@ public:
         }
         return result;
     }
-    bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey &keyOut) const
+    bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey &skOut) const
     {
         {
             LOCK(cs_KeyStore);
             SpendingKeyMap::const_iterator mi = mapSpendingKeys.find(address);
             if (mi != mapSpendingKeys.end())
             {
-                keyOut = mi->second;
+                skOut = mi->second;
                 return true;
             }
         }