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
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)
 
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
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();