diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java
index 028b2c56d2c..6de4af611ed 100644
--- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java
+++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java
@@ -88,16 +88,6 @@ public abstract class AbstractJaxRsPageProvider extends AbstractJaxRsProvider im
 		}
 	}
 
-	/**
-	 * Default: an empty list of interceptors
-	 * 
-	 * @see ca.uhn.fhir.rest.server.IRestfulServer#getInterceptors()
-	 */
-	@Override
-	public List<IServerInterceptor> getInterceptors() {
-		return Collections.emptyList();
-	}
-
 	/**
 	 * Default: no paging provider
 	 */
diff --git a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java
index 18a10c399ef..91b76b1160c 100644
--- a/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java
+++ b/hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java
@@ -270,16 +270,6 @@ public abstract class AbstractJaxRsResourceProvider<R extends IResource> extends
 		return getBindings().getBinding(restOperation, theBindingKey);
 	}
 
-	/**
-	 * Default: an empty list of interceptors
-	 * 
-	 * @see ca.uhn.fhir.rest.server.IRestfulServer#getInterceptors()
-	 */
-	@Override
-	public List<IServerInterceptor> getInterceptors() {
-		return Collections.emptyList();
-	}
-
 	/**
 	 * Default: no paging provider
 	 */
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ModelScannerDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ModelScannerDstu3Test.java
index da8639bda10..31579516340 100644
--- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ModelScannerDstu3Test.java
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ModelScannerDstu3Test.java
@@ -68,7 +68,7 @@ public class ModelScannerDstu3Test {
 	public void testScanExtensionTypes() throws DataFormatException {
 
 		FhirContext ctx = FhirContext.forDstu3();
-		RuntimeResourceDefinition def = ctx.getResourceDefinition(ResourceWithExtensionsA.class);
+		RuntimeResourceDefinition def = ctx.getResourceDefinition(ResourceWithExtensionsDstu3A.class);
 
 		assertEquals(RuntimeChildCompositeDatatypeDefinition.class, def.getChildByNameOrThrowDataFormatException("identifier").getClass());
 
diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsDstu3A.java
similarity index 98%
rename from hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
rename to hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsDstu3A.java
index d6474d04028..04c0f9528af 100644
--- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsA.java
+++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/context/ResourceWithExtensionsDstu3A.java
@@ -24,7 +24,7 @@ import ca.uhn.fhir.model.api.annotation.Extension;
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 
 @ResourceDef(name = "ResourceWithExtensionsA", id="0001")
-public class ResourceWithExtensionsA extends BaseResource {
+public class ResourceWithExtensionsDstu3A extends BaseResource {
 
 	/*
 	 * NB: several unit tests depend on the structure here