diff --git a/blockchain/checkpoints.go b/blockchain/checkpoints.go
index eb8524b9..ff859125 100644
--- a/blockchain/checkpoints.go
+++ b/blockchain/checkpoints.go
@@ -18,7 +18,7 @@ import (
 const CheckpointConfirmations = 2016
 
 // newShaHashFromStr converts the passed big-endian hex string into a
-// wire.ShaHash.  It only differs from the one available in btcwire in that
+// wire.ShaHash.  It only differs from the one available in wire in that
 // it ignores the error since it will only (and must only) be called with
 // hard-coded, and therefore known good, hashes.
 func newShaHashFromStr(hexStr string) *wire.ShaHash {
diff --git a/database/ldb/block.go b/database/ldb/block.go
index a35649f9..ac755ca7 100644
--- a/database/ldb/block.go
+++ b/database/ldb/block.go
@@ -48,7 +48,7 @@ func (db *LevelDb) FetchBlockHeightBySha(sha *wire.ShaHash) (int64, error) {
 	return db.getBlkLoc(sha)
 }
 
-// FetchBlockHeaderBySha - return a btcwire ShaHash
+// FetchBlockHeaderBySha - return a ShaHash
 func (db *LevelDb) FetchBlockHeaderBySha(sha *wire.ShaHash) (bh *wire.BlockHeader, err error) {
 	db.dbLock.Lock()
 	defer db.dbLock.Unlock()
diff --git a/database/memdb/memdb.go b/database/memdb/memdb.go
index 877ea261..9c7ffc7b 100644
--- a/database/memdb/memdb.go
+++ b/database/memdb/memdb.go
@@ -38,8 +38,8 @@ type tTxInsertData struct {
 }
 
 // newShaHashFromStr converts the passed big-endian hex string into a
-// wire.ShaHash.  It only differs from the one available in btcwire in that
-// it ignores the error since it will only (and must only) be called with
+// wire.ShaHash.  It only differs from the one available in wire in that it
+// ignores the error since it will only (and must only) be called with
 // hard-coded, and therefore known good, hashes.
 func newShaHashFromStr(hexStr string) *wire.ShaHash {
 	sha, _ := wire.NewShaHashFromStr(hexStr)
diff --git a/docs/README.md b/docs/README.md
index be686a9a..9c743536 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -195,12 +195,12 @@ information.
     * [btcws](https://github.com/btcsuite/btcws) - Custom types for btcd
 	  websocket extension commands (registers the extension commands with
 	  [btcjson](https://github.com/btcsuite/btcjson))
-    * [btcwire](https://github.com/btcsuite/btcwire) - Implements the Bitcoin
-	  wire protocol
+    * [wire](https://github.com/btcsuite/btcd/tree/master/wire) - Implements the
+	  Bitcoin wire protocol
     * [blockchain](https://github.com/btcsuite/btcd/blockchain) - Implements
 	  Bitcoin block handling and chain selection rules
-    * [txscript](https://github.com/btcsuite/btcd/txscript) - Implements the
-	  Bitcoin transaction scripting language
+    * [txscript](https://github.com/btcsuite/btcd/tree/master/txscript) -
+	  Implements the Bitcoin transaction scripting language
     * [btcec](https://github.com/btcsuite/btcec) - Implements support for the
 	  elliptic curve cryptographic functions needed for the Bitcoin scripts
     * [database](https://github.com/btcsuite/btcd/tree/master/database) -
diff --git a/mining.go b/mining.go
index 0bc83677..1259ba30 100644
--- a/mining.go
+++ b/mining.go
@@ -21,9 +21,9 @@ const (
 	// generatedBlockVersion is the version of the block being generated.
 	// It is defined as a constant here rather than using the
 	// wire.BlockVersion constant since a change in the block version
-	// will require changes to the generated block.  Using the btcwire
-	// constant for generated block version could allow creation of invalid
-	// blocks for the updated version.
+	// will require changes to the generated block.  Using the wire constant
+	// for generated block version could allow creation of invalid blocks
+	// for the updated version.
 	generatedBlockVersion = 2
 
 	// minHighPriority is the minimum priority value that allows a
diff --git a/peer.go b/peer.go
index 163f717b..2630845a 100644
--- a/peer.go
+++ b/peer.go
@@ -1417,8 +1417,8 @@ out:
 					// command in the header if at least
 					// that much of the message was valid,
 					// but that is not currently exposed by
-					// btcwire, so just used malformed for
-					// the command.
+					// wire, so just used malformed for the
+					// command.
 					p.PushRejectMsg("malformed",
 						wire.RejectMalformed, errMsg,
 						nil, true)