diff --git a/docs/stable/1-client.md b/docs/stable/1-client.md
index f4262b0..9b1a691 100644
--- a/docs/stable/1-client.md
+++ b/docs/stable/1-client.md
@@ -17,8 +17,8 @@ title: 1/CLIENT
 This specification describes how to write a Status client for
 communicating with other Status clients.
 
-This specification presents a reference implementation of the protocol <sup>1</sup> that is used
-in a command line client <sup>2</sup> and a mobile app <sup>3</sup>.
+This specification presents a reference implementation of the protocol <sup>[1](#footnotes)</sup> that is used
+in a command line client <sup>[2](#footnotes)</sup> and a mobile app <sup>[3](#footnotes)</sup>.
 
 This document consists of two parts. The first outlines the specifications that
 have to be implemented in order to be a full Status client. The second gives a design rationale and answers some common questions.
diff --git a/docs/stable/10-waku-usage.md b/docs/stable/10-waku-usage.md
index 9e68988..e436ff3 100644
--- a/docs/stable/10-waku-usage.md
+++ b/docs/stable/10-waku-usage.md
@@ -151,7 +151,7 @@ Contact code topic MUST be created following the algorithm below:
 ```golang
 contactCode := "0x" + hexEncode(activePublicKey) + "-contact-code"
 
-var hash []byte = keccak256(name)
+var hash []byte = keccak256(contactCode)
 var topicLen int = 4
 
 if len(hash) < topicLen {
@@ -359,4 +359,4 @@ Released [May 22, 2020](https://github.com/status-im/specs/commit/664dd1c9df6ad4
 - Changed `shh_markTrustedPeer` to `waku_markTrustedPeer`
   - [Exists here](https://github.com/status-im/status-go/blob/2d13ccf5ec3db7e48d7a96a7954be57edb96f12f/waku/api.go#L100-L108)
 - Changed `shhext_requestMessages` to `wakuext_requestMessages`
-  - [Exists here](https://github.com/status-im/status-go/blob/2d13ccf5ec3db7e48d7a96a7954be57edb96f12f/services/wakuext/api.go#L76-L139)
\ No newline at end of file
+  - [Exists here](https://github.com/status-im/status-go/blob/2d13ccf5ec3db7e48d7a96a7954be57edb96f12f/services/wakuext/api.go#L76-L139)
diff --git a/docs/stable/2-account.md b/docs/stable/2-account.md
index 8473782..4fdc3a5 100644
--- a/docs/stable/2-account.md
+++ b/docs/stable/2-account.md
@@ -72,8 +72,8 @@ The node verifies or derives everything else associated with the contact from th
     - Whisper/Waku Chat Key (`IK`): `m/43'/60'/1581'/0'/0`  (post Multiaccount integration)
         - following [EIP1581](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1581.md)
     <!-- WE CURRENTLY DO NOT IMPLEMENT ENCRYPTION KEY, FOR FUTURE - C.P. -->
-    <!-- - DB encryption Key (`DBK`): `m/43'/60'/1581'/1'/0` (post Multiaccount integration)
-        - following [EIP1581](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1581.md) -->
+    <!-- - DB encryption Key (`DBK`): `m/43'/60'/1581'/1'/0` (post Multiaccount integration) -->
+    <!-- - following [EIP1581](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1581.md) -->
     - Status Wallet paths: `m/44'/60'/0'/0/i` starting at `i=0`
         - following [BIP44](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki)
         - NOTE: this (`i=0`) is also the current (and only) path for Whisper/Waku key before Multiaccount integration
diff --git a/docs/stable/3-whisper-usage.md b/docs/stable/3-whisper-usage.md
index 9dc3a22..3925250 100644
--- a/docs/stable/3-whisper-usage.md
+++ b/docs/stable/3-whisper-usage.md
@@ -146,7 +146,7 @@ Contact code topic MUST be created following the algorithm below:
 ```golang
 contactCode := "0x" + hexEncode(activePublicKey) + "-contact-code"
 
-var hash []byte = keccak256(name)
+var hash []byte = keccak256(contactCode)
 var topicLen int = 4
 
 if len(hash) < topicLen {