diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/builder/BaseBuilder.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/builder/BaseBuilder.java
index 75b80f91385..e8f93a1264d 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/builder/BaseBuilder.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/builder/BaseBuilder.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.builder;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/LibraryLoader.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/LibraryLoader.java
index e84d489b404..f4ccbf2ca53 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/LibraryLoader.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/LibraryLoader.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasurePopulationType.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasurePopulationType.java
index f37bafd5fda..fbe8ffc0ba9 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasurePopulationType.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasurePopulationType.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasureScoring.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasureScoring.java
index ee94f6f332e..76b19bdf594 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasureScoring.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/evaluation/MeasureScoring.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/DateHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/DateHelper.java
index 9a71e61ecd9..333743f50b7 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/DateHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/DateHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/TranslatorHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/TranslatorHelper.java
index ca2dc29e857..d0f90fe1cf4 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/TranslatorHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/TranslatorHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/UsingHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/UsingHelper.java
index 8a212a97aa0..930858b3863 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/UsingHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/helper/UsingHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderFactory.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderFactory.java
index 8c23050a59a..0f32e4bb5a5 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderFactory.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderFactory.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderLoader.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderLoader.java
index 96ece5c23b4..366b1dfaca1 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderLoader.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/CqlProviderLoader.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/EvaluationProviderFactory.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/EvaluationProviderFactory.java
index 77fd7d62b48..310dca2b468 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/EvaluationProviderFactory.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/EvaluationProviderFactory.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibraryResolutionProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibraryResolutionProvider.java
index 6a03fc1dca5..745bb74b9a5 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibraryResolutionProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibraryResolutionProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibrarySourceProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibrarySourceProvider.java
index 6f4ffa4155b..ba286dfe9d5 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibrarySourceProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/provider/LibrarySourceProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/retrieve/JpaFhirRetrieveProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/retrieve/JpaFhirRetrieveProvider.java
index dc5e3fe24ff..6c3f02c5a80 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/retrieve/JpaFhirRetrieveProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/common/retrieve/JpaFhirRetrieveProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.common.retrieve;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/BaseCqlConfig.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/BaseCqlConfig.java
index 9468267fbd6..d6d55c13650 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/BaseCqlConfig.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/BaseCqlConfig.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.config;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlDstu3Config.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlDstu3Config.java
index 99142ae7ea6..72d72c9a245 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlDstu3Config.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlDstu3Config.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.config;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlR4Config.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlR4Config.java
index c16e31ea71f..90b92901242 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlR4Config.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/config/CqlR4Config.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.config;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/builder/MeasureReportBuilder.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/builder/MeasureReportBuilder.java
index 0b96b546c01..8bea8ef1dc5 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/builder/MeasureReportBuilder.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/builder/MeasureReportBuilder.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.builder;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluation.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluation.java
index ab22c8830f3..1ea6acb14e8 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluation.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluation.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluationSeed.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluationSeed.java
index 278863fee75..872d1235e8d 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluationSeed.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/MeasureEvaluationSeed.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/ProviderFactory.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/ProviderFactory.java
index 4743e59a934..adc8360cc2d 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/ProviderFactory.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/evaluation/ProviderFactory.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/helper/LibraryHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/helper/LibraryHelper.java
index d820950f0ad..1060051b1bc 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/helper/LibraryHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/helper/LibraryHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/JpaTerminologyProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/JpaTerminologyProvider.java
index 8779262b472..0fa812a153b 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/JpaTerminologyProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/JpaTerminologyProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/LibraryResolutionProviderImpl.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/LibraryResolutionProviderImpl.java
index d88d3f80cc1..de88337c0de 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/LibraryResolutionProviderImpl.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/LibraryResolutionProviderImpl.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/MeasureOperationsProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/MeasureOperationsProvider.java
index 11c82238411..54c3a954196 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/MeasureOperationsProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/dstu3/provider/MeasureOperationsProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.dstu3.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/builder/MeasureReportBuilder.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/builder/MeasureReportBuilder.java
index 026c3a010fc..b2fb539f906 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/builder/MeasureReportBuilder.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/builder/MeasureReportBuilder.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.builder;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluation.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluation.java
index 9daea52a9c4..2f0320b4a70 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluation.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluation.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluationSeed.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluationSeed.java
index 26c014b1277..953f16649a3 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluationSeed.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/MeasureEvaluationSeed.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/ProviderFactory.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/ProviderFactory.java
index 9a050c77271..34d09509d8c 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/ProviderFactory.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/evaluation/ProviderFactory.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.evaluation;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/CanonicalHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/CanonicalHelper.java
index aa4df240c45..0c07c9befea 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/CanonicalHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/CanonicalHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/LibraryHelper.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/LibraryHelper.java
index 7b49a376d02..89b7fb0e34b 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/LibraryHelper.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/helper/LibraryHelper.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.helper;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/JpaTerminologyProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/JpaTerminologyProvider.java
index 16383d7499e..0a67792daa9 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/JpaTerminologyProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/JpaTerminologyProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/LibraryResolutionProviderImpl.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/LibraryResolutionProviderImpl.java
index 1d6a95bec8a..c9daf29443c 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/LibraryResolutionProviderImpl.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/LibraryResolutionProviderImpl.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/MeasureOperationsProvider.java b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/MeasureOperationsProvider.java
index f2999c037e0..2401183f720 100644
--- a/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/MeasureOperationsProvider.java
+++ b/hapi-fhir-jpaserver-cql/src/main/java/ca/uhn/fhir/cql/r4/provider/MeasureOperationsProvider.java
@@ -2,7 +2,7 @@ package ca.uhn.fhir.cql.r4.provider;
 
 /*-
  * #%L
- * HAPI FHIR - Clinical Quality Language
+ * HAPI FHIR JPA Server - Clinical Quality Language
  * %%
  * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java
index 0cadb958bbf..08420e8727a 100644
--- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaDstu3Config.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.jpa.config;
  * #%L
  * HAPI FHIR JPA Server Test Utilities
  * %%
- * Copyright (C) 2014 - 2020 University Health Network
+ * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java
index 90a6301d8ad..de19730ae07 100644
--- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaDstu3Test.java
@@ -4,7 +4,7 @@ package ca.uhn.fhir.jpa.test;
  * #%L
  * HAPI FHIR JPA Server Test Utilities
  * %%
- * Copyright (C) 2014 - 2020 University Health Network
+ * Copyright (C) 2014 - 2021 Smile CDR, Inc.
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.