diff --git a/src/test/java/org/qortal/test/naming/MiscTests.java b/src/test/java/org/qortal/test/naming/MiscTests.java
index 23e0e720..625130e1 100644
--- a/src/test/java/org/qortal/test/naming/MiscTests.java
+++ b/src/test/java/org/qortal/test/naming/MiscTests.java
@@ -13,6 +13,7 @@ import org.qortal.data.transaction.UpdateNameTransactionData;
 import org.qortal.repository.DataException;
 import org.qortal.repository.Repository;
 import org.qortal.repository.RepositoryManager;
+import org.qortal.test.common.BlockUtils;
 import org.qortal.test.common.Common;
 import org.qortal.test.common.TransactionUtils;
 import org.qortal.test.common.transaction.TestTransaction;
@@ -32,7 +33,7 @@ public class MiscTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String name = "initial-name";
-			String data = "initial-data";
+			String data = "{\"age\":30}";
 
 			RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -51,7 +52,7 @@ public class MiscTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String name = "test-name";
-			String data = "{}";
+			String data = "{\"age\":30}";
 
 			RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -98,7 +99,7 @@ public class MiscTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String name = "test-name";
-			String data = "{}";
+			String data = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -127,7 +128,7 @@ public class MiscTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String name = alice.getAddress();
-			String data = "{}";
+			String data = "{\"age\":30}";
 
 			RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
 			Transaction transaction = Transaction.fromData(repository, transactionData);
@@ -145,7 +146,7 @@ public class MiscTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String name = "test-name";
-			String data = "{}";
+			String data = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -162,4 +163,61 @@ public class MiscTests extends Common {
 		}
 	}
 
+	// test registering and then orphaning
+	@Test
+	public void testRegisterNameAndOrphan() throws DataException {
+		try (final Repository repository = RepositoryManager.getRepository()) {
+
+			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
+			String name = "test-name";
+			String data = "{\"age\":30}";
+
+			// Ensure the name doesn't exist
+			assertNull(repository.getNameRepository().fromName(name));
+
+			// Register the name
+			RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
+			TransactionUtils.signAndMint(repository, transactionData, alice);
+
+			// Ensure the name exists and the data is correct
+			assertEquals(data, repository.getNameRepository().fromName(name).getData());
+
+			// Orphan the latest block
+			BlockUtils.orphanBlocks(repository, 1);
+
+			// Ensure the name doesn't exist once again
+			assertNull(repository.getNameRepository().fromName(name));
+		}
+	}
+
+	// test registering and then orphaning multiple times (to simulate several re-orgs)
+	@Test
+	public void testMultipleRegisterNameAndOrphan() throws DataException {
+		try (final Repository repository = RepositoryManager.getRepository()) {
+
+			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
+			String name = "test-name";
+			String data = "{\"age\":30}";
+
+			for (int i = 0; i < 10; i++) {
+
+				// Ensure the name doesn't exist
+				assertNull(repository.getNameRepository().fromName(name));
+
+				// Register the name
+				RegisterNameTransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), name, data);
+				TransactionUtils.signAndMint(repository, transactionData, alice);
+
+				// Ensure the name exists and the data is correct
+				assertEquals(data, repository.getNameRepository().fromName(name).getData());
+
+				// Orphan the latest block
+				BlockUtils.orphanBlocks(repository, 1);
+
+				// Ensure the name doesn't exist once again
+				assertNull(repository.getNameRepository().fromName(name));
+			}
+		}
+	}
+
 }
diff --git a/src/test/java/org/qortal/test/naming/UpdateTests.java b/src/test/java/org/qortal/test/naming/UpdateTests.java
index ffbf7177..134d3358 100644
--- a/src/test/java/org/qortal/test/naming/UpdateTests.java
+++ b/src/test/java/org/qortal/test/naming/UpdateTests.java
@@ -29,7 +29,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, initialTransactionData, alice);
@@ -68,7 +68,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, initialTransactionData, alice);
@@ -108,7 +108,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData initialTransactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, initialTransactionData, alice);
@@ -171,7 +171,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -217,7 +217,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -251,7 +251,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, transactionData, alice);
@@ -294,7 +294,7 @@ public class UpdateTests extends Common {
 			// Register-name
 			PrivateKeyAccount alice = Common.getTestAccount(repository, "alice");
 			String initialName = "initial-name";
-			String initialData = "initial-data";
+			String initialData = "{\"age\":30}";
 
 			TransactionData transactionData = new RegisterNameTransactionData(TestTransaction.generateBase(alice), initialName, initialData);
 			TransactionUtils.signAndMint(repository, transactionData, alice);