diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java
index 6d92fece0..498b00b03 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Integer64Type.java
@@ -52,15 +52,14 @@ package org.hl7.fhir.r5.model;
  */
 
 
+import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import org.hl7.fhir.instance.model.api.IBaseIntegerDatatype;
 
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-
 /**
- * Primitive type "integer" in FHIR: A signed 32-bit integer
+ * Primitive type "integer" in FHIR: A signed 64-bit integer
  */
-@DatatypeDef(name = "integer")
-public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ {
+@DatatypeDef(name = "integer64")
+public class Integer64Type extends PrimitiveType<Long> implements IBaseIntegerDatatype {
 
 	private static final long serialVersionUID = 3L;
 
diff --git a/org.hl7.fhir.r5/src/main/resources/logback-test.xml b/org.hl7.fhir.r5/src/main/resources/logback-test.xml
deleted file mode 100644
index 1c8de9da3..000000000
--- a/org.hl7.fhir.r5/src/main/resources/logback-test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<configuration scan="true" scanPeriod="30 seconds">
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>INFO</level>
-		</filter>
-		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<root level="info">
-		<appender-ref ref="STDOUT" />
-	</root>
-
-</configuration>
\ No newline at end of file