diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index 716f3c9d..bafe8564 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -68,11 +68,11 @@ following table:
 {|
 | <tt>btcpop:</tt> URI parameter || <tt>bitcoin:</tt> URI parameter || BIP70 PaymentDetails data
 |-
-| <tt>label</tt>                 || <tt>label</tt>                  || <tt>merchant_data</tt>
+| <tt>label</tt>                 || <tt>label</tt>                  || <tt>memo</tt>
 |-
 | <tt>amount</tt>                || <tt>amount</tt>                 || <tt>sum of outputs.amount</tt>
 |-
-| <tt>message</tt>               || <tt>message</tt>                || <tt>memo</tt>
+| <tt>message</tt>               || <tt>message</tt>                || <tt>-</tt>
 |}
 
 The <tt>txid</tt> parameter value must match the transaction hash of
@@ -104,9 +104,9 @@ not make their <tt>p</tt> parameter unnecessarily long.
 
 Wallet implementations must support the <tt>http:</tt> and
 <tt>https:</tt> schemes in which case <tt>POST</tt> method must be
-used. The content type of the POST request must be set to
-
- application/bitcoin-pop
+used. The PoP is sent as a binary serialized transaction. The content
+type of the POST request must be set to
+<tt>application/bitcoin-pop</tt>
 
 == Examples ==