diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in
index 5ca6d9d01..e48a82b8d 100644
--- a/share/qt/Info.plist.in
+++ b/share/qt/Info.plist.in
@@ -1,106 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
 <dict>
   <key>LSMinimumSystemVersion</key>
   <string>10.8.0</string>
 
   <key>LSArchitecturePriority</key>
   <array>
     <string>x86_64</string>
   </array>
 
   <key>CFBundleIconFile</key>
   <string>bitcoin.icns</string>
 
   <key>CFBundlePackageType</key>
   <string>APPL</string>
 
   <key>CFBundleGetInfoString</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@, Copyright © 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@</string>
 
   <key>CFBundleShortVersionString</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
 
   <key>CFBundleVersion</key>
   <string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@</string>
 
   <key>CFBundleSignature</key>
   <string>????</string>
 
   <key>CFBundleExecutable</key>
   <string>Bitcoin-Qt</string>
   
   <key>CFBundleName</key>
   <string>Bitcoin-Qt</string>
 
   <key>LSHasLocalizedDisplayName</key>
   <true/>
 
   <key>CFBundleIdentifier</key>
-  <string>org.bitcoinfoundation.Bitcoin-Qt</string>
+  <string>org.bitcoincash.Bitcoin-Qt</string>
 
   <key>CFBundleURLTypes</key>
   <array>
     <dict>
       <key>CFBundleTypeRole</key>
       <string>Editor</string>
       <key>CFBundleURLName</key>
-      <string>org.bitcoin.BitcoinPayment</string>
+      <string>org.bitcoincash.BitcoinPayment</string>
       <key>CFBundleURLSchemes</key>
       <array>
-        <string>bitcoin</string>
+        <string>bitcoincash</string>
       </array>
     </dict>
   </array>
 
   <key>UTExportedTypeDeclarations</key>
   <array>
     <dict>
       <key>UTTypeIdentifier</key>
-      <string>org.bitcoin.paymentrequest</string>
+      <string>org.bitcoincash.paymentrequest</string>
       <key>UTTypeDescription</key>
-      <string>Bitcoin payment request</string>
+      <string>Bitcoin Cash payment request</string>
       <key>UTTypeConformsTo</key>
       <array>
         <string>public.data</string>
       </array>
       <key>UTTypeTagSpecification</key>
       <dict>
         <key>public.mime-type</key>
-        <string>application/x-bitcoin-payment-request</string>
+        <string>application/bitcoincash-paymentrequest</string>
         <key>public.filename-extension</key>
         <array>
-          <string>bitcoinpaymentrequest</string>
+          <string>bitcoincashpaymentrequest</string>
         </array>
       </dict>
     </dict>
   </array>
 
   <key>CFBundleDocumentTypes</key>
   <array>
     <dict>
       <key>CFBundleTypeRole</key>
       <string>Editor</string>
       <key>LSItemContentTypes</key>
       <array>
-        <string>org.bitcoin.paymentrequest</string>
+        <string>org.bitcoincash.paymentrequest</string>
       </array>
       <key>LSHandlerRank</key>
       <string>Owner</string>
     </dict>
   </array>
 
   <key>NSPrincipalClass</key>
     <string>NSApplication</string>
 
   <key>NSHighResolutionCapable</key>
     <string>True</string>
 
   <key>LSAppNapIsDisabled</key>
     <string>True</string>
   
   <key>LSApplicationCategoryType</key>
     <string>public.app-category.finance</string>
 </dict>
 </plist>
diff --git a/src/qt/paymentrequest.proto b/src/qt/paymentrequest.proto
index d2721a34b..d0fcf27e8 100644
--- a/src/qt/paymentrequest.proto
+++ b/src/qt/paymentrequest.proto
@@ -1,48 +1,49 @@
 //
-// Simple Bitcoin Payment Protocol messages
+// Simple Bitcoin Cash Payment Protocol messages
+// based on Simple Bitcoin Payment Protocol
 //
 // Use fields 100+ for extensions;
 // to avoid conflicts, register extensions at:
-// https://en.bitcoin.it/wiki/Payment_Request
+// TODO (was: https://en.bitcoin.it/wiki/Payment_Request)
 //
 
 syntax = "proto2";
 
 package payments;
-option java_package = "org.bitcoin.protocols.payments";
+option java_package = "org.bitcoincash.protocols.payments";
 option java_outer_classname = "Protos";
 
-// Generalized form of "send payment to this/these bitcoin addresses"
+// Generalized form of "send payment to this/these bitcoin cash addresses"
 message Output {
 	optional uint64 amount = 1 [default = 0]; // amount is integer-number-of-satoshis
 	required bytes script = 2; // usually one of the standard Script forms
 }
 message PaymentDetails {
         optional string network = 1 [default = "main"]; // "main" or "test"
         repeated Output outputs = 2;        // Where payment should be sent
         required uint64 time = 3;           // Timestamp; when payment request created
         optional uint64 expires = 4;        // Timestamp; when this request should be considered invalid
         optional string memo = 5;           // Human-readable description of request for the customer
         optional string payment_url = 6;    // URL to send Payment and get PaymentACK
         optional bytes merchant_data = 7;   // Arbitrary data to include in the Payment message
 }
 message PaymentRequest {
         optional uint32 payment_details_version = 1 [default = 1];
         optional string pki_type = 2 [default = "none"];  // none / x509+sha256 / x509+sha1
         optional bytes pki_data = 3;                      // depends on pki_type
         required bytes serialized_payment_details = 4;    // PaymentDetails
         optional bytes signature = 5;                     // pki-dependent signature
 }
 message X509Certificates {
         repeated bytes certificate = 1;    // DER-encoded X.509 certificate chain
 }
 message Payment {
         optional bytes merchant_data = 1;  // From PaymentDetails.merchant_data
         repeated bytes transactions = 2;   // Signed transactions that satisfy PaymentDetails.outputs
         repeated Output refund_to = 3;     // Where to send refunds, if a refund is necessary
         optional string memo = 4;          // Human-readable message for the merchant
 }
 message PaymentACK {
         required Payment payment = 1;      // Payment message that triggered this ACK
         optional string memo = 2;          // human-readable message for customer
 }