From 0da9aac63e03c59e049eefd923f72b8ce415af32 Mon Sep 17 00:00:00 2001
From: Jay Graber <jay@z.cash>
Date: Mon, 4 Jun 2018 04:59:07 -0700
Subject: [PATCH] s/SaplingInViewingKey/SaplingIncomingViewingKey

---
 src/zcash/Address.cpp | 6 +++---
 src/zcash/Address.hpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/zcash/Address.cpp b/src/zcash/Address.cpp
index 1e43281f1..3ed8b7184 100644
--- a/src/zcash/Address.cpp
+++ b/src/zcash/Address.cpp
@@ -55,17 +55,17 @@ SaplingFullViewingKey SaplingSpendingKey::full_viewing_key() const {
     return expanded_spending_key().full_viewing_key();
 }
 
-SaplingInViewingKey SaplingFullViewingKey::in_viewing_key() const {
+SaplingIncomingViewingKey SaplingFullViewingKey::in_viewing_key() const {
     uint256 ivk;
     librustzcash_crh_ivk(ak.begin(), nk.begin(), ivk.begin());
-    return SaplingInViewingKey(ivk);
+    return SaplingIncomingViewingKey(ivk);
 }
 
 SaplingSpendingKey SaplingSpendingKey::random() {
     return SaplingSpendingKey(random_uint256());
 }
 
-SaplingPaymentAddress SaplingInViewingKey::address(diversifier_t d) const {
+SaplingPaymentAddress SaplingIncomingViewingKey::address(diversifier_t d) const {
     uint256 pk_d;
     librustzcash_ivk_to_pkd(this->begin(), d.data(), pk_d.begin());
     return SaplingPaymentAddress(d, pk_d);
diff --git a/src/zcash/Address.hpp b/src/zcash/Address.hpp
index e710ae275..5d0a33cbf 100644
--- a/src/zcash/Address.hpp
+++ b/src/zcash/Address.hpp
@@ -125,10 +125,10 @@ public:
     }
 };
 
-class SaplingInViewingKey : public uint256 {
+class SaplingIncomingViewingKey : public uint256 {
 public:
-    SaplingInViewingKey() : uint256() { }
-    SaplingInViewingKey(uint256 ivk) : uint256(ivk) { }
+    SaplingIncomingViewingKey() : uint256() { }
+    SaplingIncomingViewingKey(uint256 ivk) : uint256(ivk) { }
     
     // Can pass in diversifier for Sapling addr
     SaplingPaymentAddress address(diversifier_t d) const;
@@ -152,7 +152,7 @@ public:
         READWRITE(ovk);
     }
 
-    SaplingInViewingKey in_viewing_key() const;
+    SaplingIncomingViewingKey in_viewing_key() const;
 
     friend inline bool operator==(const SaplingFullViewingKey& a, const SaplingFullViewingKey& b) {
         return a.ak == b.ak && a.nk == b.nk && a.ovk == b.ovk;