diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/SearchHl7OrgDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/SearchHl7OrgDstu2Test.java
index 0e208d42a37..9add56b2035 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/SearchHl7OrgDstu2Test.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/SearchHl7OrgDstu2Test.java
@@ -25,7 +25,7 @@ import org.junit.Test;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.primitive.InstantDt;
 import ca.uhn.fhir.rest.annotation.Search;
-import ca.uhn.fhir.util.PatternMatcher;
+import ca.uhn.fhir.util.PatternMatcherB;
 import ca.uhn.fhir.util.PortUtil;
 
 /**
@@ -85,7 +85,7 @@ public class SearchHl7OrgDstu2Test {
 		ourLog.info(responseContent);
 		
 		assertEquals(200, status.getStatusLine().getStatusCode());
-		assertThat(responseContent, PatternMatcher.pattern("id value..[0-9a-f-]+\\\""));
+		assertThat(responseContent, PatternMatcherB.pattern("id value..[0-9a-f-]+\\\""));
 	}
 
 	@Test
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalHl7OrgDstu2Test.java
similarity index 98%
rename from hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
rename to hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalHl7OrgDstu2Test.java
index da62fac8c39..3b078fbc8ff 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalTest.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/UpdateConditionalHl7OrgDstu2Test.java
@@ -41,10 +41,10 @@ import ca.uhn.fhir.util.PortUtil;
 /**
  * Created by dsotnikov on 2/25/2014.
  */
-public class UpdateConditionalTest {
+public class UpdateConditionalHl7OrgDstu2Test {
 	private static CloseableHttpClient ourClient;
 	private static String ourLastConditionalUrl;
-	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(UpdateConditionalTest.class);
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(UpdateConditionalHl7OrgDstu2Test.class);
 	private static int ourPort;
 	private static FhirContext ourCtx = FhirContext.forDstu2Hl7Org();
 	private static Server ourServer;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateDstu2Test.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateHl7OrgDstu2Test.java
similarity index 99%
rename from hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateDstu2Test.java
rename to hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateHl7OrgDstu2Test.java
index 409f0b482fb..8b5014717af 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateDstu2Test.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/rest/server/ValidateHl7OrgDstu2Test.java
@@ -40,7 +40,7 @@ import ca.uhn.fhir.util.PortUtil;
 /**
  * Created by dsotnikov on 2/25/2014.
  */
-public class ValidateDstu2Test {
+public class ValidateHl7OrgDstu2Test {
 	private static CloseableHttpClient ourClient;
 	private static EncodingEnum ourLastEncoding;
 	private static String ourLastResourceBody;
diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcher.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcherB.java
similarity index 92%
rename from hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcher.java
rename to hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcherB.java
index cf126c64ee7..814e6c009dd 100644
--- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcher.java
+++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/util/PatternMatcherB.java
@@ -9,7 +9,7 @@ import org.hamcrest.TypeSafeMatcher;
 /**
  * Tests if the argument is a {@link CharSequence} that matches a regular expression.
  */
-public class PatternMatcher extends TypeSafeMatcher<CharSequence> {
+public class PatternMatcherB extends TypeSafeMatcher<CharSequence> {
 
 	/**
 	 * Creates a matcher that matches if the examined {@link CharSequence} matches the specified regular expression.
@@ -42,12 +42,12 @@ public class PatternMatcher extends TypeSafeMatcher<CharSequence> {
 	 */
 	@Factory
 	public static Matcher<CharSequence> pattern(Pattern pattern) {
-		return new PatternMatcher(pattern);
+		return new PatternMatcherB(pattern);
 	}
 
 	private final Pattern pattern;
 
-	public PatternMatcher(Pattern pattern) {
+	public PatternMatcherB(Pattern pattern) {
 		this.pattern = pattern;
 	}