diff --git a/CHANGELOG b/CHANGELOG
index 127f5b7..7ee21d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -291,3 +291,9 @@ WinDivert 2.0.0-rc
       values correspond to higher priorities.
     - The last two arguments for WinDivertRecv() and WinDivertSend() have been
       swapped.
+WinDivert 2.0.1-rc
+    - Fix WFP callout install optimization bug.
+    - Fix WinDivertHelperNtohIpv6Address/WinDivertHelperHtonIpv6Address bug.
+    - Rename the following functions for consistency:
+      * WinDivertHelperNtohIpv6Address -> WinDivertHelperNtohIPv6Address
+      * WinDivertHelperHtonIpv6Address -> WinDivertHelperHtonIPv6Address
diff --git a/VERSION b/VERSION
index b50fd54..45e0a92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0-rc
+2.0.1-rc
diff --git a/dll/windivert.def b/dll/windivert.def
index 5f9e485..2c2ecc7 100644
--- a/dll/windivert.def
+++ b/dll/windivert.def
@@ -28,3 +28,5 @@ EXPORTS
     WinDivertHelperHtonll
     WinDivertHelperNtohIPv6Address
     WinDivertHelperHtonIPv6Address
+    WinDivertHelperNtohIpv6Address
+    WinDivertHelperHtonIpv6Address
diff --git a/dll/windivert_helper.c b/dll/windivert_helper.c
index a619872..0b91cc6 100644
--- a/dll/windivert_helper.c
+++ b/dll/windivert_helper.c
@@ -5055,3 +5055,12 @@ extern void WinDivertHelperHtonIPv6Address(const UINT *inAddr, UINT *outAddr)
     WinDivertByteSwap128(inAddr, outAddr);
 }
 
+// Old names to be removed in next version
+extern void WinDivertHelperNtohIpv6Address(const UINT *inAddr, UINT *outAddr)
+{
+    WinDivertByteSwap128(inAddr, outAddr);
+}
+extern void WinDivertHelperHtonIpv6Address(const UINT *inAddr, UINT *outAddr)
+{
+    WinDivertByteSwap128(inAddr, outAddr);
+}
diff --git a/doc/windivert.html b/doc/windivert.html
index 23e69c6..d5a8ce0 100644
--- a/doc/windivert.html
+++ b/doc/windivert.html
@@ -2299,7 +2299,7 @@ Parses an IPv6 address stored in <code>addrStr</code>.
 If <code>pAddr</code> is non-<code>NULL</code>, the buffer assumed 
 to be large enough to hold a 16-byte IPv6 address.
 The result is stored in host-byte-order.
-Use <a href="#divert_helper_hton"><code>WinDivertHelperHtonIpv6Address()</code></a>
+Use <a href="#divert_helper_hton"><code>WinDivertHelperHtonIPv6Address()</code></a>
 to convert the result into network-byte-order.
 </p>
 </dd></dl>
@@ -2591,7 +2591,7 @@ UINT32 <b>WinDivertHelperNtohl</b>(
 UINT64 <b>WinDivertHelperNtohll</b>(
     __in UINT64 x
 );
-void <b>WinDivertHelperNtohIpv6Address</b>(
+void <b>WinDivertHelperNtohIPv6Address</b>(
     __in const UINT *inAddr,
     __out UINT *outAddr
 );
@@ -2626,7 +2626,7 @@ UINT32 <b>WinDivertHelperHtonl</b>(
 UINT64 <b>WinDivertHelperHtonll</b>(
     __in UINT64 x
 );
-void <b>WinDivertHelperHtonIpv6Address</b>(
+void <b>WinDivertHelperHtonIPv6Address</b>(
     __in const UINT *inAddr,
     __out UINT *outAddr
 );
@@ -2849,11 +2849,11 @@ The possible macros are:
 for the <code>SOCKET</code> layer, or
 <code>WINDIVERT_EVENT_REFLECT_CLOSE</code> for the <code>REFLECT</code>
 layer.</td></tr>
-<tr><td><code>NETWORK</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_NETWORK</code></td></tr>
-<tr><td><code>NETWORK_FORWARD</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_NETWORK_FORWARD</code></td></tr>
-<tr><td><code>FLOW</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_FLOW</code></td></tr>
-<tr><td><code>SOCKET</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_SOCKET</code></td></tr>
-<tr><td><code>REFLECT</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW_REFLECT</code></td></tr>
+<tr><td><code>NETWORK</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_NETWORK</code></td></tr>
+<tr><td><code>NETWORK_FORWARD</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_NETWORK_FORWARD</code></td></tr>
+<tr><td><code>FLOW</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_FLOW</code></td></tr>
+<tr><td><code>SOCKET</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_SOCKET</code></td></tr>
+<tr><td><code>REFLECT</code></td><td></td><td></td><td></td><td></td><td>&#10004;</td><td><code>WINDIVERT_LAYER_REFLECT</code></td></tr>
 </table>
 </center>
 
diff --git a/include/windivert.h b/include/windivert.h
index 14811fc..6407d76 100644
--- a/include/windivert.h
+++ b/include/windivert.h
@@ -610,6 +610,16 @@ extern WINDIVERTEXPORT void WinDivertHelperHtonIPv6Address(
     __in        const UINT *inAddr,
     __out       UINT *outAddr);
 
+/*
+ * Old names to be removed in the next version.
+ */
+extern WINDIVERTEXPORT void WinDivertHelperNtohIpv6Address(
+    __in        const UINT *inAddr,
+    __out       UINT *outAddr);
+extern WINDIVERTEXPORT void WinDivertHelperHtonIpv6Address(
+    __in        const UINT *inAddr,
+    __out       UINT *outAddr);
+
 #endif      /* WINDIVERT_KERNEL */
 
 #ifdef __cplusplus