11 files changed, 10 insertions, 10 deletions
diff --git a/data/test/test1.rp b/data/test/test1-empty.rp
index f736b8e..f736b8e 100644
--- a/data/test/test1.rp
+++ b/data/test/test1-empty.rp
diff --git a/data/test/test10.rp b/data/test/test10-guard.rp
index a647a3a..a647a3a 100644
--- a/data/test/test10.rp
+++ b/data/test/test10-guard.rp
diff --git a/data/test/test11.rp b/data/test/test11-bodyinlinemulti.rp
index 35eb329..35eb329 100644
--- a/data/test/test11.rp
+++ b/data/test/test11-bodyinlinemulti.rp
diff --git a/data/test/test2.rp b/data/test/test2-singlereplace.rp
index ea05d12..ea05d12 100644
--- a/data/test/test2.rp
+++ b/data/test/test2-singlereplace.rp
diff --git a/data/test/test3.rp b/data/test/test3-multireplace.rp
index 8121c8c..8121c8c 100644
--- a/data/test/test3.rp
+++ b/data/test/test3-multireplace.rp
diff --git a/data/test/test4.rp b/data/test/test4-implicitorder.rp
index 28b14d5..28b14d5 100644
--- a/data/test/test4.rp
+++ b/data/test/test4-implicitorder.rp
diff --git a/data/test/test5.rp b/data/test/test5-explicitorder.rp
index 2ee18ce..2ee18ce 100644
--- a/data/test/test5.rp
+++ b/data/test/test5-explicitorder.rp
diff --git a/data/test/test6.rp b/data/test/test6-staging.rp
index 34fd9dd..34fd9dd 100644
--- a/data/test/test6.rp
+++ b/data/test/test6-staging.rp
diff --git a/data/test/test7.rp b/data/test/test7-error.rp
index 3a8f995..3a8f995 100644
--- a/data/test/test7.rp
+++ b/data/test/test7-error.rp
diff --git a/data/test/test8.rp b/data/test/test8-globals.rp
index 8fd2165..8fd2165 100644
--- a/data/test/test8.rp
+++ b/data/test/test8-globals.rp
diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java
index 43ae68a..f88279b 100644
--- a/src/test/java/bjc/everge/ReplPairTest.java
+++ b/src/test/java/bjc/everge/ReplPairTest.java
@@ -22,7 +22,7 @@ public class ReplPairTest {
 	@Test
 	public void testLoadFile() {
 		List<ReplPair> lrp = null;
-		String fName = "data/test/test1.rp";
+		String fName = "data/test/test1-empty.rp";
 
 		try (FileInputStream fis = new FileInputStream(fName);
 				Scanner scn = new Scanner(fis)) {
@@ -36,28 +36,28 @@ public class ReplPairTest {
 
 	@Test
 	public void testSingleReplace() {
-		assertMultiReplace("data/test/test2.rp", "test2", "test1", "test2", "test2");
+		assertMultiReplace("data/test/test2-singlereplace.rp", "test2", "test1", "test2", "test2");
 	}
 
 	@Test
 	public void testMultiReplace() {
-		assertMultiReplace("data/test/test3.rp", "A B C", "a b c", "A A B", "a a b",
+		assertMultiReplace("data/test/test3-multireplace.rp", "A B C", "a b c", "A A B", "a a b",
 				"AAB", "aab");
 	}
 
 	@Test
 	public void testReplaceOrder() {
-		assertMultiReplace("data/test/test4.rp", "a", "a", "d", "ab");
+		assertMultiReplace("data/test/test4-implicitorder.rp", "a", "a", "d", "ab");
 	}
 
 	@Test
 	public void testReplaceExpOrder() {
-		assertMultiReplace(false, "data/test/test5.rp", "a", "a", "aa", "ab");
+		assertMultiReplace(false, "data/test/test5-explicitorder.rp", "a", "a", "aa", "ab");
 	}
 
 	@Test
 	public void testStaging() {
-		assertMultiReplace("data/test/test6.rp", "c", "a", "y2", "x");
+		assertMultiReplace("data/test/test6-staging.rp", "c", "a", "y2", "x");
 	}
 
 	@Test
@@ -67,7 +67,7 @@ public class ReplPairTest {
 				+ " replacement body for raw name 'a'"
 				+ "\n\t\tContext: No associated line";
 
-		assertThrownMessage(msg, "data/test/test7.rp");
+		assertThrownMessage(msg, "data/test/test7-error.rp");
 	}
 
 	@Test
@@ -83,17 +83,17 @@ public class ReplPairTest {
 
 	@Test
 	public void testGlobals() {
-		assertMultiReplace("data/test/test8.rp", "b1d\n1d\n1b1", "acca");
+		assertMultiReplace("data/test/test8-globals.rp", "b1d\n1d\n1b1", "acca");
 	}
 
 	@Test
 	public void testGuards() {
-		assertMultiReplace("data/test/test10.rp", "a", "a", "bbb", "aaa");
+		assertMultiReplace("data/test/test10-guard.rp", "a", "a", "bbb", "aaa");
 	}
 	
 	@Test
 	public void testMultiControl() {
-		assertMultiReplace("data/test/test11.rp", "bc", "a", "z\na", "d", "m", "po");
+		assertMultiReplace("data/test/test11-bodyinlinemulti.rp", "bc", "a", "z\na", "d", "m", "po");
 		
 		// NOTE Uncomment when :EndingSlash is fixed 
 		//assertMultiReplace("data/test/test11.rp", "q\\", "FG");