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..1c6be9c93 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,14 +52,12 @@ package org.hl7.fhir.r5.model;
  */
 
 
-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
  */
-@DatatypeDef(name = "integer")
+@DatatypeDef(name = "integer64")
 public class Integer64Type extends PrimitiveType<Long> /* implements IBaseInteger64Datatype */ {
 
 	private static final long serialVersionUID = 3L;
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java
index 994e73663..6343933eb 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java
@@ -209,7 +209,7 @@ public class Narrative extends BaseNarrative implements INarrative {
     /**
      * The actual narrative content, a stripped down version of XHTML.
      */
-    @Child(name = "div", type = {XhtmlType.class}, order=1, min=1, max=1, modifier=false, summary=false)
+    @Child(name = "div", type = {XhtmlNode.class}, order=1, min=1, max=1, modifier=false, summary=false)
     @Description(shortDefinition="Limited xhtml content", formalDefinition="The actual narrative content, a stripped down version of XHTML." )
     protected XhtmlNode div;