From c9c4611d9a81535c57bc2f399f2966721059f1dd Mon Sep 17 00:00:00 2001
From: Taylor Hornby <taylor@defuse.ca>
Date: Mon, 11 Jul 2016 19:27:52 -0600
Subject: [PATCH 1/4] Rename zerocash to zcash in some places.

---
 src/Makefile.am                | 2 +-
 src/test/transaction_tests.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1a9ca90a..cdda20f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -404,7 +404,7 @@ bitcoin_tx_LDADD = \
 bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
 #
 
-# zerocash protocol primitives #
+# zcash protocol primitives #
 libzcash_a_SOURCES = \
   zcash/IncrementalMerkleTree.cpp \
   zcash/NoteEncryption.cpp \
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index 8bcd0eaa..440eb538 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -305,8 +305,8 @@ BOOST_AUTO_TEST_CASE(test_basic_pour_verification)
     // on all platforms and would gently push us down an ugly
     // path. We should just fix the assertions.
     //
-    // Also, it's generally libzerocash's job to ensure
-    // the integrity of the scheme through its own tests.
+    // Also, it's generally libzcash's job to ensure the
+    // integrity of the scheme through its own tests.
 
     // construct the r1cs keypair
     auto p = ZCJoinSplit::Generate();

From 76b3a9265276e127092f5870eb7ea97fd3b7c688 Mon Sep 17 00:00:00 2001
From: Taylor Hornby <taylor@defuse.ca>
Date: Mon, 11 Jul 2016 19:29:11 -0600
Subject: [PATCH 2/4] Remove references to libzerocash in .gitignore

---
 .gitignore | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0254fdc5..806a4b62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,13 +9,8 @@ src/bitcoin-tx
 src/test/test_bitcoin
 src/qt/test/test_bitcoin-qt
 
-# zerocash tests and utilities
+# Zcash utilities
 src/zcash/GenerateParams
-src/zerocash/GenerateParamsForFiles
-src/zerocash/tests/merkleTest
-src/zerocash/tests/utilTest
-src/zerocash/tests/zerocashTest
-src/zerocash/tests/test_zerocash_pour_ppzksnark
 
 *zcashTest.pk
 *zcashTest.vk

From 3bde967f538cf7dc48ce0b01cfbc6c157feb2714 Mon Sep 17 00:00:00 2001
From: Taylor Hornby <taylor@defuse.ca>
Date: Mon, 11 Jul 2016 19:29:41 -0600
Subject: [PATCH 3/4] Rename qa/zerocash to qa/zcash in Makefile.am

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index ea1fe506..b9b8f7ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -222,7 +222,7 @@ endif
 
 dist_noinst_SCRIPTS = autogen.sh
 
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zerocash $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
 
 CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
 

From 4e117b63c66303caf861b59f5c1f89924b15814b Mon Sep 17 00:00:00 2001
From: Taylor Hornby <taylor@defuse.ca>
Date: Mon, 11 Jul 2016 19:30:18 -0600
Subject: [PATCH 4/4] Rename zerocash_packages to zcash_packages in packages.mk

---
 depends/packages/packages.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk
index 539f6d97..92c4433b 100644
--- a/depends/packages/packages.mk
+++ b/depends/packages/packages.mk
@@ -1,5 +1,5 @@
-zerocash_packages := libsnark libgmp libsodium
-packages := boost openssl $(zerocash_packages) googletest googlemock
+zcash_packages := libsnark libgmp libsodium
+packages := boost openssl $(zcash_packages) googletest googlemock
 native_packages := native_ccache native_comparisontool
 
 qt_native_packages = native_protobuf