diff --git a/src/main/java/org/qortal/network/RNSCommon.java b/src/main/java/org/qortal/network/RNSCommon.java
index c875db9e..73e024c8 100644
--- a/src/main/java/org/qortal/network/RNSCommon.java
+++ b/src/main/java/org/qortal/network/RNSCommon.java
@@ -5,12 +5,14 @@ public class RNSCommon {
     /**
      * Destination application name
      */
-    public static String APP_NAME = "qortal";
+    public static String MAINNET_APP_NAME = "qortal";      // production
+    public static String TESTNET_APP_NAME = "qortaltest";  // test net
 
     /**
      * Configuration path relative to the Qortal launch directory
      */
     public static String defaultRNSConfigPath = ".reticulum";
+    public static String defaultRNSConfigPathTestnet = ".reticulum_test";
 
     ///**
     // * Qortal RNS Destinations
diff --git a/src/main/java/org/qortal/network/RNSNetwork.java b/src/main/java/org/qortal/network/RNSNetwork.java
index 465495ed..60e73ec3 100644
--- a/src/main/java/org/qortal/network/RNSNetwork.java
+++ b/src/main/java/org/qortal/network/RNSNetwork.java
@@ -33,7 +33,7 @@ import lombok.Data;
 import lombok.Synchronized;
 
 import org.qortal.repository.DataException;
-//import org.qortal.settings.Settings;
+import org.qortal.settings.Settings;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -71,14 +71,15 @@ public class RNSNetwork {
 
     Reticulum reticulum;
     //private static final String APP_NAME = "qortal";
-    static final String APP_NAME = RNSCommon.APP_NAME;
-    static final String defaultConfigPath = ".reticulum"; // if empty will look in Reticulums default paths
+    static final String APP_NAME = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_APP_NAME: RNSCommon.MAINNET_APP_NAME;
+    //static final String defaultConfigPath = ".reticulum"; // if empty will look in Reticulums default paths
+    static final String defaultConfigPath = Settings.getInstance().isTestNet() ? RNSCommon.defaultRNSConfigPathTestnet: RNSCommon.defaultRNSConfigPath;
     //static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
-    //private final String defaultConfigPath = Settings.getInstance().getDefaultRNSConfigPathForReticulum();
+    //private final String defaultConfigPath = Settings.getInstance().getReticulumDefaultConfigPath();
     private static Integer MAX_PEERS = 12;
-    //private final Integer MAX_PEERS = Settings.getInstance().getMaxReticulumPeers();
+    //private final Integer MAX_PEERS = Settings.getInstance().getReticulumMaxPeers();
     private static Integer MIN_DESIRED_PEERS = 3;
-    //private final Integer MIN_DESIRED_PEERS = Settings.getInstance().getMinDesiredPeers();
+    //private final Integer MIN_DESIRED_PEERS = Settings.getInstance().getReticulumMinDesiredPeers();
     Identity serverIdentity;
     public Destination baseDestination;
     private volatile boolean isShuttingDown = false;
@@ -155,13 +156,12 @@ public class RNSNetwork {
             APP_NAME,
             "core"
         );
-        //// idea for other entry point
+        //// idea for other entry point (needs AnnounceHandler with appropriate aspect)
         //dataDestination = new Destination(
         //    serverIdentity,
         //    Direction.IN,
         //    DestinationType.SINGLE,
         //    APP_NAME,
-        //    "core",
         //    "qdn"
         //);
         log.info("Destination {} {} running", Hex.encodeHexString(baseDestination.getHash()), baseDestination.getName());
@@ -322,12 +322,13 @@ public class RNSNetwork {
     //    getBaseDestination().announce();
     //}
 
-    //@Slf4j
     private class QAnnounceHandler implements AnnounceHandler {
         @Override
         public String getAspectFilter() {
             // handle all announces
-            return null;
+            //return null;
+            // handle cortal.core announces
+            return "qortal.core";
         }
 
         @Override
diff --git a/src/main/java/org/qortal/network/RNSPeer.java b/src/main/java/org/qortal/network/RNSPeer.java
index 3bde7c0a..37f8db14 100644
--- a/src/main/java/org/qortal/network/RNSPeer.java
+++ b/src/main/java/org/qortal/network/RNSPeer.java
@@ -31,6 +31,8 @@ import static io.reticulum.link.LinkStatus.ACTIVE;
 import static io.reticulum.identity.IdentityKnownDestination.recall;
 //import static io.reticulum.identity.IdentityKnownDestination.recallAppData;
 
+import org.qortal.settings.Settings;
+
 import java.nio.charset.StandardCharsets;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import org.apache.commons.codec.binary.Hex;
@@ -45,8 +47,7 @@ import lombok.AccessLevel;
 @Slf4j
 public class RNSPeer {
 
-    //static final String APP_NAME = "qortal";
-    //static final String APP_NAME = RNSCommon.APP_NAME;
+    static final String APP_NAME = Settings.getInstance().isTestNet() ? RNSCommon.TESTNET_APP_NAME: RNSCommon.MAINNET_APP_NAME;
     //static final String defaultConfigPath = new String(".reticulum");
     //static final String defaultConfigPath = RNSCommon.defaultRNSConfigPath;
 
@@ -75,7 +76,7 @@ public class RNSPeer {
             this.serverIdentity,
             Direction.OUT, 
             DestinationType.SINGLE,
-            RNSNetwork.APP_NAME,
+            APP_NAME,
             "core"
         );
         peerDestination.setProofStrategy(ProofStrategy.PROVE_ALL);
@@ -221,7 +222,7 @@ public class RNSPeer {
     public void linkResourceTransferStarted(Resource resource) {
         log.debug("Resource transfer started");
     }
-    public void linkResourceTransferComcluded(Resource resource) {
+    public void linkResourceTransferConcluded(Resource resource) {
         log.debug("Resource transfer complete");
     }