diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml
index 04fa0d486..a8ccb5525 100644
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@@ -21,29 +21,29 @@
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.utilities
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu2
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu2016may
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu3
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.r4
${project.version}
diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java
index 5e8caa036..efce572b4 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/ExtensionDefinitionGenerator.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.convertors;
+/*-
+ * #%L
+ * org.hl7.fhir.convertors
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.io.IOException;
import java.io.InputStream;
import java.text.SimpleDateFormat;
diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml
index 6e8aff3a5..f6f34568b 100644
--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@@ -21,7 +21,7 @@
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.utilities
${project.version}
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
index f3d64361c..a0865384f 100644
--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@@ -21,7 +21,7 @@
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.utilities
${project.version}
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/conformance/ProfileUtilities.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/conformance/ProfileUtilities.java
index 0d043c185..7bb7550b2 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/conformance/ProfileUtilities.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/conformance/ProfileUtilities.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.dstu3.conformance;
+/*-
+ * #%L
+ * org.hl7.fhir.dstu3
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java
index 225c34618..96bf71ba9 100644
--- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java
+++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Enumerations.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.dstu3.model;
+/*-
+ * #%L
+ * org.hl7.fhir.dstu3
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import org.hl7.fhir.exceptions.FHIRException;
public class Enumerations {
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 1cdbbcb8f..11286310f 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -21,7 +21,7 @@
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.utilities
${project.version}
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
index 7c7f3d1d5..e2fdf9c86 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/context/BaseWorkerContext.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.context;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java
index 353ee4bae..37605a9d8 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/Element.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.elementmodel;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/XmlParser.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/XmlParser.java
index 21c23abca..679c8b783 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/XmlParser.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/elementmodel/XmlParser.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.elementmodel;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
index 3a23eea26..a8a7606ac 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.model;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import org.hl7.fhir.exceptions.FHIRException;
public class Enumerations {
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ProfilingWrapper.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ProfilingWrapper.java
index a7d88a147..6a4ea778b 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ProfilingWrapper.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/ProfilingWrapper.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.model;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.util.Map;
import org.hl7.fhir.r4.utils.FHIRPathEngine;
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/ValueSetUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/ValueSetUtilities.java
index 74d529a99..b70e9234b 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/ValueSetUtilities.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/terminologies/ValueSetUtilities.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.terminologies;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.context.IWorkerContext;
import org.hl7.fhir.r4.model.CanonicalType;
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/CodingUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/CodingUtilities.java
index 5fad55e15..f724ff4f1 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/CodingUtilities.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/CodingUtilities.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.utils;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import org.hl7.fhir.r4.model.Coding;
public class CodingUtilities {
diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/ResourceUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/ResourceUtilities.java
index d14dfebbe..d743f3dc7 100644
--- a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/ResourceUtilities.java
+++ b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/ResourceUtilities.java
@@ -1,5 +1,25 @@
package org.hl7.fhir.r4.utils;
+/*-
+ * #%L
+ * org.hl7.fhir.r4
+ * %%
+ * Copyright (C) 2014 - 2019 Health Level 7
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+
import java.util.List;
import org.hl7.fhir.r4.model.Bundle;
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index 76682ecf3..980ff34f8 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -21,35 +21,35 @@
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.utilities
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.convertors
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu2
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu2016may
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.dstu3
${project.version}
- org.hl7.fhir
+ ca.uhn.hapi.fhir
org.hl7.fhir.r4
${project.version}