diff --git a/core/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentProtocol.java b/core/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentProtocol.java
index c7e89556..dfc1ce02 100644
--- a/core/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentProtocol.java
+++ b/core/src/main/java/com/dogecoin/dogecoinj/protocols/payments/PaymentProtocol.java
@@ -46,10 +46,10 @@ import java.util.List;
  */
 public class PaymentProtocol {
 
-    // MIME types as defined in BIP71.
-    public static final String MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest";
-    public static final String MIMETYPE_PAYMENT = "application/bitcoin-payment";
-    public static final String MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack";
+    // MIME types as defined in DIP71.
+    public static final String MIMETYPE_PAYMENTREQUEST = "application/vnd.doge.payment.request";
+    public static final String MIMETYPE_PAYMENT = "application/vnd.doge.payment.payment";
+    public static final String MIMETYPE_PAYMENTACK = "application/vnd.doge.payment.ack";
 
     /**
      * Create a payment request with one standard pay to address output. You may want to sign the request using
diff --git a/core/src/main/java/com/dogecoin/dogecoinj/uri/BitcoinURI.java b/core/src/main/java/com/dogecoin/dogecoinj/uri/BitcoinURI.java
index 755a3e97..66d1574e 100644
--- a/core/src/main/java/com/dogecoin/dogecoinj/uri/BitcoinURI.java
+++ b/core/src/main/java/com/dogecoin/dogecoinj/uri/BitcoinURI.java
@@ -93,7 +93,7 @@ public class BitcoinURI {
     public static final String FIELD_ADDRESS = "address";
     public static final String FIELD_PAYMENT_REQUEST_URL = "r";
 
-    public static final String BITCOIN_SCHEME = "bitcoin";
+    public static final String BITCOIN_SCHEME = "dogecoin";
     private static final String ENCODED_SPACE_CHARACTER = "%20";
     private static final String AMPERSAND_SEPARATOR = "&";
     private static final String QUESTION_MARK_SEPARATOR = "?";
@@ -144,10 +144,10 @@ public class BitcoinURI {
         // the & (%26) in Tom and Jerry gets interpreted as a separator and the label then gets parsed
         // as 'Tom ' instead of 'Tom & Jerry')
         String schemeSpecificPart;
-        if (input.startsWith("bitcoin://")) {
-            schemeSpecificPart = input.substring("bitcoin://".length());
-        } else if (input.startsWith("bitcoin:")) {
-            schemeSpecificPart = input.substring("bitcoin:".length());
+        if (input.startsWith("dogecoin://")) {
+            schemeSpecificPart = input.substring("dogecoin://".length());
+        } else if (input.startsWith("dogecoin:")) {
+            schemeSpecificPart = input.substring("dogecoin:".length());
         } else {
             throw new BitcoinURIParseException("Unsupported URI scheme: " + uri.getScheme());
         }
diff --git a/core/src/main/java/com/dogecoin/dogecoinj/utils/BlockFileLoader.java b/core/src/main/java/com/dogecoin/dogecoinj/utils/BlockFileLoader.java
index c950e0b2..42b7c050 100644
--- a/core/src/main/java/com/dogecoin/dogecoinj/utils/BlockFileLoader.java
+++ b/core/src/main/java/com/dogecoin/dogecoinj/utils/BlockFileLoader.java
@@ -53,11 +53,11 @@ public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
         String defaultDataDir;
         String OS = System.getProperty("os.name").toLowerCase();
         if (OS.indexOf("win") >= 0) {
-            defaultDataDir = System.getenv("APPDATA") + "\\.bitcoin\\blocks\\";
+            defaultDataDir = System.getenv("APPDATA") + "\\.dogecoin\\blocks\\";
         } else if (OS.indexOf("mac") >= 0 || (OS.indexOf("darwin") >= 0)) {
-            defaultDataDir = System.getProperty("user.home") + "/Library/Application Support/Bitcoin/blocks/";
+            defaultDataDir = System.getProperty("user.home") + "/Library/Application Support/Dogecoin/blocks/";
         } else {
-            defaultDataDir = System.getProperty("user.home") + "/.bitcoin/blocks/";
+            defaultDataDir = System.getProperty("user.home") + "/.dogecoin/blocks/";
         }
         
         List<File> list = new LinkedList<File>();
diff --git a/core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultCoinSelector.java b/core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultCoinSelector.java
index c8d7ab16..f11b4b51 100644
--- a/core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultCoinSelector.java
+++ b/core/src/main/java/com/dogecoin/dogecoinj/wallet/DefaultCoinSelector.java
@@ -88,6 +88,6 @@ public class DefaultCoinSelector implements CoinSelector {
                confidence.getSource().equals(TransactionConfidence.Source.SELF) &&
                // In regtest mode we expect to have only one peer, so we won't see transactions propagate.
                // TODO: The value 1 below dates from a time when transactions we broadcast *to* were counted, set to 0
-               (confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get());
+               (confidence.numBroadcastPeers() > 1 ); //|| tx.getParams() == RegTestParams.get());
     }
 }