Merge pull request #1389 from hapifhir/2023-08-gg-combine-fixes

2023 08 gg combine fixes

org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/CPTImporter.java

@@ -86,7 +86,8 @@ public class CPTImporter {
     new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(dst), cs); 
     produceDB(Utilities.changeFileExt(dst, ".db"), cs);
     
-    cs.getConcept().removeIf(cc -> !Utilities.existsInList(cc.getCode(), "metadata-kinds", "metadata-designations", "99202", "99203", "25", "P1"));
+    cs.setContent(CodeSystemContentMode.FRAGMENT);
+    cs.getConcept().removeIf(cc -> !Utilities.existsInList(cc.getCode(), "metadata-kinds", "metadata-designations", "99202", "99203", "0001A", "25", "P1", "1P", "F1"));
     new JsonParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(Utilities.changeFileExt(dst, "-fragment.json")), cs); 
     produceDB(Utilities.changeFileExt(dst, "-fragment.db"), cs);
   }

org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaResourceGenerator.java

@@ -1083,7 +1083,7 @@ private void generatePropertyMaker(Analysis analysis, TypeInfo ti, String indent
     first = false;
     write(           "if (name.equals(\""+namet+"\")) {\r\n");
     if (isPrimitive(e.typeSummary()) || e.typeSummary().startsWith("canonical("))
-      write(indent+"      throw new FHIRException(\"Cannot call addChild on a primitive type "+parent+"."+e.getName()+"\");\r\n"); 
+      write(indent+"      throw new FHIRException(\"Cannot call addChild on a singleton property "+parent+"."+e.getName()+"\");\r\n"); 
     else if (isAbstract(e.typeSummary()))
       write(indent+"      throw new FHIRException(\"Cannot call addChild on an abstract type "+parent+"."+e.getName()+"\");\r\n"); 
     else if (e.unbounded()) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Account.java

@@ -782,12 +782,12 @@ public class Account extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Account.name");
+      throw new FHIRException("Cannot call addChild on a singleton property Account.name");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Account.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Account.status");
     } else if (name.equals("activePeriod")) {
       this.activePeriod = new Period();
       return this.activePeriod;
@@ -807,7 +807,7 @@ public class Account extends DomainResource {
       this.owner = new Reference();
       return this.owner;
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Account.description");
+      throw new FHIRException("Cannot call addChild on a singleton property Account.description");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Address.java

@@ -1011,23 +1011,23 @@ public class Address extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("use")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.use");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.use");
     } else if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.type");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.type");
     } else if (name.equals("text")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.text");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.text");
     } else if (name.equals("line")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.line");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.line");
     } else if (name.equals("city")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.city");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.city");
     } else if (name.equals("district")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.district");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.district");
     } else if (name.equals("state")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.state");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.state");
     } else if (name.equals("postalCode")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.postalCode");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.postalCode");
     } else if (name.equals("country")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Address.country");
+      throw new FHIRException("Cannot call addChild on a singleton property Address.country");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/AllergyIntolerance.java

@@ -1443,15 +1443,15 @@ public class AllergyIntolerance extends DomainResource {
         this.substance = new CodeableConcept();
         return this.substance;
       } else if (name.equals("certainty")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.certainty");
+        throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.certainty");
       } else if (name.equals("manifestation")) {
         return addManifestation();
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.description");
+        throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.description");
       } else if (name.equals("onset")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.onset");
+        throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.onset");
       } else if (name.equals("severity")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.severity");
+        throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.severity");
       } else if (name.equals("exposureRoute")) {
         this.exposureRoute = new CodeableConcept();
         return this.exposureRoute;
@@ -2433,9 +2433,9 @@ public class AllergyIntolerance extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("onset")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.onset");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.onset");
     } else if (name.equals("recordedDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.recordedDate");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.recordedDate");
     } else if (name.equals("recorder")) {
       this.recorder = new Reference();
       return this.recorder;
@@ -2449,15 +2449,15 @@ public class AllergyIntolerance extends DomainResource {
       this.substance = new CodeableConcept();
       return this.substance;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.status");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.status");
     } else if (name.equals("criticality")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.criticality");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.criticality");
     } else if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.type");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.type");
     } else if (name.equals("category")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.category");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.category");
     } else if (name.equals("lastOccurence")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AllergyIntolerance.lastOccurence");
+      throw new FHIRException("Cannot call addChild on a singleton property AllergyIntolerance.lastOccurence");
     } else if (name.equals("note")) {
       this.note = new Annotation();
       return this.note;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Annotation.java

@@ -270,9 +270,9 @@ public class Annotation extends Type implements ICompositeType {
       this.author = new StringType();
       return this.author;
     } else if (name.equals("time")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Annotation.time");
+      throw new FHIRException("Cannot call addChild on a singleton property Annotation.time");
     } else if (name.equals("text")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Annotation.text");
+      throw new FHIRException("Cannot call addChild on a singleton property Annotation.text");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Appointment.java

@@ -853,9 +853,9 @@ public class Appointment extends DomainResource {
         this.actor = new Reference();
         return this.actor;
       } else if (name.equals("required")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Appointment.required");
+        throw new FHIRException("Cannot call addChild on a singleton property Appointment.required");
       } else if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Appointment.status");
+        throw new FHIRException("Cannot call addChild on a singleton property Appointment.status");
       } else
         return super.addChild(name);
     }
@@ -1730,7 +1730,7 @@ public class Appointment extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.status");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
@@ -1738,19 +1738,19 @@ public class Appointment extends DomainResource {
       this.reason = new CodeableConcept();
       return this.reason;
     } else if (name.equals("priority")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.priority");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.priority");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.description");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.description");
     } else if (name.equals("start")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.start");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.start");
     } else if (name.equals("end")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.end");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.end");
     } else if (name.equals("minutesDuration")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.minutesDuration");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.minutesDuration");
     } else if (name.equals("slot")) {
       return addSlot();
     } else if (name.equals("comment")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Appointment.comment");
+      throw new FHIRException("Cannot call addChild on a singleton property Appointment.comment");
     } else if (name.equals("participant")) {
       return addParticipant();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/AppointmentResponse.java

@@ -824,18 +824,18 @@ public class AppointmentResponse extends DomainResource {
       this.appointment = new Reference();
       return this.appointment;
     } else if (name.equals("start")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AppointmentResponse.start");
+      throw new FHIRException("Cannot call addChild on a singleton property AppointmentResponse.start");
     } else if (name.equals("end")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AppointmentResponse.end");
+      throw new FHIRException("Cannot call addChild on a singleton property AppointmentResponse.end");
     } else if (name.equals("participantType")) {
       return addParticipantType();
     } else if (name.equals("actor")) {
       this.actor = new Reference();
       return this.actor;
     } else if (name.equals("participantStatus")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AppointmentResponse.participantStatus");
+      throw new FHIRException("Cannot call addChild on a singleton property AppointmentResponse.participantStatus");
     } else if (name.equals("comment")) {
-      throw new FHIRException("Cannot call addChild on a primitive type AppointmentResponse.comment");
+      throw new FHIRException("Cannot call addChild on a singleton property AppointmentResponse.comment");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Attachment.java

@@ -613,21 +613,21 @@ public class Attachment extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("contentType")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.contentType");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.contentType");
     } else if (name.equals("language")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.language");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.language");
     } else if (name.equals("data")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.data");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.data");
     } else if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.url");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.url");
     } else if (name.equals("size")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.size");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.size");
     } else if (name.equals("hash")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.hash");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.hash");
     } else if (name.equals("title")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.title");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.title");
     } else if (name.equals("creation")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Attachment.creation");
+      throw new FHIRException("Cannot call addChild on a singleton property Attachment.creation");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/AuditEvent.java

@@ -999,13 +999,13 @@ public class AuditEvent extends DomainResource {
       } else if (name.equals("subtype")) {
         return addSubtype();
       } else if (name.equals("action")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.action");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.action");
       } else if (name.equals("dateTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.dateTime");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.dateTime");
       } else if (name.equals("outcome")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.outcome");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.outcome");
       } else if (name.equals("outcomeDesc")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.outcomeDesc");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.outcomeDesc");
       } else if (name.equals("purposeOfEvent")) {
         return addPurposeOfEvent();
       } else
@@ -1772,16 +1772,16 @@ public class AuditEvent extends DomainResource {
         this.userId = new Identifier();
         return this.userId;
       } else if (name.equals("altId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.altId");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.altId");
       } else if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.name");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.name");
       } else if (name.equals("requestor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.requestor");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.requestor");
       } else if (name.equals("location")) {
         this.location = new Reference();
         return this.location;
       } else if (name.equals("policy")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.policy");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.policy");
       } else if (name.equals("media")) {
         this.media = new Coding();
         return this.media;
@@ -2034,9 +2034,9 @@ public class AuditEvent extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("address")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.address");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.address");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.type");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.type");
       } else
         return super.addChild(name);
     }
@@ -2279,7 +2279,7 @@ public class AuditEvent extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("site")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.site");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.site");
       } else if (name.equals("identifier")) {
         this.identifier = new Identifier();
         return this.identifier;
@@ -2910,11 +2910,11 @@ public class AuditEvent extends DomainResource {
       } else if (name.equals("securityLabel")) {
         return addSecurityLabel();
       } else if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.name");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.name");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.description");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.description");
       } else if (name.equals("query")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.query");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.query");
       } else if (name.equals("detail")) {
         return addDetail();
       } else
@@ -3140,9 +3140,9 @@ public class AuditEvent extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.type");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.type");
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type AuditEvent.value");
+        throw new FHIRException("Cannot call addChild on a singleton property AuditEvent.value");
       } else
         return super.addChild(name);
     }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Basic.java

@@ -383,7 +383,7 @@ public class Basic extends DomainResource {
       this.author = new Reference();
       return this.author;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Basic.created");
+      throw new FHIRException("Cannot call addChild on a singleton property Basic.created");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Binary.java

@@ -203,9 +203,9 @@ public class Binary extends BaseBinary implements IBaseBinary {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("contentType")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Binary.contentType");
+      throw new FHIRException("Cannot call addChild on a singleton property Binary.contentType");
     } else if (name.equals("content")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Binary.content");
+      throw new FHIRException("Cannot call addChild on a singleton property Binary.content");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/BodySite.java

@@ -421,7 +421,7 @@ public class BodySite extends DomainResource {
     } else if (name.equals("modifier")) {
       return addModifier();
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type BodySite.description");
+      throw new FHIRException("Cannot call addChild on a singleton property BodySite.description");
     } else if (name.equals("image")) {
       return addImage();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Bundle.java

@@ -755,9 +755,9 @@ public class Bundle extends Resource implements IBaseBundle {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("relation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.relation");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.relation");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.url");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.url");
       } else
         return super.addChild(name);
     }
@@ -1104,7 +1104,7 @@ public class Bundle extends Resource implements IBaseBundle {
       if (name.equals("link")) {
         return addLink();
       } else if (name.equals("fullUrl")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.fullUrl");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.fullUrl");
       } else if (name.equals("resource")) {
         throw new FHIRException("Cannot call addChild on an abstract type Bundle.resource");
       } else if (name.equals("search")) {
@@ -1332,9 +1332,9 @@ public class Bundle extends Resource implements IBaseBundle {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.mode");
       } else if (name.equals("score")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.score");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.score");
       } else
         return super.addChild(name);
     }
@@ -1847,17 +1847,17 @@ public class Bundle extends Resource implements IBaseBundle {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("method")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.method");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.method");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.url");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.url");
       } else if (name.equals("ifNoneMatch")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.ifNoneMatch");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.ifNoneMatch");
       } else if (name.equals("ifModifiedSince")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.ifModifiedSince");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.ifModifiedSince");
       } else if (name.equals("ifMatch")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.ifMatch");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.ifMatch");
       } else if (name.equals("ifNoneExist")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.ifNoneExist");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.ifNoneExist");
       } else
         return super.addChild(name);
     }
@@ -2207,13 +2207,13 @@ public class Bundle extends Resource implements IBaseBundle {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.status");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.status");
       } else if (name.equals("location")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.location");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.location");
       } else if (name.equals("etag")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.etag");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.etag");
       } else if (name.equals("lastModified")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Bundle.lastModified");
+        throw new FHIRException("Cannot call addChild on a singleton property Bundle.lastModified");
       } else
         return super.addChild(name);
     }
@@ -2624,9 +2624,9 @@ public class Bundle extends Resource implements IBaseBundle {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Bundle.type");
+      throw new FHIRException("Cannot call addChild on a singleton property Bundle.type");
     } else if (name.equals("total")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Bundle.total");
+      throw new FHIRException("Cannot call addChild on a singleton property Bundle.total");
     } else if (name.equals("link")) {
       return addLink();
     } else if (name.equals("entry")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/CarePlan.java

@@ -718,7 +718,7 @@ public class CarePlan extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type CarePlan.code");
+        throw new FHIRException("Cannot call addChild on a singleton property CarePlan.code");
       } else if (name.equals("plan")) {
         this.plan = new Reference();
         return this.plan;
@@ -2272,12 +2272,12 @@ public class CarePlan extends DomainResource {
       } else if (name.equals("goal")) {
         return addGoal();
       } else if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type CarePlan.status");
+        throw new FHIRException("Cannot call addChild on a singleton property CarePlan.status");
       } else if (name.equals("statusReason")) {
         this.statusReason = new CodeableConcept();
         return this.statusReason;
       } else if (name.equals("prohibited")) {
-        throw new FHIRException("Cannot call addChild on a primitive type CarePlan.prohibited");
+        throw new FHIRException("Cannot call addChild on a singleton property CarePlan.prohibited");
       } else if (name.equals("scheduledTiming")) {
         this.scheduled = new Timing();
         return this.scheduled;
@@ -2305,7 +2305,7 @@ public class CarePlan extends DomainResource {
         this.quantity = new SimpleQuantity();
         return this.quantity;
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type CarePlan.description");
+        throw new FHIRException("Cannot call addChild on a singleton property CarePlan.description");
       } else
         return super.addChild(name);
     }
@@ -3468,7 +3468,7 @@ public class CarePlan extends DomainResource {
       this.subject = new Reference();
       return this.subject;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CarePlan.status");
+      throw new FHIRException("Cannot call addChild on a singleton property CarePlan.status");
     } else if (name.equals("context")) {
       this.context = new Reference();
       return this.context;
@@ -3478,11 +3478,11 @@ public class CarePlan extends DomainResource {
     } else if (name.equals("author")) {
       return addAuthor();
     } else if (name.equals("modified")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CarePlan.modified");
+      throw new FHIRException("Cannot call addChild on a singleton property CarePlan.modified");
     } else if (name.equals("category")) {
       return addCategory();
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CarePlan.description");
+      throw new FHIRException("Cannot call addChild on a singleton property CarePlan.description");
     } else if (name.equals("addresses")) {
       return addAddresses();
     } else if (name.equals("support")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Claim.java

@@ -851,7 +851,7 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.sequence");
       } else if (name.equals("diagnosis")) {
         this.diagnosis = new Coding();
         return this.diagnosis;
@@ -1422,19 +1422,19 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.sequence");
       } else if (name.equals("focal")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.focal");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.focal");
       } else if (name.equals("coverage")) {
         this.coverage = new Reference();
         return this.coverage;
       } else if (name.equals("businessArrangement")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.businessArrangement");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.businessArrangement");
       } else if (name.equals("relationship")) {
         this.relationship = new Coding();
         return this.relationship;
       } else if (name.equals("preAuthRef")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.preAuthRef");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.preAuthRef");
       } else if (name.equals("claimResponse")) {
         this.claimResponse = new Reference();
         return this.claimResponse;
@@ -2451,7 +2451,7 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.sequence");
       } else if (name.equals("type")) {
         this.type = new Coding();
         return this.type;
@@ -2459,12 +2459,12 @@ public class Claim extends DomainResource {
         this.provider = new Reference();
         return this.provider;
       } else if (name.equals("diagnosisLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.diagnosisLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.diagnosisLinkId");
       } else if (name.equals("service")) {
         this.service = new Coding();
         return this.service;
       } else if (name.equals("serviceDate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.serviceDate");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.serviceDate");
       } else if (name.equals("quantity")) {
         this.quantity = new SimpleQuantity();
         return this.quantity;
@@ -2472,9 +2472,9 @@ public class Claim extends DomainResource {
         this.unitPrice = new Money();
         return this.unitPrice;
       } else if (name.equals("factor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.factor");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.factor");
       } else if (name.equals("points")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.points");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.points");
       } else if (name.equals("net")) {
         this.net = new Money();
         return this.net;
@@ -3136,7 +3136,7 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.sequence");
       } else if (name.equals("type")) {
         this.type = new Coding();
         return this.type;
@@ -3150,9 +3150,9 @@ public class Claim extends DomainResource {
         this.unitPrice = new Money();
         return this.unitPrice;
       } else if (name.equals("factor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.factor");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.factor");
       } else if (name.equals("points")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.points");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.points");
       } else if (name.equals("net")) {
         this.net = new Money();
         return this.net;
@@ -3715,7 +3715,7 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.sequence");
       } else if (name.equals("type")) {
         this.type = new Coding();
         return this.type;
@@ -3729,9 +3729,9 @@ public class Claim extends DomainResource {
         this.unitPrice = new Money();
         return this.unitPrice;
       } else if (name.equals("factor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.factor");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.factor");
       } else if (name.equals("points")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.points");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.points");
       } else if (name.equals("net")) {
         this.net = new Money();
         return this.net;
@@ -3988,9 +3988,9 @@ public class Claim extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("initial")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.initial");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.initial");
       } else if (name.equals("priorDate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.priorDate");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.priorDate");
       } else if (name.equals("priorMaterial")) {
         this.priorMaterial = new Coding();
         return this.priorMaterial;
@@ -4219,7 +4219,7 @@ public class Claim extends DomainResource {
         this.reason = new Coding();
         return this.reason;
       } else if (name.equals("extractionDate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Claim.extractionDate");
+        throw new FHIRException("Cannot call addChild on a singleton property Claim.extractionDate");
       } else
         return super.addChild(name);
     }
@@ -5987,7 +5987,7 @@ public class Claim extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Claim.type");
+      throw new FHIRException("Cannot call addChild on a singleton property Claim.type");
     } else if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("ruleset")) {
@@ -5997,7 +5997,7 @@ public class Claim extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Claim.created");
+      throw new FHIRException("Cannot call addChild on a singleton property Claim.created");
     } else if (name.equals("target")) {
       this.target = new Reference();
       return this.target;
@@ -6008,7 +6008,7 @@ public class Claim extends DomainResource {
       this.organization = new Reference();
       return this.organization;
     } else if (name.equals("use")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Claim.use");
+      throw new FHIRException("Cannot call addChild on a singleton property Claim.use");
     } else if (name.equals("priority")) {
       this.priority = new Coding();
       return this.priority;
@@ -6045,9 +6045,9 @@ public class Claim extends DomainResource {
     } else if (name.equals("exception")) {
       return addException();
     } else if (name.equals("school")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Claim.school");
+      throw new FHIRException("Cannot call addChild on a singleton property Claim.school");
     } else if (name.equals("accident")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Claim.accident");
+      throw new FHIRException("Cannot call addChild on a singleton property Claim.accident");
     } else if (name.equals("accidentType")) {
       this.accidentType = new Coding();
       return this.accidentType;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ClaimResponse.java

@@ -321,9 +321,9 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequenceLinkId");
       } else if (name.equals("noteNumber")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.noteNumber");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.noteNumber");
       } else if (name.equals("adjudication")) {
         return addAdjudication();
       } else if (name.equals("detail")) {
@@ -571,7 +571,7 @@ public class ClaimResponse extends DomainResource {
         this.amount = new Money();
         return this.amount;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.value");
       } else
         return super.addChild(name);
     }
@@ -815,7 +815,7 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequenceLinkId");
       } else if (name.equals("adjudication")) {
         return addAdjudication();
       } else if (name.equals("subDetail")) {
@@ -1056,7 +1056,7 @@ public class ClaimResponse extends DomainResource {
         this.amount = new Money();
         return this.amount;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.value");
       } else
         return super.addChild(name);
     }
@@ -1247,7 +1247,7 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequenceLinkId");
       } else if (name.equals("adjudication")) {
         return addAdjudication();
       } else
@@ -1479,7 +1479,7 @@ public class ClaimResponse extends DomainResource {
         this.amount = new Money();
         return this.amount;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.value");
       } else
         return super.addChild(name);
     }
@@ -1877,7 +1877,7 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequenceLinkId");
       } else if (name.equals("service")) {
         this.service = new Coding();
         return this.service;
@@ -1885,7 +1885,7 @@ public class ClaimResponse extends DomainResource {
         this.fee = new Money();
         return this.fee;
       } else if (name.equals("noteNumberLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.noteNumberLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.noteNumberLinkId");
       } else if (name.equals("adjudication")) {
         return addAdjudication();
       } else if (name.equals("detail")) {
@@ -2143,7 +2143,7 @@ public class ClaimResponse extends DomainResource {
         this.amount = new Money();
         return this.amount;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.value");
       } else
         return super.addChild(name);
     }
@@ -2585,7 +2585,7 @@ public class ClaimResponse extends DomainResource {
         this.amount = new Money();
         return this.amount;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.value");
       } else
         return super.addChild(name);
     }
@@ -2920,11 +2920,11 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequenceLinkId");
       } else if (name.equals("detailSequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.detailSequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.detailSequenceLinkId");
       } else if (name.equals("subdetailSequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.subdetailSequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.subdetailSequenceLinkId");
       } else if (name.equals("code")) {
         this.code = new Coding();
         return this.code;
@@ -3168,12 +3168,12 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("number")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.number");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.number");
       } else if (name.equals("type")) {
         this.type = new Coding();
         return this.type;
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.text");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.text");
       } else
         return super.addChild(name);
     }
@@ -3743,19 +3743,19 @@ public class ClaimResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.sequence");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.sequence");
       } else if (name.equals("focal")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.focal");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.focal");
       } else if (name.equals("coverage")) {
         this.coverage = new Reference();
         return this.coverage;
       } else if (name.equals("businessArrangement")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.businessArrangement");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.businessArrangement");
       } else if (name.equals("relationship")) {
         this.relationship = new Coding();
         return this.relationship;
       } else if (name.equals("preAuthRef")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.preAuthRef");
+        throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.preAuthRef");
       } else if (name.equals("claimResponse")) {
         this.claimResponse = new Reference();
         return this.claimResponse;
@@ -5173,7 +5173,7 @@ public class ClaimResponse extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.created");
+      throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.created");
     } else if (name.equals("organization")) {
       this.organization = new Reference();
       return this.organization;
@@ -5184,9 +5184,9 @@ public class ClaimResponse extends DomainResource {
       this.requestOrganization = new Reference();
       return this.requestOrganization;
     } else if (name.equals("outcome")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.outcome");
+      throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.outcome");
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.disposition");
     } else if (name.equals("payeeType")) {
       this.payeeType = new Coding();
       return this.payeeType;
@@ -5212,7 +5212,7 @@ public class ClaimResponse extends DomainResource {
       this.paymentAdjustmentReason = new Coding();
       return this.paymentAdjustmentReason;
     } else if (name.equals("paymentDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClaimResponse.paymentDate");
+      throw new FHIRException("Cannot call addChild on a singleton property ClaimResponse.paymentDate");
     } else if (name.equals("paymentAmount")) {
       this.paymentAmount = new Money();
       return this.paymentAmount;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ClinicalImpression.java

@@ -528,7 +528,7 @@ public class ClinicalImpression extends DomainResource {
         this.item = new CodeableConcept();
         return this.item;
       } else if (name.equals("cause")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.cause");
+        throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.cause");
       } else
         return super.addChild(name);
     }
@@ -707,7 +707,7 @@ public class ClinicalImpression extends DomainResource {
         this.item = new CodeableConcept();
         return this.item;
       } else if (name.equals("reason")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.reason");
+        throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.reason");
       } else
         return super.addChild(name);
     }
@@ -1931,11 +1931,11 @@ public class ClinicalImpression extends DomainResource {
       this.assessor = new Reference();
       return this.assessor;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.status");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.status");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.date");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.date");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.description");
     } else if (name.equals("previous")) {
       this.previous = new Reference();
       return this.previous;
@@ -1950,9 +1950,9 @@ public class ClinicalImpression extends DomainResource {
     } else if (name.equals("investigations")) {
       return addInvestigations();
     } else if (name.equals("protocol")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.protocol");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.protocol");
     } else if (name.equals("summary")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.summary");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.summary");
     } else if (name.equals("finding")) {
       return addFinding();
     } else if (name.equals("resolved")) {
@@ -1960,7 +1960,7 @@ public class ClinicalImpression extends DomainResource {
     } else if (name.equals("ruledOut")) {
       return addRuledOut();
     } else if (name.equals("prognosis")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ClinicalImpression.prognosis");
+      throw new FHIRException("Cannot call addChild on a singleton property ClinicalImpression.prognosis");
     } else if (name.equals("plan")) {
       return addPlan();
     } else if (name.equals("action")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/CodeableConcept.java

@@ -201,7 +201,7 @@ public class CodeableConcept extends Type implements ICompositeType {
     if (name.equals("coding")) {
       return addCoding();
     } else if (name.equals("text")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CodeableConcept.text");
+      throw new FHIRException("Cannot call addChild on a singleton property CodeableConcept.text");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Coding.java

@@ -441,15 +441,15 @@ public class Coding extends Type implements IBaseCoding, ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("system")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coding.system");
+      throw new FHIRException("Cannot call addChild on a singleton property Coding.system");
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coding.version");
+      throw new FHIRException("Cannot call addChild on a singleton property Coding.version");
     } else if (name.equals("code")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coding.code");
+      throw new FHIRException("Cannot call addChild on a singleton property Coding.code");
     } else if (name.equals("display")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coding.display");
+      throw new FHIRException("Cannot call addChild on a singleton property Coding.display");
     } else if (name.equals("userSelected")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coding.userSelected");
+      throw new FHIRException("Cannot call addChild on a singleton property Coding.userSelected");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Communication.java

@@ -1263,14 +1263,14 @@ public class Communication extends DomainResource {
     } else if (name.equals("medium")) {
       return addMedium();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Communication.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Communication.status");
     } else if (name.equals("encounter")) {
       this.encounter = new Reference();
       return this.encounter;
     } else if (name.equals("sent")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Communication.sent");
+      throw new FHIRException("Cannot call addChild on a singleton property Communication.sent");
     } else if (name.equals("received")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Communication.received");
+      throw new FHIRException("Cannot call addChild on a singleton property Communication.received");
     } else if (name.equals("reason")) {
       return addReason();
     } else if (name.equals("subject")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/CommunicationRequest.java

@@ -1386,7 +1386,7 @@ public class CommunicationRequest extends DomainResource {
       this.requester = new Reference();
       return this.requester;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CommunicationRequest.status");
+      throw new FHIRException("Cannot call addChild on a singleton property CommunicationRequest.status");
     } else if (name.equals("encounter")) {
       this.encounter = new Reference();
       return this.encounter;
@@ -1399,7 +1399,7 @@ public class CommunicationRequest extends DomainResource {
     } else if (name.equals("reason")) {
       return addReason();
     } else if (name.equals("requestedOn")) {
-      throw new FHIRException("Cannot call addChild on a primitive type CommunicationRequest.requestedOn");
+      throw new FHIRException("Cannot call addChild on a singleton property CommunicationRequest.requestedOn");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Composition.java

@@ -596,9 +596,9 @@ public class Composition extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Composition.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Composition.mode");
       } else if (name.equals("time")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Composition.time");
+        throw new FHIRException("Cannot call addChild on a singleton property Composition.time");
       } else if (name.equals("party")) {
         this.party = new Reference();
         return this.party;
@@ -1400,7 +1400,7 @@ public class Composition extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("title")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Composition.title");
+        throw new FHIRException("Cannot call addChild on a singleton property Composition.title");
       } else if (name.equals("code")) {
         this.code = new CodeableConcept();
         return this.code;
@@ -1408,7 +1408,7 @@ public class Composition extends DomainResource {
         this.text = new Narrative();
         return this.text;
       } else if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Composition.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Composition.mode");
       } else if (name.equals("orderedBy")) {
         this.orderedBy = new CodeableConcept();
         return this.orderedBy;
@@ -2383,7 +2383,7 @@ public class Composition extends DomainResource {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Composition.date");
+      throw new FHIRException("Cannot call addChild on a singleton property Composition.date");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
@@ -2391,11 +2391,11 @@ public class Composition extends DomainResource {
       this.class_ = new CodeableConcept();
       return this.class_;
     } else if (name.equals("title")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Composition.title");
+      throw new FHIRException("Cannot call addChild on a singleton property Composition.title");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Composition.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Composition.status");
     } else if (name.equals("confidentiality")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Composition.confidentiality");
+      throw new FHIRException("Cannot call addChild on a singleton property Composition.confidentiality");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ConceptMap.java

@@ -198,7 +198,7 @@ public class ConceptMap extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.name");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -464,9 +464,9 @@ public class ConceptMap extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("codeSystem")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.codeSystem");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.codeSystem");
       } else if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.code");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.code");
       } else if (name.equals("target")) {
         return addTarget();
       } else
@@ -960,13 +960,13 @@ public class ConceptMap extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("codeSystem")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.codeSystem");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.codeSystem");
       } else if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.code");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.code");
       } else if (name.equals("equivalence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.equivalence");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.equivalence");
       } else if (name.equals("comments")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.comments");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.comments");
       } else if (name.equals("dependsOn")) {
         return addDependsOn();
       } else if (name.equals("product")) {
@@ -1286,11 +1286,11 @@ public class ConceptMap extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("element")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.element");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.element");
       } else if (name.equals("codeSystem")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.codeSystem");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.codeSystem");
       } else if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.code");
+        throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.code");
       } else
         return super.addChild(name);
     }
@@ -2443,32 +2443,32 @@ public class ConceptMap extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.url");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.url");
     } else if (name.equals("identifier")) {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.version");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.version");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.name");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.status");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.status");
     } else if (name.equals("experimental")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.experimental");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.experimental");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.date");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.date");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.description");
     } else if (name.equals("useContext")) {
       return addUseContext();
     } else if (name.equals("requirements")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.requirements");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.requirements");
     } else if (name.equals("copyright")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ConceptMap.copyright");
+      throw new FHIRException("Cannot call addChild on a singleton property ConceptMap.copyright");
     } else if (name.equals("sourceUri")) {
       this.source = new UriType();
       return this.source;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Condition.java

@@ -1729,7 +1729,7 @@ public class Condition extends DomainResource {
       this.asserter = new Reference();
       return this.asserter;
     } else if (name.equals("dateRecorded")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Condition.dateRecorded");
+      throw new FHIRException("Cannot call addChild on a singleton property Condition.dateRecorded");
     } else if (name.equals("code")) {
       this.code = new CodeableConcept();
       return this.code;
@@ -1737,9 +1737,9 @@ public class Condition extends DomainResource {
       this.category = new CodeableConcept();
       return this.category;
     } else if (name.equals("clinicalStatus")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Condition.clinicalStatus");
+      throw new FHIRException("Cannot call addChild on a singleton property Condition.clinicalStatus");
     } else if (name.equals("verificationStatus")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Condition.verificationStatus");
+      throw new FHIRException("Cannot call addChild on a singleton property Condition.verificationStatus");
     } else if (name.equals("severity")) {
       this.severity = new CodeableConcept();
       return this.severity;
@@ -1784,7 +1784,7 @@ public class Condition extends DomainResource {
     } else if (name.equals("bodySite")) {
       return addBodySite();
     } else if (name.equals("notes")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Condition.notes");
+      throw new FHIRException("Cannot call addChild on a singleton property Condition.notes");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Conformance.java

@@ -2033,7 +2033,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.name");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -2310,11 +2310,11 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.name");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.name");
       } else if (name.equals("version")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.version");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.version");
       } else if (name.equals("releaseDate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.releaseDate");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.releaseDate");
       } else
         return super.addChild(name);
     }
@@ -2533,9 +2533,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.description");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.description");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.url");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.url");
       } else
         return super.addChild(name);
     }
@@ -3153,9 +3153,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.mode");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else if (name.equals("security")) {
         this.security = new ConformanceRestSecurityComponent();
         return this.security;
@@ -3164,13 +3164,13 @@ public class Conformance extends DomainResource implements IBaseConformance {
       } else if (name.equals("interaction")) {
         return addInteraction();
       } else if (name.equals("transactionMode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.transactionMode");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.transactionMode");
       } else if (name.equals("searchParam")) {
         return addSearchParam();
       } else if (name.equals("operation")) {
         return addOperation();
       } else if (name.equals("compartment")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.compartment");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.compartment");
       } else
         return super.addChild(name);
     }
@@ -3519,11 +3519,11 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("cors")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.cors");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.cors");
       } else if (name.equals("service")) {
         return addService();
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.description");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.description");
       } else if (name.equals("certificate")) {
         return addCertificate();
       } else
@@ -3737,9 +3737,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.type");
       } else if (name.equals("blob")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.blob");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.blob");
       } else
         return super.addChild(name);
     }
@@ -4663,28 +4663,28 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.type");
       } else if (name.equals("profile")) {
         this.profile = new Reference();
         return this.profile;
       } else if (name.equals("interaction")) {
         return addInteraction();
       } else if (name.equals("versioning")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.versioning");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.versioning");
       } else if (name.equals("readHistory")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.readHistory");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.readHistory");
       } else if (name.equals("updateCreate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.updateCreate");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.updateCreate");
       } else if (name.equals("conditionalCreate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalCreate");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.conditionalCreate");
       } else if (name.equals("conditionalUpdate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalUpdate");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.conditionalUpdate");
       } else if (name.equals("conditionalDelete")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.conditionalDelete");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.conditionalDelete");
       } else if (name.equals("searchInclude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.searchInclude");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.searchInclude");
       } else if (name.equals("searchRevInclude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.searchRevInclude");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.searchRevInclude");
       } else if (name.equals("searchParam")) {
         return addSearchParam();
       } else
@@ -4955,9 +4955,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.code");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.code");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else
         return super.addChild(name);
     }
@@ -5549,19 +5549,19 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.name");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.name");
       } else if (name.equals("definition")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.definition");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.definition");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.type");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else if (name.equals("target")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.target");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.target");
       } else if (name.equals("modifier")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.modifier");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.modifier");
       } else if (name.equals("chain")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.chain");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.chain");
       } else
         return super.addChild(name);
     }
@@ -5804,9 +5804,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.code");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.code");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else
         return super.addChild(name);
     }
@@ -6017,7 +6017,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.name");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.name");
       } else if (name.equals("definition")) {
         this.definition = new Reference();
         return this.definition;
@@ -6350,9 +6350,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
       if (name.equals("endpoint")) {
         return addEndpoint();
       } else if (name.equals("reliableCache")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.reliableCache");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.reliableCache");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else if (name.equals("event")) {
         return addEvent();
       } else
@@ -6556,7 +6556,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         this.protocol = new Coding();
         return this.protocol;
       } else if (name.equals("address")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.address");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.address");
       } else
         return super.addChild(name);
     }
@@ -7080,11 +7080,11 @@ public class Conformance extends DomainResource implements IBaseConformance {
         this.code = new Coding();
         return this.code;
       } else if (name.equals("category")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.category");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.category");
       } else if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.mode");
       } else if (name.equals("focus")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.focus");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.focus");
       } else if (name.equals("request")) {
         this.request = new Reference();
         return this.request;
@@ -7092,7 +7092,7 @@ public class Conformance extends DomainResource implements IBaseConformance {
         this.response = new Reference();
         return this.response;
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else
         return super.addChild(name);
     }
@@ -7393,9 +7393,9 @@ public class Conformance extends DomainResource implements IBaseConformance {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("mode")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.mode");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.mode");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Conformance.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property Conformance.documentation");
       } else if (name.equals("profile")) {
         this.profile = new Reference();
         return this.profile;
@@ -8942,29 +8942,29 @@ public class Conformance extends DomainResource implements IBaseConformance {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.url");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.url");
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.version");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.version");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.name");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.status");
     } else if (name.equals("experimental")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.experimental");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.experimental");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.date");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.date");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.description");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.description");
     } else if (name.equals("requirements")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.requirements");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.requirements");
     } else if (name.equals("copyright")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.copyright");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.copyright");
     } else if (name.equals("kind")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.kind");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.kind");
     } else if (name.equals("software")) {
       this.software = new ConformanceSoftwareComponent();
       return this.software;
@@ -8972,11 +8972,11 @@ public class Conformance extends DomainResource implements IBaseConformance {
       this.implementation = new ConformanceImplementationComponent();
       return this.implementation;
     } else if (name.equals("fhirVersion")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.fhirVersion");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.fhirVersion");
     } else if (name.equals("acceptUnknown")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.acceptUnknown");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.acceptUnknown");
     } else if (name.equals("format")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Conformance.format");
+      throw new FHIRException("Cannot call addChild on a singleton property Conformance.format");
     } else if (name.equals("profile")) {
       return addProfile();
     } else if (name.equals("rest")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ContactPoint.java

@@ -735,13 +735,13 @@ public class ContactPoint extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("system")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ContactPoint.system");
+      throw new FHIRException("Cannot call addChild on a singleton property ContactPoint.system");
     } else if (name.equals("value")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ContactPoint.value");
+      throw new FHIRException("Cannot call addChild on a singleton property ContactPoint.value");
     } else if (name.equals("use")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ContactPoint.use");
+      throw new FHIRException("Cannot call addChild on a singleton property ContactPoint.use");
     } else if (name.equals("rank")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ContactPoint.rank");
+      throw new FHIRException("Cannot call addChild on a singleton property ContactPoint.rank");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Contract.java

@@ -750,7 +750,7 @@ public class Contract extends DomainResource {
         this.identifier = new Identifier();
         return this.identifier;
       } else if (name.equals("effectiveTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.effectiveTime");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.effectiveTime");
       } else if (name.equals("quantity")) {
         this.quantity = new SimpleQuantity();
         return this.quantity;
@@ -758,9 +758,9 @@ public class Contract extends DomainResource {
         this.unitPrice = new Money();
         return this.unitPrice;
       } else if (name.equals("factor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.factor");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.factor");
       } else if (name.equals("points")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.points");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.points");
       } else if (name.equals("net")) {
         this.net = new Money();
         return this.net;
@@ -1022,7 +1022,7 @@ public class Contract extends DomainResource {
         this.party = new Reference();
         return this.party;
       } else if (name.equals("signature")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.signature");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.signature");
       } else
         return super.addChild(name);
     }
@@ -1710,7 +1710,7 @@ public class Contract extends DomainResource {
         this.identifier = new Identifier();
         return this.identifier;
       } else if (name.equals("issued")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.issued");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.issued");
       } else if (name.equals("applies")) {
         this.applies = new Period();
         return this.applies;
@@ -1730,7 +1730,7 @@ public class Contract extends DomainResource {
       } else if (name.equals("actor")) {
         return addActor();
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.text");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.text");
       } else if (name.equals("valuedItem")) {
         return addValuedItem();
       } else if (name.equals("group")) {
@@ -2531,7 +2531,7 @@ public class Contract extends DomainResource {
         this.identifier = new Identifier();
         return this.identifier;
       } else if (name.equals("effectiveTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.effectiveTime");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.effectiveTime");
       } else if (name.equals("quantity")) {
         this.quantity = new SimpleQuantity();
         return this.quantity;
@@ -2539,9 +2539,9 @@ public class Contract extends DomainResource {
         this.unitPrice = new Money();
         return this.unitPrice;
       } else if (name.equals("factor")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.factor");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.factor");
       } else if (name.equals("points")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Contract.points");
+        throw new FHIRException("Cannot call addChild on a singleton property Contract.points");
       } else if (name.equals("net")) {
         this.net = new Money();
         return this.net;
@@ -4148,7 +4148,7 @@ public class Contract extends DomainResource {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("issued")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Contract.issued");
+      throw new FHIRException("Cannot call addChild on a singleton property Contract.issued");
     } else if (name.equals("applies")) {
       this.applies = new Period();
       return this.applies;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Coverage.java

@@ -933,15 +933,15 @@ public class Coverage extends DomainResource {
     } else if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("group")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coverage.group");
+      throw new FHIRException("Cannot call addChild on a singleton property Coverage.group");
     } else if (name.equals("plan")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coverage.plan");
+      throw new FHIRException("Cannot call addChild on a singleton property Coverage.plan");
     } else if (name.equals("subPlan")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coverage.subPlan");
+      throw new FHIRException("Cannot call addChild on a singleton property Coverage.subPlan");
     } else if (name.equals("dependent")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coverage.dependent");
+      throw new FHIRException("Cannot call addChild on a singleton property Coverage.dependent");
     } else if (name.equals("sequence")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Coverage.sequence");
+      throw new FHIRException("Cannot call addChild on a singleton property Coverage.sequence");
     } else if (name.equals("subscriber")) {
       this.subscriber = new Reference();
       return this.subscriber;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DataElement.java

@@ -399,7 +399,7 @@ public class DataElement extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DataElement.name");
+        throw new FHIRException("Cannot call addChild on a singleton property DataElement.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -756,13 +756,13 @@ public class DataElement extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("identity")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DataElement.identity");
+        throw new FHIRException("Cannot call addChild on a singleton property DataElement.identity");
       } else if (name.equals("uri")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DataElement.uri");
+        throw new FHIRException("Cannot call addChild on a singleton property DataElement.uri");
       } else if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DataElement.name");
+        throw new FHIRException("Cannot call addChild on a singleton property DataElement.name");
       } else if (name.equals("comments")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DataElement.comments");
+        throw new FHIRException("Cannot call addChild on a singleton property DataElement.comments");
       } else
         return super.addChild(name);
     }
@@ -1794,29 +1794,29 @@ public class DataElement extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.url");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.url");
     } else if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.version");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.version");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.name");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.status");
     } else if (name.equals("experimental")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.experimental");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.experimental");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.date");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.date");
     } else if (name.equals("useContext")) {
       return addUseContext();
     } else if (name.equals("copyright")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.copyright");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.copyright");
     } else if (name.equals("stringency")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DataElement.stringency");
+      throw new FHIRException("Cannot call addChild on a singleton property DataElement.stringency");
     } else if (name.equals("mapping")) {
       return addMapping();
     } else if (name.equals("element")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DetectedIssue.java

@@ -405,7 +405,7 @@ public class DetectedIssue extends DomainResource {
         this.action = new CodeableConcept();
         return this.action;
       } else if (name.equals("date")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DetectedIssue.date");
+        throw new FHIRException("Cannot call addChild on a singleton property DetectedIssue.date");
       } else if (name.equals("author")) {
         this.author = new Reference();
         return this.author;
@@ -1114,13 +1114,13 @@ public class DetectedIssue extends DomainResource {
       this.category = new CodeableConcept();
       return this.category;
     } else if (name.equals("severity")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DetectedIssue.severity");
+      throw new FHIRException("Cannot call addChild on a singleton property DetectedIssue.severity");
     } else if (name.equals("implicated")) {
       return addImplicated();
     } else if (name.equals("detail")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DetectedIssue.detail");
+      throw new FHIRException("Cannot call addChild on a singleton property DetectedIssue.detail");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DetectedIssue.date");
+      throw new FHIRException("Cannot call addChild on a singleton property DetectedIssue.date");
     } else if (name.equals("author")) {
       this.author = new Reference();
       return this.author;
@@ -1128,7 +1128,7 @@ public class DetectedIssue extends DomainResource {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("reference")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DetectedIssue.reference");
+      throw new FHIRException("Cannot call addChild on a singleton property DetectedIssue.reference");
     } else if (name.equals("mitigation")) {
       return addMitigation();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Device.java

@@ -1267,21 +1267,21 @@ public class Device extends DomainResource {
     } else if (name.equals("note")) {
       return addNote();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.status");
     } else if (name.equals("manufacturer")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.manufacturer");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.manufacturer");
     } else if (name.equals("model")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.model");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.model");
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.version");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.version");
     } else if (name.equals("manufactureDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.manufactureDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.manufactureDate");
     } else if (name.equals("expiry")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.expiry");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.expiry");
     } else if (name.equals("udi")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.udi");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.udi");
     } else if (name.equals("lotNumber")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.lotNumber");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.lotNumber");
     } else if (name.equals("owner")) {
       this.owner = new Reference();
       return this.owner;
@@ -1294,7 +1294,7 @@ public class Device extends DomainResource {
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Device.url");
+      throw new FHIRException("Cannot call addChild on a singleton property Device.url");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DeviceComponent.java

@@ -527,7 +527,7 @@ public class DeviceComponent extends DomainResource {
         this.componentId = new Identifier();
         return this.componentId;
       } else if (name.equals("productionSpec")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DeviceComponent.productionSpec");
+        throw new FHIRException("Cannot call addChild on a singleton property DeviceComponent.productionSpec");
       } else
         return super.addChild(name);
     }
@@ -1178,7 +1178,7 @@ public class DeviceComponent extends DomainResource {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("lastSystemChange")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceComponent.lastSystemChange");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceComponent.lastSystemChange");
     } else if (name.equals("source")) {
       this.source = new Reference();
       return this.source;
@@ -1191,7 +1191,7 @@ public class DeviceComponent extends DomainResource {
       this.parameterGroup = new CodeableConcept();
       return this.parameterGroup;
     } else if (name.equals("measurementPrinciple")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceComponent.measurementPrinciple");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceComponent.measurementPrinciple");
     } else if (name.equals("productionSpecification")) {
       return addProductionSpecification();
     } else if (name.equals("languageCode")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DeviceMetric.java

@@ -1082,11 +1082,11 @@ public class DeviceMetric extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.type");
+        throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.type");
       } else if (name.equals("state")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.state");
+        throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.state");
       } else if (name.equals("time")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.time");
+        throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.time");
       } else
         return super.addChild(name);
     }
@@ -1836,11 +1836,11 @@ public class DeviceMetric extends DomainResource {
       this.parent = new Reference();
       return this.parent;
     } else if (name.equals("operationalStatus")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.operationalStatus");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.operationalStatus");
     } else if (name.equals("color")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.color");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.color");
     } else if (name.equals("category")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceMetric.category");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceMetric.category");
     } else if (name.equals("measurementPeriod")) {
       this.measurementPeriod = new Timing();
       return this.measurementPeriod;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DeviceUseRequest.java

@@ -1390,7 +1390,7 @@ public class DeviceUseRequest extends DomainResource {
       this.bodySite = new Reference();
       return this.bodySite;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseRequest.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseRequest.status");
     } else if (name.equals("device")) {
       this.device = new Reference();
       return this.device;
@@ -1402,13 +1402,13 @@ public class DeviceUseRequest extends DomainResource {
     } else if (name.equals("indication")) {
       return addIndication();
     } else if (name.equals("notes")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseRequest.notes");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseRequest.notes");
     } else if (name.equals("prnReason")) {
       return addPrnReason();
     } else if (name.equals("orderedOn")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseRequest.orderedOn");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseRequest.orderedOn");
     } else if (name.equals("recordedOn")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseRequest.recordedOn");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseRequest.recordedOn");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;
@@ -1422,7 +1422,7 @@ public class DeviceUseRequest extends DomainResource {
       this.timing = new DateTimeType();
       return this.timing;
     } else if (name.equals("priority")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseRequest.priority");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseRequest.priority");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DeviceUseStatement.java

@@ -659,9 +659,9 @@ public class DeviceUseStatement extends DomainResource {
     } else if (name.equals("indication")) {
       return addIndication();
     } else if (name.equals("notes")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseStatement.notes");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseStatement.notes");
     } else if (name.equals("recordedOn")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DeviceUseStatement.recordedOn");
+      throw new FHIRException("Cannot call addChild on a singleton property DeviceUseStatement.recordedOn");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DiagnosticOrder.java

@@ -792,12 +792,12 @@ public class DiagnosticOrder extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DiagnosticOrder.status");
+        throw new FHIRException("Cannot call addChild on a singleton property DiagnosticOrder.status");
       } else if (name.equals("description")) {
         this.description = new CodeableConcept();
         return this.description;
       } else if (name.equals("dateTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DiagnosticOrder.dateTime");
+        throw new FHIRException("Cannot call addChild on a singleton property DiagnosticOrder.dateTime");
       } else if (name.equals("actor")) {
         this.actor = new Reference();
         return this.actor;
@@ -1174,7 +1174,7 @@ public class DiagnosticOrder extends DomainResource {
         this.bodySite = new CodeableConcept();
         return this.bodySite;
       } else if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DiagnosticOrder.status");
+        throw new FHIRException("Cannot call addChild on a singleton property DiagnosticOrder.status");
       } else if (name.equals("event")) {
         return addEvent();
       } else
@@ -2109,9 +2109,9 @@ public class DiagnosticOrder extends DomainResource {
     } else if (name.equals("specimen")) {
       return addSpecimen();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DiagnosticOrder.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DiagnosticOrder.status");
     } else if (name.equals("priority")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DiagnosticOrder.priority");
+      throw new FHIRException("Cannot call addChild on a singleton property DiagnosticOrder.priority");
     } else if (name.equals("event")) {
       return addEvent();
     } else if (name.equals("item")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DiagnosticReport.java

@@ -445,7 +445,7 @@ public class DiagnosticReport extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("comment")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DiagnosticReport.comment");
+        throw new FHIRException("Cannot call addChild on a singleton property DiagnosticReport.comment");
       } else if (name.equals("link")) {
         this.link = new Reference();
         return this.link;
@@ -1675,7 +1675,7 @@ public class DiagnosticReport extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DiagnosticReport.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DiagnosticReport.status");
     } else if (name.equals("category")) {
       this.category = new CodeableConcept();
       return this.category;
@@ -1695,7 +1695,7 @@ public class DiagnosticReport extends DomainResource {
       this.effective = new Period();
       return this.effective;
     } else if (name.equals("issued")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DiagnosticReport.issued");
+      throw new FHIRException("Cannot call addChild on a singleton property DiagnosticReport.issued");
     } else if (name.equals("performer")) {
       this.performer = new Reference();
       return this.performer;
@@ -1710,7 +1710,7 @@ public class DiagnosticReport extends DomainResource {
     } else if (name.equals("image")) {
       return addImage();
     } else if (name.equals("conclusion")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DiagnosticReport.conclusion");
+      throw new FHIRException("Cannot call addChild on a singleton property DiagnosticReport.conclusion");
     } else if (name.equals("codedDiagnosis")) {
       return addCodedDiagnosis();
     } else if (name.equals("presentedForm")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DocumentManifest.java

@@ -1200,13 +1200,13 @@ public class DocumentManifest extends DomainResource {
     } else if (name.equals("author")) {
       return addAuthor();
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentManifest.created");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentManifest.created");
     } else if (name.equals("source")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentManifest.source");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentManifest.source");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentManifest.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentManifest.status");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentManifest.description");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentManifest.description");
     } else if (name.equals("content")) {
       return addContent();
     } else if (name.equals("related")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/DocumentReference.java

@@ -367,7 +367,7 @@ public class DocumentReference extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.code");
+        throw new FHIRException("Cannot call addChild on a singleton property DocumentReference.code");
       } else if (name.equals("target")) {
         this.target = new Reference();
         return this.target;
@@ -2317,18 +2317,18 @@ public class DocumentReference extends DomainResource {
       this.authenticator = new Reference();
       return this.authenticator;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.created");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentReference.created");
     } else if (name.equals("indexed")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.indexed");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentReference.indexed");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.status");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentReference.status");
     } else if (name.equals("docStatus")) {
       this.docStatus = new CodeableConcept();
       return this.docStatus;
     } else if (name.equals("relatesTo")) {
       return addRelatesTo();
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type DocumentReference.description");
+      throw new FHIRException("Cannot call addChild on a singleton property DocumentReference.description");
     } else if (name.equals("securityLabel")) {
       return addSecurityLabel();
     } else if (name.equals("content")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Element.java

@@ -260,7 +260,7 @@ public abstract class Element extends Base implements IBaseHasExtensions, IBaseE
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("id")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Element.id");
+      throw new FHIRException("Cannot call addChild on a singleton property Element.id");
     } else if (name.equals("extension")) {
       return addExtension();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ElementDefinition.java

@@ -862,13 +862,13 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("discriminator")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.discriminator");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.discriminator");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.description");
       } else if (name.equals("ordered")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.ordered");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.ordered");
       } else if (name.equals("rules")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.rules");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.rules");
       } else
         return super.addChild(name);
     }
@@ -1158,11 +1158,11 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("path")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.path");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.path");
       } else if (name.equals("min")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.min");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.min");
       } else if (name.equals("max")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.max");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.max");
       } else
         return super.addChild(name);
     }
@@ -1492,11 +1492,11 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.code");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.code");
       } else if (name.equals("profile")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.profile");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.profile");
       } else if (name.equals("aggregation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.aggregation");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.aggregation");
       } else
         return super.addChild(name);
     }
@@ -1932,15 +1932,15 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("key")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.key");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.key");
       } else if (name.equals("requirements")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.requirements");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.requirements");
       } else if (name.equals("severity")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.severity");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.severity");
       } else if (name.equals("human")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.human");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.human");
       } else if (name.equals("xpath")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.xpath");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.xpath");
       } else
         return super.addChild(name);
     }
@@ -2233,9 +2233,9 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("strength")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.strength");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.strength");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.description");
       } else if (name.equals("valueSetUri")) {
         this.valueSet = new UriType();
         return this.valueSet;
@@ -2516,11 +2516,11 @@ public class ElementDefinition extends Type implements ICompositeType {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("identity")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.identity");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.identity");
       } else if (name.equals("language")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.language");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.language");
       } else if (name.equals("map")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.map");
+        throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.map");
       } else
         return super.addChild(name);
     }
@@ -4555,39 +4555,39 @@ public class ElementDefinition extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("path")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.path");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.path");
     } else if (name.equals("representation")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.representation");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.representation");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.name");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.name");
     } else if (name.equals("label")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.label");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.label");
     } else if (name.equals("code")) {
       return addCode();
     } else if (name.equals("slicing")) {
       this.slicing = new ElementDefinitionSlicingComponent();
       return this.slicing;
     } else if (name.equals("short")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.short");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.short");
     } else if (name.equals("definition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.definition");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.definition");
     } else if (name.equals("comments")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.comments");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.comments");
     } else if (name.equals("requirements")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.requirements");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.requirements");
     } else if (name.equals("alias")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.alias");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.alias");
     } else if (name.equals("min")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.min");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.min");
     } else if (name.equals("max")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.max");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.max");
     } else if (name.equals("base")) {
       this.base = new ElementDefinitionBaseComponent();
       return this.base;
     } else if (name.equals("type")) {
       return addType();
     } else if (name.equals("nameReference")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.nameReference");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.nameReference");
     } else if (name.equals("defaultValueBoolean")) {
       this.defaultValue = new BooleanType();
       return this.defaultValue;
@@ -4688,7 +4688,7 @@ public class ElementDefinition extends Type implements ICompositeType {
       this.defaultValue = new Meta();
       return this.defaultValue;
     } else if (name.equals("meaningWhenMissing")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.meaningWhenMissing");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.meaningWhenMissing");
     } else if (name.equals("fixedBoolean")) {
       this.fixed = new BooleanType();
       return this.fixed;
@@ -5185,17 +5185,17 @@ public class ElementDefinition extends Type implements ICompositeType {
       this.maxValue = new Meta();
       return this.maxValue;
     } else if (name.equals("maxLength")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.maxLength");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.maxLength");
     } else if (name.equals("condition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.condition");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.condition");
     } else if (name.equals("constraint")) {
       return addConstraint();
     } else if (name.equals("mustSupport")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.mustSupport");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.mustSupport");
     } else if (name.equals("isModifier")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.isModifier");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.isModifier");
     } else if (name.equals("isSummary")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ElementDefinition.isSummary");
+      throw new FHIRException("Cannot call addChild on a singleton property ElementDefinition.isSummary");
     } else if (name.equals("binding")) {
       this.binding = new ElementDefinitionBindingComponent();
       return this.binding;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/EligibilityRequest.java

@@ -485,7 +485,7 @@ public class EligibilityRequest extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EligibilityRequest.created");
+      throw new FHIRException("Cannot call addChild on a singleton property EligibilityRequest.created");
     } else if (name.equals("target")) {
       this.target = new Reference();
       return this.target;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/EligibilityResponse.java

@@ -693,9 +693,9 @@ public class EligibilityResponse extends DomainResource {
       this.request = new Reference();
       return this.request;
     } else if (name.equals("outcome")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EligibilityResponse.outcome");
+      throw new FHIRException("Cannot call addChild on a singleton property EligibilityResponse.outcome");
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EligibilityResponse.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property EligibilityResponse.disposition");
     } else if (name.equals("ruleset")) {
       this.ruleset = new Coding();
       return this.ruleset;
@@ -703,7 +703,7 @@ public class EligibilityResponse extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EligibilityResponse.created");
+      throw new FHIRException("Cannot call addChild on a singleton property EligibilityResponse.created");
     } else if (name.equals("organization")) {
       this.organization = new Reference();
       return this.organization;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Encounter.java

@@ -789,7 +789,7 @@ public class Encounter extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Encounter.status");
+        throw new FHIRException("Cannot call addChild on a singleton property Encounter.status");
       } else if (name.equals("period")) {
         this.period = new Period();
         return this.period;
@@ -2076,7 +2076,7 @@ public class Encounter extends DomainResource {
         this.location = new Reference();
         return this.location;
       } else if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Encounter.status");
+        throw new FHIRException("Cannot call addChild on a singleton property Encounter.status");
       } else if (name.equals("period")) {
         this.period = new Period();
         return this.period;
@@ -3370,11 +3370,11 @@ public class Encounter extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Encounter.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Encounter.status");
     } else if (name.equals("statusHistory")) {
       return addStatusHistory();
     } else if (name.equals("class")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Encounter.class");
+      throw new FHIRException("Cannot call addChild on a singleton property Encounter.class");
     } else if (name.equals("type")) {
       return addType();
     } else if (name.equals("priority")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/EnrollmentRequest.java

@@ -667,7 +667,7 @@ public class EnrollmentRequest extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EnrollmentRequest.created");
+      throw new FHIRException("Cannot call addChild on a singleton property EnrollmentRequest.created");
     } else if (name.equals("target")) {
       this.target = new Reference();
       return this.target;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/EnrollmentResponse.java

@@ -693,9 +693,9 @@ public class EnrollmentResponse extends DomainResource {
       this.request = new Reference();
       return this.request;
     } else if (name.equals("outcome")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EnrollmentResponse.outcome");
+      throw new FHIRException("Cannot call addChild on a singleton property EnrollmentResponse.outcome");
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EnrollmentResponse.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property EnrollmentResponse.disposition");
     } else if (name.equals("ruleset")) {
       this.ruleset = new Coding();
       return this.ruleset;
@@ -703,7 +703,7 @@ public class EnrollmentResponse extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EnrollmentResponse.created");
+      throw new FHIRException("Cannot call addChild on a singleton property EnrollmentResponse.created");
     } else if (name.equals("organization")) {
       this.organization = new Reference();
       return this.organization;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/EpisodeOfCare.java

@@ -383,7 +383,7 @@ public class EpisodeOfCare extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("status")) {
-        throw new FHIRException("Cannot call addChild on a primitive type EpisodeOfCare.status");
+        throw new FHIRException("Cannot call addChild on a singleton property EpisodeOfCare.status");
       } else if (name.equals("period")) {
         this.period = new Period();
         return this.period;
@@ -1418,7 +1418,7 @@ public class EpisodeOfCare extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type EpisodeOfCare.status");
+      throw new FHIRException("Cannot call addChild on a singleton property EpisodeOfCare.status");
     } else if (name.equals("statusHistory")) {
       return addStatusHistory();
     } else if (name.equals("type")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ExplanationOfBenefit.java

@@ -693,9 +693,9 @@ public class ExplanationOfBenefit extends DomainResource {
       this.request = new Reference();
       return this.request;
     } else if (name.equals("outcome")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ExplanationOfBenefit.outcome");
+      throw new FHIRException("Cannot call addChild on a singleton property ExplanationOfBenefit.outcome");
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ExplanationOfBenefit.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property ExplanationOfBenefit.disposition");
     } else if (name.equals("ruleset")) {
       this.ruleset = new Coding();
       return this.ruleset;
@@ -703,7 +703,7 @@ public class ExplanationOfBenefit extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ExplanationOfBenefit.created");
+      throw new FHIRException("Cannot call addChild on a singleton property ExplanationOfBenefit.created");
     } else if (name.equals("organization")) {
       this.organization = new Reference();
       return this.organization;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Extension.java

@@ -177,7 +177,7 @@ public class Extension extends BaseExtension implements IBaseExtension<Extension
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Extension.url");
+      throw new FHIRException("Cannot call addChild on a singleton property Extension.url");
     } else if (name.equals("valueBoolean")) {
       this.value = new BooleanType();
       return this.value;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/FamilyMemberHistory.java

@@ -1389,16 +1389,16 @@ public class FamilyMemberHistory extends DomainResource {
       this.patient = new Reference();
       return this.patient;
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type FamilyMemberHistory.date");
+      throw new FHIRException("Cannot call addChild on a singleton property FamilyMemberHistory.date");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type FamilyMemberHistory.status");
+      throw new FHIRException("Cannot call addChild on a singleton property FamilyMemberHistory.status");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type FamilyMemberHistory.name");
+      throw new FHIRException("Cannot call addChild on a singleton property FamilyMemberHistory.name");
     } else if (name.equals("relationship")) {
       this.relationship = new CodeableConcept();
       return this.relationship;
     } else if (name.equals("gender")) {
-      throw new FHIRException("Cannot call addChild on a primitive type FamilyMemberHistory.gender");
+      throw new FHIRException("Cannot call addChild on a singleton property FamilyMemberHistory.gender");
     } else if (name.equals("bornPeriod")) {
       this.born = new Period();
       return this.born;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Flag.java

@@ -659,7 +659,7 @@ public class Flag extends DomainResource {
       this.category = new CodeableConcept();
       return this.category;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Flag.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Flag.status");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Goal.java

@@ -1326,11 +1326,11 @@ public class Goal extends DomainResource {
     } else if (name.equals("category")) {
       return addCategory();
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Goal.description");
+      throw new FHIRException("Cannot call addChild on a singleton property Goal.description");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Goal.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Goal.status");
     } else if (name.equals("statusDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Goal.statusDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Goal.statusDate");
     } else if (name.equals("statusReason")) {
       this.statusReason = new CodeableConcept();
       return this.statusReason;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Group.java

@@ -531,7 +531,7 @@ public class Group extends DomainResource {
         this.value = new Range();
         return this.value;
       } else if (name.equals("exclude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Group.exclude");
+        throw new FHIRException("Cannot call addChild on a singleton property Group.exclude");
       } else if (name.equals("period")) {
         this.period = new Period();
         return this.period;
@@ -793,7 +793,7 @@ public class Group extends DomainResource {
         this.period = new Period();
         return this.period;
       } else if (name.equals("inactive")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Group.inactive");
+        throw new FHIRException("Cannot call addChild on a singleton property Group.inactive");
       } else
         return super.addChild(name);
     }
@@ -1340,16 +1340,16 @@ public class Group extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Group.type");
+      throw new FHIRException("Cannot call addChild on a singleton property Group.type");
     } else if (name.equals("actual")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Group.actual");
+      throw new FHIRException("Cannot call addChild on a singleton property Group.actual");
     } else if (name.equals("code")) {
       this.code = new CodeableConcept();
       return this.code;
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Group.name");
+      throw new FHIRException("Cannot call addChild on a singleton property Group.name");
     } else if (name.equals("quantity")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Group.quantity");
+      throw new FHIRException("Cannot call addChild on a singleton property Group.quantity");
     } else if (name.equals("characteristic")) {
       return addCharacteristic();
     } else if (name.equals("member")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/HealthcareService.java

@@ -749,13 +749,13 @@ public class HealthcareService extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("daysOfWeek")) {
-        throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.daysOfWeek");
+        throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.daysOfWeek");
       } else if (name.equals("allDay")) {
-        throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.allDay");
+        throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.allDay");
       } else if (name.equals("availableStartTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.availableStartTime");
+        throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.availableStartTime");
       } else if (name.equals("availableEndTime")) {
-        throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.availableEndTime");
+        throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.availableEndTime");
       } else
         return super.addChild(name);
     }
@@ -949,7 +949,7 @@ public class HealthcareService extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.description");
+        throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.description");
       } else if (name.equals("during")) {
         this.during = new Period();
         return this.during;
@@ -2412,11 +2412,11 @@ public class HealthcareService extends DomainResource {
       this.location = new Reference();
       return this.location;
     } else if (name.equals("serviceName")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.serviceName");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.serviceName");
     } else if (name.equals("comment")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.comment");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.comment");
     } else if (name.equals("extraDetails")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.extraDetails");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.extraDetails");
     } else if (name.equals("photo")) {
       this.photo = new Attachment();
       return this.photo;
@@ -2430,23 +2430,23 @@ public class HealthcareService extends DomainResource {
       this.eligibility = new CodeableConcept();
       return this.eligibility;
     } else if (name.equals("eligibilityNote")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.eligibilityNote");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.eligibilityNote");
     } else if (name.equals("programName")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.programName");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.programName");
     } else if (name.equals("characteristic")) {
       return addCharacteristic();
     } else if (name.equals("referralMethod")) {
       return addReferralMethod();
     } else if (name.equals("publicKey")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.publicKey");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.publicKey");
     } else if (name.equals("appointmentRequired")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.appointmentRequired");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.appointmentRequired");
     } else if (name.equals("availableTime")) {
       return addAvailableTime();
     } else if (name.equals("notAvailable")) {
       return addNotAvailable();
     } else if (name.equals("availabilityExceptions")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HealthcareService.availabilityExceptions");
+      throw new FHIRException("Cannot call addChild on a singleton property HealthcareService.availabilityExceptions");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/HumanName.java

@@ -750,17 +750,17 @@ public class HumanName extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("use")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.use");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.use");
     } else if (name.equals("text")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.text");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.text");
     } else if (name.equals("family")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.family");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.family");
     } else if (name.equals("given")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.given");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.given");
     } else if (name.equals("prefix")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.prefix");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.prefix");
     } else if (name.equals("suffix")) {
-      throw new FHIRException("Cannot call addChild on a primitive type HumanName.suffix");
+      throw new FHIRException("Cannot call addChild on a singleton property HumanName.suffix");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Identifier.java

@@ -570,14 +570,14 @@ public class Identifier extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("use")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Identifier.use");
+      throw new FHIRException("Cannot call addChild on a singleton property Identifier.use");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
     } else if (name.equals("system")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Identifier.system");
+      throw new FHIRException("Cannot call addChild on a singleton property Identifier.system");
     } else if (name.equals("value")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Identifier.value");
+      throw new FHIRException("Cannot call addChild on a singleton property Identifier.value");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ImagingObjectSelection.java

@@ -346,9 +346,9 @@ public class ImagingObjectSelection extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("uid")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.uid");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.uid");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.url");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.url");
       } else if (name.equals("imagingStudy")) {
         this.imagingStudy = new Reference();
         return this.imagingStudy;
@@ -620,9 +620,9 @@ public class ImagingObjectSelection extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("uid")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.uid");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.uid");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.url");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.url");
       } else if (name.equals("instance")) {
         return addInstance();
       } else
@@ -943,11 +943,11 @@ public class ImagingObjectSelection extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sopClass")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.sopClass");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.sopClass");
       } else if (name.equals("uid")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.uid");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.uid");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.url");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.url");
       } else if (name.equals("frames")) {
         return addFrames();
       } else
@@ -1161,9 +1161,9 @@ public class ImagingObjectSelection extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("frameNumbers")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.frameNumbers");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.frameNumbers");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.url");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.url");
       } else
         return super.addChild(name);
     }
@@ -1734,7 +1734,7 @@ public class ImagingObjectSelection extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("uid")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.uid");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.uid");
     } else if (name.equals("patient")) {
       this.patient = new Reference();
       return this.patient;
@@ -1742,12 +1742,12 @@ public class ImagingObjectSelection extends DomainResource {
       this.title = new CodeableConcept();
       return this.title;
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.description");
     } else if (name.equals("author")) {
       this.author = new Reference();
       return this.author;
     } else if (name.equals("authoringTime")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingObjectSelection.authoringTime");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingObjectSelection.authoringTime");
     } else if (name.equals("study")) {
       return addStudy();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ImagingStudy.java

@@ -856,20 +856,20 @@ public class ImagingStudy extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("number")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.number");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.number");
       } else if (name.equals("modality")) {
         this.modality = new Coding();
         return this.modality;
       } else if (name.equals("uid")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.uid");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.uid");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.description");
       } else if (name.equals("numberOfInstances")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.numberOfInstances");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.numberOfInstances");
       } else if (name.equals("availability")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.availability");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.availability");
       } else if (name.equals("url")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.url");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.url");
       } else if (name.equals("bodySite")) {
         this.bodySite = new Coding();
         return this.bodySite;
@@ -877,7 +877,7 @@ public class ImagingStudy extends DomainResource {
         this.laterality = new Coding();
         return this.laterality;
       } else if (name.equals("started")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.started");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.started");
       } else if (name.equals("instance")) {
         return addInstance();
       } else
@@ -1362,15 +1362,15 @@ public class ImagingStudy extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("number")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.number");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.number");
       } else if (name.equals("uid")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.uid");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.uid");
       } else if (name.equals("sopClass")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.sopClass");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.sopClass");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.type");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.type");
       } else if (name.equals("title")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.title");
+        throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.title");
       } else if (name.equals("content")) {
         return addContent();
       } else
@@ -2503,12 +2503,12 @@ public class ImagingStudy extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("started")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.started");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.started");
     } else if (name.equals("patient")) {
       this.patient = new Reference();
       return this.patient;
     } else if (name.equals("uid")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.uid");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.uid");
     } else if (name.equals("accession")) {
       this.accession = new Identifier();
       return this.accession;
@@ -2522,20 +2522,20 @@ public class ImagingStudy extends DomainResource {
       this.referrer = new Reference();
       return this.referrer;
     } else if (name.equals("availability")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.availability");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.availability");
     } else if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.url");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.url");
     } else if (name.equals("numberOfSeries")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.numberOfSeries");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.numberOfSeries");
     } else if (name.equals("numberOfInstances")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.numberOfInstances");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.numberOfInstances");
     } else if (name.equals("procedure")) {
       return addProcedure();
     } else if (name.equals("interpreter")) {
       this.interpreter = new Reference();
       return this.interpreter;
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImagingStudy.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ImagingStudy.description");
     } else if (name.equals("series")) {
       return addSeries();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Immunization.java

@@ -454,12 +454,12 @@ public class Immunization extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("date")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.date");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.date");
       } else if (name.equals("detail")) {
         this.detail = new Reference();
         return this.detail;
       } else if (name.equals("reported")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.reported");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.reported");
       } else
         return super.addChild(name);
     }
@@ -1007,16 +1007,16 @@ public class Immunization extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("doseSequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.doseSequence");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.doseSequence");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.description");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.description");
       } else if (name.equals("authority")) {
         this.authority = new Reference();
         return this.authority;
       } else if (name.equals("series")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.series");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.series");
       } else if (name.equals("seriesDoses")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Immunization.seriesDoses");
+        throw new FHIRException("Cannot call addChild on a singleton property Immunization.seriesDoses");
       } else if (name.equals("targetDisease")) {
         return addTargetDisease();
       } else if (name.equals("doseStatus")) {
@@ -2335,9 +2335,9 @@ public class Immunization extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.status");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.date");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.date");
     } else if (name.equals("vaccineCode")) {
       this.vaccineCode = new CodeableConcept();
       return this.vaccineCode;
@@ -2345,9 +2345,9 @@ public class Immunization extends DomainResource {
       this.patient = new Reference();
       return this.patient;
     } else if (name.equals("wasNotGiven")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.wasNotGiven");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.wasNotGiven");
     } else if (name.equals("reported")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.reported");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.reported");
     } else if (name.equals("performer")) {
       this.performer = new Reference();
       return this.performer;
@@ -2364,9 +2364,9 @@ public class Immunization extends DomainResource {
       this.location = new Reference();
       return this.location;
     } else if (name.equals("lotNumber")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.lotNumber");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.lotNumber");
     } else if (name.equals("expirationDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Immunization.expirationDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Immunization.expirationDate");
     } else if (name.equals("site")) {
       this.site = new CodeableConcept();
       return this.site;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ImmunizationRecommendation.java

@@ -552,12 +552,12 @@ public class ImmunizationRecommendation extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("date")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.date");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.date");
       } else if (name.equals("vaccineCode")) {
         this.vaccineCode = new CodeableConcept();
         return this.vaccineCode;
       } else if (name.equals("doseNumber")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.doseNumber");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.doseNumber");
       } else if (name.equals("forecastStatus")) {
         this.forecastStatus = new CodeableConcept();
         return this.forecastStatus;
@@ -783,7 +783,7 @@ public class ImmunizationRecommendation extends DomainResource {
         this.code = new CodeableConcept();
         return this.code;
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.value");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.value");
       } else
         return super.addChild(name);
     }
@@ -1135,14 +1135,14 @@ public class ImmunizationRecommendation extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("doseSequence")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.doseSequence");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.doseSequence");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.description");
       } else if (name.equals("authority")) {
         this.authority = new Reference();
         return this.authority;
       } else if (name.equals("series")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImmunizationRecommendation.series");
+        throw new FHIRException("Cannot call addChild on a singleton property ImmunizationRecommendation.series");
       } else
         return super.addChild(name);
     }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ImplementationGuide.java

@@ -741,7 +741,7 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -946,9 +946,9 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.type");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.type");
       } else if (name.equals("uri")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.uri");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.uri");
       } else
         return super.addChild(name);
     }
@@ -1212,9 +1212,9 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.name");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.description");
       } else if (name.equals("resource")) {
         return addResource();
       } else
@@ -1714,13 +1714,13 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("purpose")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.purpose");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.purpose");
       } else if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.name");
       } else if (name.equals("description")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.description");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.description");
       } else if (name.equals("acronym")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.acronym");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.acronym");
       } else if (name.equals("sourceUri")) {
         this.source = new UriType();
         return this.source;
@@ -1946,7 +1946,7 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.type");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.type");
       } else if (name.equals("profile")) {
         this.profile = new Reference();
         return this.profile;
@@ -2484,17 +2484,17 @@ public class ImplementationGuide extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("source")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.source");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.source");
       } else if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.name");
       } else if (name.equals("kind")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.kind");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.kind");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.type");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.type");
       } else if (name.equals("package")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.package");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.package");
       } else if (name.equals("format")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.format");
+        throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.format");
       } else if (name.equals("page")) {
         return addPage();
       } else
@@ -3739,29 +3739,29 @@ public class ImplementationGuide extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.url");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.url");
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.version");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.version");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.name");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.status");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.status");
     } else if (name.equals("experimental")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.experimental");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.experimental");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.date");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.date");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.description");
     } else if (name.equals("useContext")) {
       return addUseContext();
     } else if (name.equals("copyright")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.copyright");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.copyright");
     } else if (name.equals("fhirVersion")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.fhirVersion");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.fhirVersion");
     } else if (name.equals("dependency")) {
       return addDependency();
     } else if (name.equals("package")) {
@@ -3769,7 +3769,7 @@ public class ImplementationGuide extends DomainResource {
     } else if (name.equals("global")) {
       return addGlobal();
     } else if (name.equals("binary")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ImplementationGuide.binary");
+      throw new FHIRException("Cannot call addChild on a singleton property ImplementationGuide.binary");
     } else if (name.equals("page")) {
       this.page = new ImplementationGuidePageComponent();
       return this.page;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/List_.java

@@ -577,9 +577,9 @@ public class List_ extends DomainResource {
         this.flag = new CodeableConcept();
         return this.flag;
       } else if (name.equals("deleted")) {
-        throw new FHIRException("Cannot call addChild on a primitive type List_.deleted");
+        throw new FHIRException("Cannot call addChild on a singleton property List_.deleted");
       } else if (name.equals("date")) {
-        throw new FHIRException("Cannot call addChild on a primitive type List_.date");
+        throw new FHIRException("Cannot call addChild on a singleton property List_.date");
       } else if (name.equals("item")) {
         this.item = new Reference();
         return this.item;
@@ -1424,7 +1424,7 @@ public class List_ extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("title")) {
-      throw new FHIRException("Cannot call addChild on a primitive type List_.title");
+      throw new FHIRException("Cannot call addChild on a singleton property List_.title");
     } else if (name.equals("code")) {
       this.code = new CodeableConcept();
       return this.code;
@@ -1438,16 +1438,16 @@ public class List_ extends DomainResource {
       this.encounter = new Reference();
       return this.encounter;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type List_.status");
+      throw new FHIRException("Cannot call addChild on a singleton property List_.status");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type List_.date");
+      throw new FHIRException("Cannot call addChild on a singleton property List_.date");
     } else if (name.equals("orderedBy")) {
       this.orderedBy = new CodeableConcept();
       return this.orderedBy;
     } else if (name.equals("mode")) {
-      throw new FHIRException("Cannot call addChild on a primitive type List_.mode");
+      throw new FHIRException("Cannot call addChild on a singleton property List_.mode");
     } else if (name.equals("note")) {
-      throw new FHIRException("Cannot call addChild on a primitive type List_.note");
+      throw new FHIRException("Cannot call addChild on a singleton property List_.note");
     } else if (name.equals("entry")) {
       return addEntry();
     } else if (name.equals("emptyReason")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Location.java

@@ -544,11 +544,11 @@ public class Location extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("longitude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Location.longitude");
+        throw new FHIRException("Cannot call addChild on a singleton property Location.longitude");
       } else if (name.equals("latitude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Location.latitude");
+        throw new FHIRException("Cannot call addChild on a singleton property Location.latitude");
       } else if (name.equals("altitude")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Location.altitude");
+        throw new FHIRException("Cannot call addChild on a singleton property Location.altitude");
       } else
         return super.addChild(name);
     }
@@ -1295,13 +1295,13 @@ public class Location extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Location.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Location.status");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Location.name");
+      throw new FHIRException("Cannot call addChild on a singleton property Location.name");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Location.description");
+      throw new FHIRException("Cannot call addChild on a singleton property Location.description");
     } else if (name.equals("mode")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Location.mode");
+      throw new FHIRException("Cannot call addChild on a singleton property Location.mode");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Media.java

@@ -930,7 +930,7 @@ public class Media extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.type");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.type");
     } else if (name.equals("subtype")) {
       this.subtype = new CodeableConcept();
       return this.subtype;
@@ -946,15 +946,15 @@ public class Media extends DomainResource {
       this.view = new CodeableConcept();
       return this.view;
     } else if (name.equals("deviceName")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.deviceName");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.deviceName");
     } else if (name.equals("height")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.height");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.height");
     } else if (name.equals("width")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.width");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.width");
     } else if (name.equals("frames")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.frames");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.frames");
     } else if (name.equals("duration")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Media.duration");
+      throw new FHIRException("Cannot call addChild on a singleton property Media.duration");
     } else if (name.equals("content")) {
       this.content = new Attachment();
       return this.content;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Medication.java

@@ -627,9 +627,9 @@ public class Medication extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("lotNumber")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Medication.lotNumber");
+        throw new FHIRException("Cannot call addChild on a singleton property Medication.lotNumber");
       } else if (name.equals("expirationDate")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Medication.expirationDate");
+        throw new FHIRException("Cannot call addChild on a singleton property Medication.expirationDate");
       } else
         return super.addChild(name);
     }
@@ -1306,7 +1306,7 @@ public class Medication extends DomainResource {
       this.code = new CodeableConcept();
       return this.code;
     } else if (name.equals("isBrand")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Medication.isBrand");
+      throw new FHIRException("Cannot call addChild on a singleton property Medication.isBrand");
     } else if (name.equals("manufacturer")) {
       this.manufacturer = new Reference();
       return this.manufacturer;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/MedicationAdministration.java

@@ -619,7 +619,7 @@ public class MedicationAdministration extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.text");
+        throw new FHIRException("Cannot call addChild on a singleton property MedicationAdministration.text");
       } else if (name.equals("siteCodeableConcept")) {
         this.site = new CodeableConcept();
         return this.site;
@@ -1691,7 +1691,7 @@ public class MedicationAdministration extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.status");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationAdministration.status");
     } else if (name.equals("patient")) {
       this.patient = new Reference();
       return this.patient;
@@ -1705,7 +1705,7 @@ public class MedicationAdministration extends DomainResource {
       this.prescription = new Reference();
       return this.prescription;
     } else if (name.equals("wasNotGiven")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.wasNotGiven");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationAdministration.wasNotGiven");
     } else if (name.equals("reasonNotGiven")) {
       return addReasonNotGiven();
     } else if (name.equals("reasonGiven")) {
@@ -1725,7 +1725,7 @@ public class MedicationAdministration extends DomainResource {
     } else if (name.equals("device")) {
       return addDevice();
     } else if (name.equals("note")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationAdministration.note");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationAdministration.note");
     } else if (name.equals("dosage")) {
       this.dosage = new MedicationAdministrationDosageComponent();
       return this.dosage;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/MedicationDispense.java

@@ -857,7 +857,7 @@ public class MedicationDispense extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.text");
+        throw new FHIRException("Cannot call addChild on a singleton property MedicationDispense.text");
       } else if (name.equals("additionalInstructions")) {
         this.additionalInstructions = new CodeableConcept();
         return this.additionalInstructions;
@@ -2260,7 +2260,7 @@ public class MedicationDispense extends DomainResource {
       this.identifier = new Identifier();
       return this.identifier;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.status");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationDispense.status");
     } else if (name.equals("patient")) {
       this.patient = new Reference();
       return this.patient;
@@ -2285,16 +2285,16 @@ public class MedicationDispense extends DomainResource {
       this.medication = new Reference();
       return this.medication;
     } else if (name.equals("whenPrepared")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.whenPrepared");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationDispense.whenPrepared");
     } else if (name.equals("whenHandedOver")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.whenHandedOver");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationDispense.whenHandedOver");
     } else if (name.equals("destination")) {
       this.destination = new Reference();
       return this.destination;
     } else if (name.equals("receiver")) {
       return addReceiver();
     } else if (name.equals("note")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationDispense.note");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationDispense.note");
     } else if (name.equals("dosageInstruction")) {
       return addDosageInstruction();
     } else if (name.equals("substitution")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/MedicationOrder.java

@@ -881,7 +881,7 @@ public class MedicationOrder extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.text");
+        throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.text");
       } else if (name.equals("additionalInstructions")) {
         this.additionalInstructions = new CodeableConcept();
         return this.additionalInstructions;
@@ -1303,7 +1303,7 @@ public class MedicationOrder extends DomainResource {
         this.validityPeriod = new Period();
         return this.validityPeriod;
       } else if (name.equals("numberOfRepeatsAllowed")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.numberOfRepeatsAllowed");
+        throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.numberOfRepeatsAllowed");
       } else if (name.equals("quantity")) {
         this.quantity = new SimpleQuantity();
         return this.quantity;
@@ -2519,11 +2519,11 @@ public class MedicationOrder extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("dateWritten")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateWritten");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.dateWritten");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.status");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.status");
     } else if (name.equals("dateEnded")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.dateEnded");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.dateEnded");
     } else if (name.equals("reasonEnded")) {
       this.reasonEnded = new CodeableConcept();
       return this.reasonEnded;
@@ -2543,7 +2543,7 @@ public class MedicationOrder extends DomainResource {
       this.reason = new Reference();
       return this.reason;
     } else if (name.equals("note")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationOrder.note");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationOrder.note");
     } else if (name.equals("medicationCodeableConcept")) {
       this.medication = new CodeableConcept();
       return this.medication;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/MedicationStatement.java

@@ -813,7 +813,7 @@ public class MedicationStatement extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.text");
+        throw new FHIRException("Cannot call addChild on a singleton property MedicationStatement.text");
       } else if (name.equals("timing")) {
         this.timing = new Timing();
         return this.timing;
@@ -1829,11 +1829,11 @@ public class MedicationStatement extends DomainResource {
       this.informationSource = new Reference();
       return this.informationSource;
     } else if (name.equals("dateAsserted")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.dateAsserted");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationStatement.dateAsserted");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.status");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationStatement.status");
     } else if (name.equals("wasNotTaken")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.wasNotTaken");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationStatement.wasNotTaken");
     } else if (name.equals("reasonNotTaken")) {
       return addReasonNotTaken();
     } else if (name.equals("reasonForUseCodeableConcept")) {
@@ -1849,7 +1849,7 @@ public class MedicationStatement extends DomainResource {
       this.effective = new Period();
       return this.effective;
     } else if (name.equals("note")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MedicationStatement.note");
+      throw new FHIRException("Cannot call addChild on a singleton property MedicationStatement.note");
     } else if (name.equals("supportingInformation")) {
       return addSupportingInformation();
     } else if (name.equals("medicationCodeableConcept")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/MessageHeader.java

@@ -419,9 +419,9 @@ public class MessageHeader extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("identifier")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.identifier");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.identifier");
       } else if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.code");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.code");
       } else if (name.equals("details")) {
         this.details = new Reference();
         return this.details;
@@ -808,16 +808,16 @@ public class MessageHeader extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.name");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.name");
       } else if (name.equals("software")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.software");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.software");
       } else if (name.equals("version")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.version");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.version");
       } else if (name.equals("contact")) {
         this.contact = new ContactPoint();
         return this.contact;
       } else if (name.equals("endpoint")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.endpoint");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.endpoint");
       } else
         return super.addChild(name);
     }
@@ -1101,12 +1101,12 @@ public class MessageHeader extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.name");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.name");
       } else if (name.equals("target")) {
         this.target = new Reference();
         return this.target;
       } else if (name.equals("endpoint")) {
-        throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.endpoint");
+        throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.endpoint");
       } else
         return super.addChild(name);
     }
@@ -1852,7 +1852,7 @@ public class MessageHeader extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("timestamp")) {
-      throw new FHIRException("Cannot call addChild on a primitive type MessageHeader.timestamp");
+      throw new FHIRException("Cannot call addChild on a singleton property MessageHeader.timestamp");
     } else if (name.equals("event")) {
       this.event = new Coding();
       return this.event;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Meta.java

@@ -436,11 +436,11 @@ public class Meta extends Type implements IBaseMetaType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("versionId")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Meta.versionId");
+      throw new FHIRException("Cannot call addChild on a singleton property Meta.versionId");
     } else if (name.equals("lastUpdated")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Meta.lastUpdated");
+      throw new FHIRException("Cannot call addChild on a singleton property Meta.lastUpdated");
     } else if (name.equals("profile")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Meta.profile");
+      throw new FHIRException("Cannot call addChild on a singleton property Meta.profile");
     } else if (name.equals("security")) {
       return addSecurity();
     } else if (name.equals("tag")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/NamingSystem.java

@@ -486,7 +486,7 @@ public class NamingSystem extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.name");
+        throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -810,11 +810,11 @@ public class NamingSystem extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.type");
+        throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.type");
       } else if (name.equals("value")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.value");
+        throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.value");
       } else if (name.equals("preferred")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.preferred");
+        throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.preferred");
       } else if (name.equals("period")) {
         this.period = new Period();
         return this.period;
@@ -1744,28 +1744,28 @@ public class NamingSystem extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.name");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.status");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.status");
     } else if (name.equals("kind")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.kind");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.kind");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("responsible")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.responsible");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.responsible");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.date");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.date");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.description");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.description");
     } else if (name.equals("useContext")) {
       return addUseContext();
     } else if (name.equals("usage")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NamingSystem.usage");
+      throw new FHIRException("Cannot call addChild on a singleton property NamingSystem.usage");
     } else if (name.equals("uniqueId")) {
       return addUniqueId();
     } else if (name.equals("replacedBy")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Narrative.java

@@ -336,7 +336,7 @@ public class Narrative extends BaseNarrative implements INarrative {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Narrative.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Narrative.status");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/NutritionOrder.java

@@ -670,7 +670,7 @@ public class NutritionOrder extends DomainResource {
       } else if (name.equals("fluidConsistencyType")) {
         return addFluidConsistencyType();
       } else if (name.equals("instruction")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.instruction");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.instruction");
       } else
         return super.addChild(name);
     }
@@ -1355,14 +1355,14 @@ public class NutritionOrder extends DomainResource {
         this.type = new CodeableConcept();
         return this.type;
       } else if (name.equals("productName")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.productName");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.productName");
       } else if (name.equals("schedule")) {
         return addSchedule();
       } else if (name.equals("quantity")) {
         this.quantity = new SimpleQuantity();
         return this.quantity;
       } else if (name.equals("instruction")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.instruction");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.instruction");
       } else
         return super.addChild(name);
     }
@@ -1945,12 +1945,12 @@ public class NutritionOrder extends DomainResource {
         this.baseFormulaType = new CodeableConcept();
         return this.baseFormulaType;
       } else if (name.equals("baseFormulaProductName")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.baseFormulaProductName");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.baseFormulaProductName");
       } else if (name.equals("additiveType")) {
         this.additiveType = new CodeableConcept();
         return this.additiveType;
       } else if (name.equals("additiveProductName")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.additiveProductName");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.additiveProductName");
       } else if (name.equals("caloricDensity")) {
         this.caloricDensity = new SimpleQuantity();
         return this.caloricDensity;
@@ -1963,7 +1963,7 @@ public class NutritionOrder extends DomainResource {
         this.maxVolumeToDeliver = new SimpleQuantity();
         return this.maxVolumeToDeliver;
       } else if (name.equals("administrationInstruction")) {
-        throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.administrationInstruction");
+        throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.administrationInstruction");
       } else
         return super.addChild(name);
     }
@@ -3089,9 +3089,9 @@ public class NutritionOrder extends DomainResource {
       this.encounter = new Reference();
       return this.encounter;
     } else if (name.equals("dateTime")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.dateTime");
+      throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.dateTime");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type NutritionOrder.status");
+      throw new FHIRException("Cannot call addChild on a singleton property NutritionOrder.status");
     } else if (name.equals("allergyIntolerance")) {
       return addAllergyIntolerance();
     } else if (name.equals("foodPreferenceModifier")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Observation.java

@@ -755,7 +755,7 @@ public class Observation extends DomainResource {
         this.age = new Range();
         return this.age;
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Observation.text");
+        throw new FHIRException("Cannot call addChild on a singleton property Observation.text");
       } else
         return super.addChild(name);
     }
@@ -979,7 +979,7 @@ public class Observation extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Observation.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Observation.type");
       } else if (name.equals("target")) {
         this.target = new Reference();
         return this.target;
@@ -2837,7 +2837,7 @@ public class Observation extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Observation.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Observation.status");
     } else if (name.equals("category")) {
       this.category = new CodeableConcept();
       return this.category;
@@ -2857,7 +2857,7 @@ public class Observation extends DomainResource {
       this.effective = new Period();
       return this.effective;
     } else if (name.equals("issued")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Observation.issued");
+      throw new FHIRException("Cannot call addChild on a singleton property Observation.issued");
     } else if (name.equals("performer")) {
       return addPerformer();
     } else if (name.equals("valueQuantity")) {
@@ -2897,7 +2897,7 @@ public class Observation extends DomainResource {
       this.interpretation = new CodeableConcept();
       return this.interpretation;
     } else if (name.equals("comments")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Observation.comments");
+      throw new FHIRException("Cannot call addChild on a singleton property Observation.comments");
     } else if (name.equals("bodySite")) {
       this.bodySite = new CodeableConcept();
       return this.bodySite;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/OperationDefinition.java

@@ -424,7 +424,7 @@ public class OperationDefinition extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.name");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.name");
       } else if (name.equals("telecom")) {
         return addTelecom();
       } else
@@ -1056,17 +1056,17 @@ public class OperationDefinition extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.name");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.name");
       } else if (name.equals("use")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.use");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.use");
       } else if (name.equals("min")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.min");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.min");
       } else if (name.equals("max")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.max");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.max");
       } else if (name.equals("documentation")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.documentation");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.documentation");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.type");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.type");
       } else if (name.equals("profile")) {
         this.profile = new Reference();
         return this.profile;
@@ -1314,7 +1314,7 @@ public class OperationDefinition extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("strength")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.strength");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.strength");
       } else if (name.equals("valueSetUri")) {
         this.valueSet = new UriType();
         return this.valueSet;
@@ -2711,42 +2711,42 @@ public class OperationDefinition extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("url")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.url");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.url");
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.version");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.version");
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.name");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.name");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.status");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.status");
     } else if (name.equals("kind")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.kind");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.kind");
     } else if (name.equals("experimental")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.experimental");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.experimental");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.publisher");
     } else if (name.equals("contact")) {
       return addContact();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.date");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.date");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.description");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.description");
     } else if (name.equals("requirements")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.requirements");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.requirements");
     } else if (name.equals("idempotent")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.idempotent");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.idempotent");
     } else if (name.equals("code")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.code");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.code");
     } else if (name.equals("notes")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.notes");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.notes");
     } else if (name.equals("base")) {
       this.base = new Reference();
       return this.base;
     } else if (name.equals("system")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.system");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.system");
     } else if (name.equals("type")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.type");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.type");
     } else if (name.equals("instance")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OperationDefinition.instance");
+      throw new FHIRException("Cannot call addChild on a singleton property OperationDefinition.instance");
     } else if (name.equals("parameter")) {
       return addParameter();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/OperationOutcome.java

@@ -1245,16 +1245,16 @@ public class OperationOutcome extends DomainResource implements IBaseOperationOu
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("severity")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationOutcome.severity");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationOutcome.severity");
       } else if (name.equals("code")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationOutcome.code");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationOutcome.code");
       } else if (name.equals("details")) {
         this.details = new CodeableConcept();
         return this.details;
       } else if (name.equals("diagnostics")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationOutcome.diagnostics");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationOutcome.diagnostics");
       } else if (name.equals("location")) {
-        throw new FHIRException("Cannot call addChild on a primitive type OperationOutcome.location");
+        throw new FHIRException("Cannot call addChild on a singleton property OperationOutcome.location");
       } else
         return super.addChild(name);
     }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Order.java

@@ -688,7 +688,7 @@ public class Order extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Order.date");
+      throw new FHIRException("Cannot call addChild on a singleton property Order.date");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/OrderResponse.java

@@ -817,14 +817,14 @@ public class OrderResponse extends DomainResource {
       this.request = new Reference();
       return this.request;
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OrderResponse.date");
+      throw new FHIRException("Cannot call addChild on a singleton property OrderResponse.date");
     } else if (name.equals("who")) {
       this.who = new Reference();
       return this.who;
     } else if (name.equals("orderStatus")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OrderResponse.orderStatus");
+      throw new FHIRException("Cannot call addChild on a singleton property OrderResponse.orderStatus");
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type OrderResponse.description");
+      throw new FHIRException("Cannot call addChild on a singleton property OrderResponse.description");
     } else if (name.equals("fulfillment")) {
       return addFulfillment();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Organization.java

@@ -767,12 +767,12 @@ public class Organization extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("active")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Organization.active");
+      throw new FHIRException("Cannot call addChild on a singleton property Organization.active");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
     } else if (name.equals("name")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Organization.name");
+      throw new FHIRException("Cannot call addChild on a singleton property Organization.name");
     } else if (name.equals("telecom")) {
       return addTelecom();
     } else if (name.equals("address")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Parameters.java

@@ -259,7 +259,7 @@ public class Parameters extends Resource implements IBaseParameters {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("name")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Parameters.name");
+        throw new FHIRException("Cannot call addChild on a singleton property Parameters.name");
       } else if (name.equals("valueBoolean")) {
         this.value = new BooleanType();
         return this.value;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Patient.java

@@ -590,7 +590,7 @@ public class Patient extends DomainResource {
         this.address = new Address();
         return this.address;
       } else if (name.equals("gender")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Patient.gender");
+        throw new FHIRException("Cannot call addChild on a singleton property Patient.gender");
       } else if (name.equals("organization")) {
         this.organization = new Reference();
         return this.organization;
@@ -1013,7 +1013,7 @@ public class Patient extends DomainResource {
         this.language = new CodeableConcept();
         return this.language;
       } else if (name.equals("preferred")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Patient.preferred");
+        throw new FHIRException("Cannot call addChild on a singleton property Patient.preferred");
       } else
         return super.addChild(name);
     }
@@ -1226,7 +1226,7 @@ public class Patient extends DomainResource {
         this.other = new Reference();
         return this.other;
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Patient.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Patient.type");
       } else
         return super.addChild(name);
     }
@@ -2254,15 +2254,15 @@ public class Patient extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("active")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Patient.active");
+      throw new FHIRException("Cannot call addChild on a singleton property Patient.active");
     } else if (name.equals("name")) {
       return addName();
     } else if (name.equals("telecom")) {
       return addTelecom();
     } else if (name.equals("gender")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Patient.gender");
+      throw new FHIRException("Cannot call addChild on a singleton property Patient.gender");
     } else if (name.equals("birthDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Patient.birthDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Patient.birthDate");
     } else if (name.equals("deceasedBoolean")) {
       this.deceased = new BooleanType();
       return this.deceased;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/PaymentNotice.java

@@ -656,7 +656,7 @@ public class PaymentNotice extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type PaymentNotice.created");
+      throw new FHIRException("Cannot call addChild on a singleton property PaymentNotice.created");
     } else if (name.equals("target")) {
       this.target = new Reference();
       return this.target;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/PaymentReconciliation.java

@@ -499,7 +499,7 @@ public class PaymentReconciliation extends DomainResource {
         this.payee = new Reference();
         return this.payee;
       } else if (name.equals("date")) {
-        throw new FHIRException("Cannot call addChild on a primitive type PaymentReconciliation.date");
+        throw new FHIRException("Cannot call addChild on a singleton property PaymentReconciliation.date");
       } else if (name.equals("amount")) {
         this.amount = new Money();
         return this.amount;
@@ -682,7 +682,7 @@ public class PaymentReconciliation extends DomainResource {
         this.type = new Coding();
         return this.type;
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type PaymentReconciliation.text");
+        throw new FHIRException("Cannot call addChild on a singleton property PaymentReconciliation.text");
       } else
         return super.addChild(name);
     }
@@ -1589,9 +1589,9 @@ public class PaymentReconciliation extends DomainResource {
       this.request = new Reference();
       return this.request;
     } else if (name.equals("outcome")) {
-      throw new FHIRException("Cannot call addChild on a primitive type PaymentReconciliation.outcome");
+      throw new FHIRException("Cannot call addChild on a singleton property PaymentReconciliation.outcome");
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type PaymentReconciliation.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property PaymentReconciliation.disposition");
     } else if (name.equals("ruleset")) {
       this.ruleset = new Coding();
       return this.ruleset;
@@ -1599,7 +1599,7 @@ public class PaymentReconciliation extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type PaymentReconciliation.created");
+      throw new FHIRException("Cannot call addChild on a singleton property PaymentReconciliation.created");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Period.java

@@ -211,9 +211,9 @@ public class Period extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("start")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Period.start");
+      throw new FHIRException("Cannot call addChild on a singleton property Period.start");
     } else if (name.equals("end")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Period.end");
+      throw new FHIRException("Cannot call addChild on a singleton property Period.end");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Person.java

@@ -373,7 +373,7 @@ public class Person extends DomainResource {
         this.target = new Reference();
         return this.target;
       } else if (name.equals("assurance")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Person.assurance");
+        throw new FHIRException("Cannot call addChild on a singleton property Person.assurance");
       } else
         return super.addChild(name);
     }
@@ -1010,9 +1010,9 @@ public class Person extends DomainResource {
     } else if (name.equals("telecom")) {
       return addTelecom();
     } else if (name.equals("gender")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Person.gender");
+      throw new FHIRException("Cannot call addChild on a singleton property Person.gender");
     } else if (name.equals("birthDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Person.birthDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Person.birthDate");
     } else if (name.equals("address")) {
       return addAddress();
     } else if (name.equals("photo")) {
@@ -1022,7 +1022,7 @@ public class Person extends DomainResource {
       this.managingOrganization = new Reference();
       return this.managingOrganization;
     } else if (name.equals("active")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Person.active");
+      throw new FHIRException("Cannot call addChild on a singleton property Person.active");
     } else if (name.equals("link")) {
       return addLink();
     } else

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Practitioner.java

@@ -1462,7 +1462,7 @@ public class Practitioner extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("active")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Practitioner.active");
+      throw new FHIRException("Cannot call addChild on a singleton property Practitioner.active");
     } else if (name.equals("name")) {
       this.name = new HumanName();
       return this.name;
@@ -1471,9 +1471,9 @@ public class Practitioner extends DomainResource {
     } else if (name.equals("address")) {
       return addAddress();
     } else if (name.equals("gender")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Practitioner.gender");
+      throw new FHIRException("Cannot call addChild on a singleton property Practitioner.gender");
     } else if (name.equals("birthDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Practitioner.birthDate");
+      throw new FHIRException("Cannot call addChild on a singleton property Practitioner.birthDate");
     } else if (name.equals("photo")) {
       return addPhoto();
     } else if (name.equals("practitionerRole")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Procedure.java

@@ -1901,7 +1901,7 @@ public class Procedure extends DomainResource {
       this.subject = new Reference();
       return this.subject;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Procedure.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Procedure.status");
     } else if (name.equals("category")) {
       this.category = new CodeableConcept();
       return this.category;
@@ -1909,7 +1909,7 @@ public class Procedure extends DomainResource {
       this.code = new CodeableConcept();
       return this.code;
     } else if (name.equals("notPerformed")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Procedure.notPerformed");
+      throw new FHIRException("Cannot call addChild on a singleton property Procedure.notPerformed");
     } else if (name.equals("reasonNotPerformed")) {
       return addReasonNotPerformed();
     } else if (name.equals("bodySite")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ProcedureRequest.java

@@ -1433,7 +1433,7 @@ public class ProcedureRequest extends DomainResource {
       this.performer = new Reference();
       return this.performer;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcedureRequest.status");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcedureRequest.status");
     } else if (name.equals("notes")) {
       return addNotes();
     } else if (name.equals("asNeededBoolean")) {
@@ -1443,12 +1443,12 @@ public class ProcedureRequest extends DomainResource {
       this.asNeeded = new CodeableConcept();
       return this.asNeeded;
     } else if (name.equals("orderedOn")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcedureRequest.orderedOn");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcedureRequest.orderedOn");
     } else if (name.equals("orderer")) {
       this.orderer = new Reference();
       return this.orderer;
     } else if (name.equals("priority")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcedureRequest.priority");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcedureRequest.priority");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ProcessRequest.java

@@ -294,7 +294,7 @@ public class ProcessRequest extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("sequenceLinkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.sequenceLinkId");
+        throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.sequenceLinkId");
       } else
         return super.addChild(name);
     }
@@ -1330,7 +1330,7 @@ public class ProcessRequest extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("action")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.action");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.action");
     } else if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("ruleset")) {
@@ -1340,7 +1340,7 @@ public class ProcessRequest extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.created");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.created");
     } else if (name.equals("target")) {
       this.target = new Reference();
       return this.target;
@@ -1357,15 +1357,15 @@ public class ProcessRequest extends DomainResource {
       this.response = new Reference();
       return this.response;
     } else if (name.equals("nullify")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.nullify");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.nullify");
     } else if (name.equals("reference")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.reference");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.reference");
     } else if (name.equals("item")) {
       return addItem();
     } else if (name.equals("include")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.include");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.include");
     } else if (name.equals("exclude")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessRequest.exclude");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessRequest.exclude");
     } else if (name.equals("period")) {
       this.period = new Period();
       return this.period;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ProcessResponse.java

@@ -175,7 +175,7 @@ public class ProcessResponse extends DomainResource {
         this.type = new Coding();
         return this.type;
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type ProcessResponse.text");
+        throw new FHIRException("Cannot call addChild on a singleton property ProcessResponse.text");
       } else
         return super.addChild(name);
     }
@@ -971,7 +971,7 @@ public class ProcessResponse extends DomainResource {
       this.outcome = new Coding();
       return this.outcome;
     } else if (name.equals("disposition")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessResponse.disposition");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessResponse.disposition");
     } else if (name.equals("ruleset")) {
       this.ruleset = new Coding();
       return this.ruleset;
@@ -979,7 +979,7 @@ public class ProcessResponse extends DomainResource {
       this.originalRuleset = new Coding();
       return this.originalRuleset;
     } else if (name.equals("created")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ProcessResponse.created");
+      throw new FHIRException("Cannot call addChild on a singleton property ProcessResponse.created");
     } else if (name.equals("organization")) {
       this.organization = new Reference();
       return this.organization;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Provenance.java

@@ -648,7 +648,7 @@ public class Provenance extends DomainResource {
         this.type = new CodeableConcept();
         return this.type;
       } else if (name.equals("target")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Provenance.target");
+        throw new FHIRException("Cannot call addChild on a singleton property Provenance.target");
       } else
         return super.addChild(name);
     }
@@ -1003,14 +1003,14 @@ public class Provenance extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("role")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Provenance.role");
+        throw new FHIRException("Cannot call addChild on a singleton property Provenance.role");
       } else if (name.equals("type")) {
         this.type = new Coding();
         return this.type;
       } else if (name.equals("reference")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Provenance.reference");
+        throw new FHIRException("Cannot call addChild on a singleton property Provenance.reference");
       } else if (name.equals("display")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Provenance.display");
+        throw new FHIRException("Cannot call addChild on a singleton property Provenance.display");
       } else if (name.equals("agent")) {
         this.agent = new ProvenanceAgentComponent();
         return this.agent;
@@ -1689,7 +1689,7 @@ public class Provenance extends DomainResource {
       this.period = new Period();
       return this.period;
     } else if (name.equals("recorded")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Provenance.recorded");
+      throw new FHIRException("Cannot call addChild on a singleton property Provenance.recorded");
     } else if (name.equals("reason")) {
       return addReason();
     } else if (name.equals("activity")) {
@@ -1699,7 +1699,7 @@ public class Provenance extends DomainResource {
       this.location = new Reference();
       return this.location;
     } else if (name.equals("policy")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Provenance.policy");
+      throw new FHIRException("Cannot call addChild on a singleton property Provenance.policy");
     } else if (name.equals("agent")) {
       return addAgent();
     } else if (name.equals("entity")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Quantity.java

@@ -574,15 +574,15 @@ public class Quantity extends Type implements ICompositeType {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("value")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Quantity.value");
+      throw new FHIRException("Cannot call addChild on a singleton property Quantity.value");
     } else if (name.equals("comparator")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Quantity.comparator");
+      throw new FHIRException("Cannot call addChild on a singleton property Quantity.comparator");
     } else if (name.equals("unit")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Quantity.unit");
+      throw new FHIRException("Cannot call addChild on a singleton property Quantity.unit");
     } else if (name.equals("system")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Quantity.system");
+      throw new FHIRException("Cannot call addChild on a singleton property Quantity.system");
     } else if (name.equals("code")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Quantity.code");
+      throw new FHIRException("Cannot call addChild on a singleton property Quantity.code");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Questionnaire.java

@@ -1089,17 +1089,17 @@ public class Questionnaire extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("linkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.linkId");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.linkId");
       } else if (name.equals("title")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.title");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.title");
       } else if (name.equals("concept")) {
         return addConcept();
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.text");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.text");
       } else if (name.equals("required")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.required");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.required");
       } else if (name.equals("repeats")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.repeats");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.repeats");
       } else if (name.equals("group")) {
         return addGroup();
       } else if (name.equals("question")) {
@@ -1794,17 +1794,17 @@ public class Questionnaire extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("linkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.linkId");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.linkId");
       } else if (name.equals("concept")) {
         return addConcept();
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.text");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.text");
       } else if (name.equals("type")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.type");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.type");
       } else if (name.equals("required")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.required");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.required");
       } else if (name.equals("repeats")) {
-        throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.repeats");
+        throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.repeats");
       } else if (name.equals("options")) {
         this.options = new Reference();
         return this.options;
@@ -2417,17 +2417,17 @@ public class Questionnaire extends DomainResource {
     if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("version")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.version");
+      throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.version");
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.status");
+      throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.status");
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.date");
+      throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.date");
     } else if (name.equals("publisher")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.publisher");
+      throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.publisher");
     } else if (name.equals("telecom")) {
       return addTelecom();
     } else if (name.equals("subjectType")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Questionnaire.subjectType");
+      throw new FHIRException("Cannot call addChild on a singleton property Questionnaire.subjectType");
     } else if (name.equals("group")) {
       this.group = new GroupComponent();
       return this.group;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/QuestionnaireResponse.java

@@ -590,11 +590,11 @@ public class QuestionnaireResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("linkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.linkId");
+        throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.linkId");
       } else if (name.equals("title")) {
-        throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.title");
+        throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.title");
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.text");
+        throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.text");
       } else if (name.equals("subject")) {
         this.subject = new Reference();
         return this.subject;
@@ -879,9 +879,9 @@ public class QuestionnaireResponse extends DomainResource {
     @Override
     public Base addChild(String name) throws FHIRException {
       if (name.equals("linkId")) {
-        throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.linkId");
+        throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.linkId");
       } else if (name.equals("text")) {
-        throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.text");
+        throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.text");
       } else if (name.equals("answer")) {
         return addAnswer();
       } else
@@ -1952,7 +1952,7 @@ public class QuestionnaireResponse extends DomainResource {
       this.questionnaire = new Reference();
       return this.questionnaire;
     } else if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.status");
+      throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.status");
     } else if (name.equals("subject")) {
       this.subject = new Reference();
       return this.subject;
@@ -1960,7 +1960,7 @@ public class QuestionnaireResponse extends DomainResource {
       this.author = new Reference();
       return this.author;
     } else if (name.equals("authored")) {
-      throw new FHIRException("Cannot call addChild on a primitive type QuestionnaireResponse.authored");
+      throw new FHIRException("Cannot call addChild on a singleton property QuestionnaireResponse.authored");
     } else if (name.equals("source")) {
       this.source = new Reference();
       return this.source;

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Reference.java

@@ -256,9 +256,9 @@ public class Reference extends BaseReference implements IBaseReference, IComposi
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("reference")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Reference.reference");
+      throw new FHIRException("Cannot call addChild on a singleton property Reference.reference");
     } else if (name.equals("display")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Reference.display");
+      throw new FHIRException("Cannot call addChild on a singleton property Reference.display");
     } else
       return super.addChild(name);
   }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/ReferralRequest.java

@@ -1279,11 +1279,11 @@ public class ReferralRequest extends DomainResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("status")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ReferralRequest.status");
+      throw new FHIRException("Cannot call addChild on a singleton property ReferralRequest.status");
     } else if (name.equals("identifier")) {
       return addIdentifier();
     } else if (name.equals("date")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ReferralRequest.date");
+      throw new FHIRException("Cannot call addChild on a singleton property ReferralRequest.date");
     } else if (name.equals("type")) {
       this.type = new CodeableConcept();
       return this.type;
@@ -1305,12 +1305,12 @@ public class ReferralRequest extends DomainResource {
       this.encounter = new Reference();
       return this.encounter;
     } else if (name.equals("dateSent")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ReferralRequest.dateSent");
+      throw new FHIRException("Cannot call addChild on a singleton property ReferralRequest.dateSent");
     } else if (name.equals("reason")) {
       this.reason = new CodeableConcept();
       return this.reason;
     } else if (name.equals("description")) {
-      throw new FHIRException("Cannot call addChild on a primitive type ReferralRequest.description");
+      throw new FHIRException("Cannot call addChild on a singleton property ReferralRequest.description");
     } else if (name.equals("serviceRequested")) {
       return addServiceRequested();
     } else if (name.equals("supportingInformation")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/RelatedPerson.java

@@ -626,9 +626,9 @@ public class RelatedPerson extends DomainResource {
     } else if (name.equals("telecom")) {
       return addTelecom();
     } else if (name.equals("gender")) {
-      throw new FHIRException("Cannot call addChild on a primitive type RelatedPerson.gender");
+      throw new FHIRException("Cannot call addChild on a singleton property RelatedPerson.gender");
     } else if (name.equals("birthDate")) {
-      throw new FHIRException("Cannot call addChild on a primitive type RelatedPerson.birthDate");
+      throw new FHIRException("Cannot call addChild on a singleton property RelatedPerson.birthDate");
     } else if (name.equals("address")) {
       return addAddress();
     } else if (name.equals("photo")) {

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/model/Resource.java

@@ -317,14 +317,14 @@ public abstract class Resource extends BaseResource implements IAnyResource {
   @Override
   public Base addChild(String name) throws FHIRException {
     if (name.equals("id")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Resource.id");
+      throw new FHIRException("Cannot call addChild on a singleton property Resource.id");
     } else if (name.equals("meta")) {
       this.meta = new Meta();
       return this.meta;
     } else if (name.equals("implicitRules")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Resource.implicitRules");
+      throw new FHIRException("Cannot call addChild on a singleton property Resource.implicitRules");
     } else if (name.equals("language")) {
-      throw new FHIRException("Cannot call addChild on a primitive type Resource.language");
+      throw new FHIRException("Cannot call addChild on a singleton property Resource.language");
     } else
       return super.addChild(name);
   }