diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java
index 398b9ecef..2e1346654 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/StructureDefinition30_50.java
@@ -105,8 +105,8 @@ public class StructureDefinition30_50 {
         }
         if (src.hasType())
           tgt.setType(src.getType());
-        if (src.hasBaseDefinitionElement())
-            tgt.setBaseDefinitionElement((org.hl7.fhir.r5.model.CanonicalType) VersionConvertor_30_50.convertType(src.getBaseDefinitionElement()));
+        if (src.hasBaseDefinition())
+            tgt.setBaseDefinition(src.getBaseDefinition());
         if (src.hasDerivation())
             tgt.setDerivation(convertTypeDerivationRule(src.getDerivation()));
         if (src.hasSnapshot())
@@ -184,8 +184,8 @@ public class StructureDefinition30_50 {
         }
         if (src.hasType())
           tgt.setType(src.getType());
-        if (src.hasBaseDefinitionElement())
-            tgt.setBaseDefinitionElement((org.hl7.fhir.dstu3.model.UriType) VersionConvertor_30_50.convertType(src.getBaseDefinitionElement()));
+        if (src.hasBaseDefinition())
+            tgt.setBaseDefinition(src.getBaseDefinition());
         if (src.hasDerivation())
             tgt.setDerivation(convertTypeDerivationRule(src.getDerivation()));
         if (src.hasSnapshot())
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java
index 047341bfd..9d2ebae90 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Account.java
@@ -978,7 +978,7 @@ This period may be different to the coveragePeriod which is the duration of time
       return this.name != null && !this.name.isEmpty();
     }
 
-    public boolean hasName() { 
+    public boolean hasName() {
       return this.name != null && !this.name.isEmpty();
     }