diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ApplyTransformTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ApplyTransformTest.java
index 5e55f6384..e846afa7a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ApplyTransformTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ApplyTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/DeleteListenerTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/DeleteListenerTest.java
index 9ca703ea8..4436c228b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/DeleteListenerTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/DeleteListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java
index 01dae7dc3..b83dc066d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportToWriterListenerTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportToWriterListenerTest.java
index b006a4602..5174e2ebc 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportToWriterListenerTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/ExportToWriterListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QBFailover.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QBFailover.java
index cb55e596f..dfe043345 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QBFailover.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QBFailover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QueryBatcherJobReportTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QueryBatcherJobReportTest.java
index 209712915..cf3a32b23 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QueryBatcherJobReportTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/QueryBatcherJobReportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
index ad4cf5b09..2871deb87 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/StringQueryHostBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/UrisToWriterListenerFuncTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/UrisToWriterListenerFuncTest.java
index 0d8c7d1cc..a3c9a67c4 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/UrisToWriterListenerFuncTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/UrisToWriterListenerFuncTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java
index 2853318d6..78f046373 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WBFailover.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2014-2019 MarkLogic Corporation
+* Copyright (c) 2019 MarkLogic Corporation
 *
 * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteBatcherJobReportTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteBatcherJobReportTest.java
index b4454cec6..f0ff6aece 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteBatcherJobReportTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteBatcherJobReportTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteHostBatcherTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteHostBatcherTest.java
index 407cd5702..cf88da26a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteHostBatcherTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/datamovement/functionaltests/WriteHostBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Artifact.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Artifact.java
index bfe9c11c7..de1528043 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Artifact.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Artifact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnCalendar.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnCalendar.java
index d19196a27..053165933 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnCalendar.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnDateTime.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnDateTime.java
index ba5132c41..bfb373449 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnDateTime.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnDateTime.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnFloat.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnFloat.java
index 6fefc7b7f..8943b2c1e 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnFloat.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnFloat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInt.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInt.java
index 07f19b8a0..ccd8171ac 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInt.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnIntAsString.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnIntAsString.java
index f35359d83..030310114 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnIntAsString.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnIntAsString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInteger.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInteger.java
index 515df1a7f..f4a639c31 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInteger.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnMultipleFields.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnMultipleFields.java
index 5c51342f6..a79b2f898 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnMultipleFields.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnMultipleFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnString.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnString.java
index b62d55854..93b6927a5 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnString.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnStringSub.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnStringSub.java
index 3f4d25085..c527762b9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnStringSub.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnStringSub.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnUri.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnUri.java
index f9ff44700..72793e0f7 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnUri.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedOnUri.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedUnSupportedDataType.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedUnSupportedDataType.java
index 975d88fcc..5ea8b3d4f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedUnSupportedDataType.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactIndexedUnSupportedDataType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactMultipleIndexedOnInt.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactMultipleIndexedOnInt.java
index dc04018ad..0647e39df 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactMultipleIndexedOnInt.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ArtifactMultipleIndexedOnInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/BasicJavaClientREST.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/BasicJavaClientREST.java
index 2081c3b9f..ef1e3d8cf 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/BasicJavaClientREST.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/BasicJavaClientREST.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Company.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Company.java
index 2147d09e2..86ce7c328 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Company.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Company.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java
index c09ccafa0..7f347a7e4 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoCompany.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoCompany.java
index 295c7438c..86228b748 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoCompany.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoCompany.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoSpecialArtifact.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoSpecialArtifact.java
index 6cc352f89..4479bd03b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoSpecialArtifact.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/GeoSpecialArtifact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/JavaApiBatchSuite.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/JavaApiBatchSuite.java
index a0bd51c2c..03868cd9c 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/JavaApiBatchSuite.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/JavaApiBatchSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@
 public class JavaApiBatchSuite {
 
   /*
-   * Copyright 2003-2013 MarkLogic Corporation. All Rights Reserved.
+   * Copyright (c) 2019 MarkLogic Corporation
    */
 
   private static final Class<?>[] testClasses = { TestAggregates.class,
diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Product.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Product.java
index b78b8bf32..d98e13afa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Product.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/SpecialGeoArtifact.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/SpecialGeoArtifact.java
index 7b220833e..9d3551f53 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/SpecialGeoArtifact.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/SpecialGeoArtifact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAggregates.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAggregates.java
index 97ccf4018..3a3612680 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAggregates.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAggregates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesAbsRangeConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesAbsRangeConstraint.java
index f74a1d76d..e70eec26c 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesAbsRangeConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesAbsRangeConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesCollectionConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesCollectionConstraint.java
index 1a28a6fa1..7df208d62 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesCollectionConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesCollectionConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesConstraintCombination.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesConstraintCombination.java
index 642887cfb..85df24b75 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesConstraintCombination.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesConstraintCombination.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesFieldConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesFieldConstraint.java
index 08c4e36fe..ee34837ab 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesFieldConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesFieldConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoAttrPairConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoAttrPairConstraint.java
index ab324b1b0..434861b7b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoAttrPairConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoAttrPairConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElemPairConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElemPairConstraint.java
index 2f97364fc..a24b2e637 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElemPairConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElemPairConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementChildConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementChildConstraint.java
index 9795d99e6..2fb769145 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementChildConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementChildConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementConstraint.java
index 1cee363ea..841985206 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesGeoElementConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangeConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangeConstraint.java
index 2e0f94224..e89b68144 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangeConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangeConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangePathIndexConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangePathIndexConstraint.java
index 9d9dec908..92235b6f9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangePathIndexConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesRangePathIndexConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesValueConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesValueConstraint.java
index a97db85c0..3cf8a6c51 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesValueConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesValueConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesWordConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesWordConstraint.java
index f7a6a4fdf..10988ff65 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesWordConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAppServicesWordConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAutomatedPathRangeIndex.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAutomatedPathRangeIndex.java
index ea2a2406f..9c9378c78 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAutomatedPathRangeIndex.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestAutomatedPathRangeIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTempMetaValues.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTempMetaValues.java
index e8c5df505..1b0293f2b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTempMetaValues.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTempMetaValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
index 3fc33a52c..218508169 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBiTemporal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18026.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18026.java
index 3de6261d3..885333c3a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18026.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18026.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18736.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18736.java
index 267bc8caf..c1a7c99de 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18736.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18736.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18920.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18920.java
index c8689a333..d612cd70e 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18920.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18920.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18993.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18993.java
index b86bb40f1..f904a19fa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18993.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug18993.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug21159.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug21159.java
index 0065a6b84..992840ad7 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug21159.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug21159.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug26248.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug26248.java
index b1554c058..8b4f1f84c 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug26248.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBug26248.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadSample1.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadSample1.java
index 90cff743e..126bd0c5b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadSample1.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadSample1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteMetaDataChange.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteMetaDataChange.java
index 8ea219efd..2b7950aaa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteMetaDataChange.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteMetaDataChange.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonDataBind.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonDataBind.java
index 1dc9bae0a..f7a082081 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonDataBind.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonDataBind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonHandle.java
index d71ccf58e..9802803f9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonParserHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonParserHandle.java
index 982f327cb..65ff3a2aa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonParserHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkReadWriteWithJacksonParserHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchEWithQBE.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchEWithQBE.java
index e87c90b41..fee6c95cd 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchEWithQBE.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchEWithQBE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithKeyValQueryDef.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithKeyValQueryDef.java
index 574356f03..2d90e5351 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithKeyValQueryDef.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithKeyValQueryDef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStringQueryDef.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStringQueryDef.java
index 3eb026400..dbd1ab91f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStringQueryDef.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStringQueryDef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStrucQueryDef.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStrucQueryDef.java
index 049e3e7fd..26969b9e3 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStrucQueryDef.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkSearchWithStrucQueryDef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata1.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata1.java
index 62f2e7201..48ce7f5c8 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata1.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata2.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata2.java
index 31b2b77e9..0d3e3d0dc 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata2.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadata2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadatawithRawXML.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadatawithRawXML.java
index f52dd9c38..a108e6eb7 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadatawithRawXML.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteMetadatawithRawXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteOptimisticLocking.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteOptimisticLocking.java
index 07817dbba..3e33defe6 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteOptimisticLocking.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteOptimisticLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteSample1.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteSample1.java
index b2e354976..d92255b89 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteSample1.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteSample1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransactions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransactions.java
index 07b5d48ea..df75698c0 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransactions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransactions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransformations.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransformations.java
index e55d83eab..733f3b5be 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransformations.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBulkWriteWithTransformations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBytesHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBytesHandle.java
index aef74999c..7dc77d0c9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBytesHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestBytesHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestCRUDModulesDb.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestCRUDModulesDb.java
index 08797a03e..1391c1db3 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestCRUDModulesDb.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestCRUDModulesDb.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -199,7 +199,7 @@ public void testXQueryModuleCRUDTextFile() throws KeyManagementException, NoSuch
 
     // read it back
     String xqueryModuleAsString = libsMgr.read(Path, new StringHandle()).get();
-    assertTrue("module read and read back", xqueryModuleAsString.startsWith("Copyright 2017 MarkLogic Corporation"));
+    assertTrue("module read and read back", xqueryModuleAsString.startsWith("Copyright (c) 2019 MarkLogic Corporation"));
 
     // get the list of descriptors
     ExtensionLibraryDescriptor[] descriptors = libsMgr.list();
diff --git a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestConstraintCombination.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestConstraintCombination.java
index 3f99cb6d6..30a269bc7 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestConstraintCombination.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestConstraintCombination.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDOMHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDOMHandle.java
index 3797c95dc..6620fedec 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDOMHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDOMHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseAuthentication.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseAuthentication.java
index 7340e897c..cebc88e2d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseAuthentication.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientConnection.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientConnection.java
index cfc1bf27d..aae0c8143 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientConnection.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.java
index eac7ef05d..76e89507b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientKerberosFromFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.java
index 358dfe277..6a89c3410 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithCertBasedAuth.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java
index c17a4ca23..d5c9c8dbe 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentEncoding.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentEncoding.java
index d8d30e69e..f6f7a2925 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentEncoding.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentEncoding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentFormat.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentFormat.java
index e5b2b3971..ac4995517 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentFormat.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentMimetype.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentMimetype.java
index adc67f6d7..58921407d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentMimetype.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDocumentMimetype.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDoublePrecisionGeoOps.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDoublePrecisionGeoOps.java
index b7d23f52e..2106cb70d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDoublePrecisionGeoOps.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestDoublePrecisionGeoOps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalJavaScript.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalJavaScript.java
index 1c1fc8741..141c00368 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalJavaScript.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalJavaScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalXquery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalXquery.java
index 96d91e186..57eb1d825 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalXquery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalXquery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalwithRunTimeDBnTransactions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalwithRunTimeDBnTransactions.java
index fa5481218..78ea0ccb2 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalwithRunTimeDBnTransactions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestEvalwithRunTimeDBnTransactions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFieldConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFieldConstraint.java
index 3e06ac124..5641eaffa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFieldConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFieldConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFileHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFileHandle.java
index 214224235..8eea09f55 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFileHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestFileHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputSourceHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputSourceHandle.java
index c1b8784bc..5a9f444ef 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputSourceHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputSourceHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputStreamHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputStreamHandle.java
index 3414ecd06..0f7536470 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputStreamHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestInputStreamHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJSResourceExtensions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJSResourceExtensions.java
index c005e0654..76bf4531d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJSResourceExtensions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJSResourceExtensions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonAnnotationsTest.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonAnnotationsTest.java
index c0aa01abf..6643c1cef 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonAnnotationsTest.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonAnnotationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonDateTimeFormat.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonDateTimeFormat.java
index 13beae2ef..786e9ee53 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonDateTimeFormat.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestJacksonDateTimeFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestLinkResultDocuments.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestLinkResultDocuments.java
index 22c74eb19..71c6eed5a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestLinkResultDocuments.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestLinkResultDocuments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadata.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadata.java
index f968008c3..8fe8d7b92 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadata.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadataXML.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadataXML.java
index 727ba7d07..a28293d35 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadataXML.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMetadataXML.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMultithreading.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMultithreading.java
index 42f521019..cacc6776f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMultithreading.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestMultithreading.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestNamespaces.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestNamespaces.java
index cee135577..cef3d8745 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestNamespaces.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestNamespaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnCtsQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnCtsQuery.java
index 22159dba5..6a1782c60 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnCtsQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnCtsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnFromSparql.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnFromSparql.java
index 99030fb99..8ea3f4d09 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnFromSparql.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnFromSparql.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java
index a752c1f3b..af8514fcb 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLexicons.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLiterals.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLiterals.java
index 76dcb891f..351ef9b96 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLiterals.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnLiterals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnMixedViews.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnMixedViews.java
index bf77b017f..07b795fbf 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnMixedViews.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnMixedViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnTriples.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnTriples.java
index de4fa5af2..bb7bf5d59 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnTriples.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnTriples.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnViews.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnViews.java
index a05d90a33..b6240a119 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnViews.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOpticOnViews.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOptimisticLocking.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOptimisticLocking.java
index 26a7ef753..755415402 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOptimisticLocking.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOptimisticLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOutputStreamHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOutputStreamHandle.java
index 27ac9fd3a..ad16fec09 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOutputStreamHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestOutputStreamHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOBasicSearch.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOBasicSearch.java
index b8d6190e5..c39d3ccc2 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOBasicSearch.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOBasicSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOMissingIdGetSetMethod.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOMissingIdGetSetMethod.java
index a0768b778..2ab67903a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOMissingIdGetSetMethod.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOMissingIdGetSetMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderContainerQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderContainerQuery.java
index 3f400dfb7..8bb0b91ae 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderContainerQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderContainerQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderGeoQueries.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderGeoQueries.java
index d12a98fba..0a29d2d01 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderGeoQueries.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderGeoQueries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderValueQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderValueQuery.java
index 9716983a5..279e92788 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderValueQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOQueryBuilderValueQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWrite1.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWrite1.java
index 8ba4eac42..6bfaa354e 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWrite1.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWrite1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWriteWithTransactions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWriteWithTransactions.java
index 67cab5dce..ba63be074 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWriteWithTransactions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOReadWriteWithTransactions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOSpecialCharRead.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOSpecialCharRead.java
index 4268a0cc9..32568f8c3 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOSpecialCharRead.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOSpecialCharRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithDocsStoredByOthers.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithDocsStoredByOthers.java
index dbeb4619c..91e498e21 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithDocsStoredByOthers.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithDocsStoredByOthers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java
index be0083e14..d5d3c256a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStringQD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStrucQD.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStrucQD.java
index 5c9f8cbbe..ee52103f5 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStrucQD.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOWithStrucQD.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOwithQBEQueryDef.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOwithQBEQueryDef.java
index 5bd516c79..9fcac5ee1 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOwithQBEQueryDef.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPOJOwithQBEQueryDef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPartialUpdate.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPartialUpdate.java
index 321f2b5d6..6cc00f106 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPartialUpdate.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPartialUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPatchCardinality.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPatchCardinality.java
index d13216bdf..d7ecd4e17 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPatchCardinality.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPatchCardinality.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPointInTimeQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPointInTimeQuery.java
index 53570ce0f..8005c5eba 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPointInTimeQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestPointInTimeQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryByExample.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryByExample.java
index de961a935..ba58ac313 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryByExample.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryByExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilder.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilder.java
index e3deb625f..fe5e0b34c 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilder.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderGrammar.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderGrammar.java
index 8f39d05a3..9aff34baf 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderGrammar.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderGrammar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchOptions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchOptions.java
index 817ead2a5..7dd078069 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchOptions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchableExpression.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchableExpression.java
index 441158625..07ff8866d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchableExpression.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSearchableExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSortOrder.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSortOrder.java
index 6d45d544d..07763125e 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSortOrder.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderSortOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderTransformResults.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderTransformResults.java
index 4dbb0cc8e..ce97c4dd9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderTransformResults.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionBuilderTransformResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsHandle.java
index d77ad444c..e7e5b89b8 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsListHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsListHandle.java
index 0fe4c7449..6fe68e2fa 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsListHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestQueryOptionsListHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraint.java
index a695845d3..17ccca3c7 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintAbsoluteBucket.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintAbsoluteBucket.java
index 5835abd3f..44cf96bc9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintAbsoluteBucket.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintAbsoluteBucket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintRelativeBucket.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintRelativeBucket.java
index f78cc9c56..db469d0bb 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintRelativeBucket.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRangeConstraintRelativeBucket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawAlert.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawAlert.java
index fb85cdb7e..f2ecacdae 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawAlert.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawAlert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQuery.java
index 3206da7b6..f7719a92d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQueryGeo.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQueryGeo.java
index 436d2ba56..6ab275238 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQueryGeo.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCombinedQueryGeo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCtsQueryDefinition.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCtsQueryDefinition.java
index 8449605ce..45deaff64 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCtsQueryDefinition.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawCtsQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawStructuredQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawStructuredQuery.java
index f0a2d35ca..63a48f09f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawStructuredQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRawStructuredQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestReaderHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestReaderHandle.java
index b17b8d964..c7af30a1f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestReaderHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRequestLogger.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRequestLogger.java
index d7b40bea9..935bcf73e 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRequestLogger.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRequestLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java
index 04eb095b8..556183481 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestResponseTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRollbackTransaction.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRollbackTransaction.java
index e57d967f3..5ecfd0177 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRollbackTransaction.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRollbackTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRuntimeDBselection.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRuntimeDBselection.java
index 6e79ee942..725330103 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRuntimeDBselection.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestRuntimeDBselection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSSLConnection.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSSLConnection.java
index 6ed4c7ff8..cbf0a9b56 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSSLConnection.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSSLConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSandBox.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSandBox.java
index f96988b9b..efa6ffc85 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSandBox.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSandBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultibyte.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultibyte.java
index dbb77924c..03eaef163 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultibyte.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultibyte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultipleForests.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultipleForests.java
index b0bacd0f5..4d62eea07 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultipleForests.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchMultipleForests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnJSON.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnJSON.java
index 49a77ac2b..c2f3f5f9b 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnJSON.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnJSON.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnProperties.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnProperties.java
index 34c56a784..dc4d6f191 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnProperties.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOnProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOptions.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOptions.java
index 43de7462a..b3211ca22 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOptions.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchSuggestion.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchSuggestion.java
index 82354e625..49b1a6975 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchSuggestion.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSearchSuggestion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSemanticsGraphManager.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSemanticsGraphManager.java
index d8c83859b..3e152c28a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSemanticsGraphManager.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSemanticsGraphManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestServerAssignedDocumentURI.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestServerAssignedDocumentURI.java
index 7fb85262f..f10fd5738 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestServerAssignedDocumentURI.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestServerAssignedDocumentURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSourceHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSourceHandle.java
index 9cb12efc3..0d80ad0e8 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSourceHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSourceHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSparqlQueryManager.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSparqlQueryManager.java
index d0a3ce26c..39da75216 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSparqlQueryManager.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestSparqlQueryManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneGeoQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneGeoQuery.java
index fdae31829..a994883d8 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneGeoQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneGeoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneQuery.java
index feac1871d..2effca14d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStandaloneQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStringHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStringHandle.java
index f50321c69..531c1bd3d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStringHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStringHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQuery.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQuery.java
index 8a51bc3ae..048a4a28d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQuery.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQueryMildNot.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQueryMildNot.java
index 5100b1fa9..a7635cc72 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQueryMildNot.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredQueryMildNot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredSearchGeo.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredSearchGeo.java
index 7c4981c42..c8af2f637 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredSearchGeo.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestStructuredSearchGeo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestTransformXMLWithXSLT.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestTransformXMLWithXSLT.java
index 42f16fa2c..9a8533a54 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestTransformXMLWithXSLT.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestTransformXMLWithXSLT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestValueConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestValueConstraint.java
index 151da2031..82baddfe3 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestValueConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestValueConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWordConstraint.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWordConstraint.java
index 67b34852a..36c66bf3d 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWordConstraint.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWordConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWriteTextDoc.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWriteTextDoc.java
index 5296259dd..0db6fa97f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWriteTextDoc.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestWriteTextDoc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLDocumentRepair.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLDocumentRepair.java
index fae02b5c9..1280a33ec 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLDocumentRepair.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLDocumentRepair.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLEventReaderHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLEventReaderHandle.java
index 2df16fe14..41bd3f33a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLEventReaderHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLEventReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLMultiByte.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLMultiByte.java
index 3047efb6f..52c00c41f 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLMultiByte.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLMultiByte.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLStreamReaderHandle.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLStreamReaderHandle.java
index 8edf1ce2c..62184d228 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLStreamReaderHandle.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/TestXMLStreamReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadClass.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadClass.java
index 3583f1a9c..56c659fca 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadClass.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadClass.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadSearch.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadSearch.java
index 6050da046..89a0f100c 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadSearch.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadWrite.java b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadWrite.java
index 7edcdf333..f91751038 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadWrite.java
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/ThreadWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/JSResource.js b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/JSResource.js
index e245194e9..322355216 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/JSResource.js
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/JSResource.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 MarkLogic Corporation
+ * Copyright (c) 2018 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/OpticsTestJSResource.js b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/OpticsTestJSResource.js
index ebb45a456..1f5f041e2 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/OpticsTestJSResource.js
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/OpticsTestJSResource.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 MarkLogic Corporation
+ * Copyright (c) 2018 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/custom-lib.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/custom-lib.xqy
index e92a74de1..6779840ce 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/custom-lib.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/custom-lib.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/javascriptQueries.sjs b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/javascriptQueries.sjs
index ccfe01538..c36541843 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/javascriptQueries.sjs
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/javascriptQueries.sjs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 MarkLogic Corporation
+ * Copyright (c) 2018 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/module.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/module.xqy
index c19ad2442..963cd3ceb 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/module.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/module.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/result-decorator-test.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/result-decorator-test.xqy
index e481e4e16..323e47375 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/result-decorator-test.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/result-decorator-test.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/xquery-modules-with-diff-variable-types.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/xquery-modules-with-diff-variable-types.xqy
index e1421f962..56cc8afc8 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/xquery-modules-with-diff-variable-types.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/data/xquery-modules-with-diff-variable-types.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/rules/rule-transform.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/rules/rule-transform.xqy
index 06790248a..096b7087a 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/rules/rule-transform.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/rules/rule-transform.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-attr-xquery-transform.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-attr-xquery-transform.xqy
index 15f86c825..d58a6efca 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-attr-xquery-transform.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-attr-xquery-transform.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-invalid-bitemp-transform.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-invalid-bitemp-transform.xqy
index b001a7396..f0a378583 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-invalid-bitemp-transform.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-invalid-bitemp-transform.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-transform.xqy b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-transform.xqy
index de0334663..066b4f468 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-transform.xqy
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/add-element-xquery-transform.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/timestampTransform.js b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/timestampTransform.js
index 3d96f8cb3..3bf924bc9 100644
--- a/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/timestampTransform.js
+++ b/marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/functionaltest/transforms/timestampTransform.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 MarkLogic Corporation
+ * Copyright (c) 2018 MarkLogic Corporation
  *
  * 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/marklogic-client-api-functionaltests/src/test/resources/WriteHostBatcher-testdata/add-attr-xquery-transform.xqy b/marklogic-client-api-functionaltests/src/test/resources/WriteHostBatcher-testdata/add-attr-xquery-transform.xqy
index a4ba0d823..e54814146 100644
--- a/marklogic-client-api-functionaltests/src/test/resources/WriteHostBatcher-testdata/add-attr-xquery-transform.xqy
+++ b/marklogic-client-api-functionaltests/src/test/resources/WriteHostBatcher-testdata/add-attr-xquery-transform.xqy
@@ -1,5 +1,5 @@
 (:
-  Copyright 2014-2017 MarkLogic Corporation
+  Copyright (c) 2018 MarkLogic Corporation
  
   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/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClient.java b/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClient.java
index 7f4efecc0..8fca7cb44 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClient.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java b/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java
index d6546c42d..5900decbf 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/DatabaseClientFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/FailedRequestException.java b/marklogic-client-api/src/main/java/com/marklogic/client/FailedRequestException.java
index d792bcc1c..17ada4deb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/FailedRequestException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/FailedRequestException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/FailedRetryException.java b/marklogic-client-api/src/main/java/com/marklogic/client/FailedRetryException.java
index a1eca74b2..ead14b006 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/FailedRetryException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/FailedRetryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/ForbiddenUserException.java b/marklogic-client-api/src/main/java/com/marklogic/client/ForbiddenUserException.java
index daef479c7..fed115ca6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/ForbiddenUserException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/ForbiddenUserException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicBindingException.java b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicBindingException.java
index b171a348c..e6364ffd2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicBindingException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicBindingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicIOException.java b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicIOException.java
index 0c066b618..3caf412fc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicIOException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicIOException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicInternalException.java b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicInternalException.java
index 575978bfa..787f10311 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicInternalException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicInternalException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java
index ea0288ecf..3549d95b2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/MarkLogicServerException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/Page.java b/marklogic-client-api/src/main/java/com/marklogic/client/Page.java
index 188919b84..efe24ca0b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/Page.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/Page.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/RequestConstants.java b/marklogic-client-api/src/main/java/com/marklogic/client/RequestConstants.java
index de0595c60..71da4310c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/RequestConstants.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/RequestConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotFoundException.java b/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotFoundException.java
index 06b94ce08..6b9fef6b3 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotFoundException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotResendableException.java b/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotResendableException.java
index dbc62e743..44dede73d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotResendableException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/ResourceNotResendableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/SessionState.java b/marklogic-client-api/src/main/java/com/marklogic/client/SessionState.java
index 8e8d448a4..e974c9e9e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/SessionState.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/SessionState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/Transaction.java b/marklogic-client-api/src/main/java/com/marklogic/client/Transaction.java
index 2af428e0d..c21fcb606 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/Transaction.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/Transaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/UnauthorizedUserException.java b/marklogic-client-api/src/main/java/com/marklogic/client/UnauthorizedUserException.java
index 9f887c721..364fe37b5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/UnauthorizedUserException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/UnauthorizedUserException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibrariesManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibrariesManager.java
index 72f1f570b..acb1fd510 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibrariesManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibrariesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibraryDescriptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibraryDescriptor.java
index 80bd2097d..bf30ffafc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibraryDescriptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionLibraryDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionMetadata.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionMetadata.java
index 875075864..e3a7e1837 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionMetadata.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ExtensionMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/MethodType.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/MethodType.java
index 0a27ecd96..aaa573fc2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/MethodType.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/MethodType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/NamespacesManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/NamespacesManager.java
index 377c0b0cb..bc0084cdc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/NamespacesManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/NamespacesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/QueryOptionsManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/QueryOptionsManager.java
index 424be41ab..083ea23a1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/QueryOptionsManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/QueryOptionsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/ResourceExtensionsManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ResourceExtensionsManager.java
index 5da29f0e0..154c0906c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/ResourceExtensionsManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ResourceExtensionsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/ServerConfigurationManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ServerConfigurationManager.java
index 4308f4a19..dbdeb0d1a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/ServerConfigurationManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/ServerConfigurationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/TransformExtensionsManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/TransformExtensionsManager.java
index ae124e386..42f27bd43 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/TransformExtensionsManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/TransformExtensionsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/admin/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/admin/package-info.java
index 786566e5a..05d04c4bd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/admin/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/admin/package-info.java
@@ -7,7 +7,7 @@
  * capabilities of the REST server.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinition.java
index 8c525ff5a..28f6e51db 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinitionList.java b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinitionList.java
index da29c640e..9c86e4eed 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinitionList.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleDefinitionList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleManager.java
index 2b7129004..01563de54 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/RuleManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/alerting/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/package-info.java
index 5fc918bd1..554b41f4c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/alerting/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/alerting/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDescriptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDescriptor.java
index 73dd712d0..0c2bcd8c1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDescriptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java
index 60d0bdcce..5fe88b83e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/bitemporal/TemporalDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ApplyTransformListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ApplyTransformListener.java
index f0a5d08f2..9f58f94c8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ApplyTransformListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ApplyTransformListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batch.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batch.java
index 519e44621..f58edcce9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchEvent.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchEvent.java
index a7d84f124..e1ef65493 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchEvent.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchFailureListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchFailureListener.java
index 833649226..00603f150 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchFailureListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchFailureListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchListener.java
index 504e8a692..c312ad4bb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/BatchListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batcher.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batcher.java
index 7ff93a515..efc092b0d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batcher.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Batcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementException.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementException.java
index 10f48fd8c..c2e8f8855 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementManager.java
index 65bfc8829..38fc7a96c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java
index bfffb9bd7..a99ee1e9f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DeleteListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java
index 23ee5c426..0673a934a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportToWriterListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportToWriterListener.java
index f42a1b967..9e9e59745 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportToWriterListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExportToWriterListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java
index 3bcac8c65..01e4adb40 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ExtractRowsViaTemplateListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FailureListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FailureListener.java
index 4839b9baf..33db2d48e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FailureListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FailureListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FilteredForestConfiguration.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FilteredForestConfiguration.java
index f196f549a..bdcb1855a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FilteredForestConfiguration.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/FilteredForestConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Forest.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Forest.java
index b180bd092..879265ee6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Forest.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Forest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ForestConfiguration.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ForestConfiguration.java
index 0902e57d4..f8c511db5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ForestConfiguration.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ForestConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java
index c15d8a043..baf7e6892 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/HostAvailabilityListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JacksonCSVSplitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JacksonCSVSplitter.java
index 3e3ce102e..8a6ef2c3d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JacksonCSVSplitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JacksonCSVSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobReport.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobReport.java
index 0db7d64f9..ff8eb95ee 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobReport.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobTicket.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobTicket.java
index 3dc3669a6..a2a208824 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobTicket.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/JobTicket.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/LineSplitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/LineSplitter.java
index d41da34a3..b71664c54 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/LineSplitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/LineSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/NodeOperation.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/NodeOperation.java
index d57d458e4..4b69b01be 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/NodeOperation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/NodeOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/PeekingIterator.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/PeekingIterator.java
index 1ce71bb01..6f40f60fd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/PeekingIterator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/PeekingIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ProgressListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ProgressListener.java
index 19d64aa17..8a9f821d2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ProgressListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatch.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatch.java
index f9059a9c3..5639855d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchException.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchException.java
index 3c1bf5c6f..4daf4add6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchException.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchListener.java
index ef222c3cd..7071e49e7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatchListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatcher.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatcher.java
index 220e09eba..40ed9a3ac 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatcher.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryEvent.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryEvent.java
index 6eb3e95f3..626233373 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryEvent.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryFailureListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryFailureListener.java
index 3af57538e..d71b9755e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryFailureListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryFailureListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Splitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Splitter.java
index ff8642bc4..4c734d268 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Splitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/Splitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/TypedRow.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/TypedRow.java
index 2456d6998..a6d2d0b27 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/TypedRow.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/TypedRow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/UrisToWriterListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/UrisToWriterListener.java
index a49dcc204..679accbea 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/UrisToWriterListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/UrisToWriterListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatch.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatch.java
index 2c6d74edc..eff1b751a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatchListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatchListener.java
index 17fc77461..37106cc09 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatchListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatchListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatcher.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatcher.java
index be972486f..7b3925f82 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatcher.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteBatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteEvent.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteEvent.java
index cdd80e6cc..6eea23d98 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteEvent.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteFailureListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteFailureListener.java
index b45237cd6..95a39698f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteFailureListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/WriteFailureListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/XMLSplitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/XMLSplitter.java
index 0e2547e68..a70033961 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/XMLSplitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/XMLSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ZipSplitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ZipSplitter.java
index e03d55fa8..593584572 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ZipSplitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/ZipSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java
index 3c7ab2cc2..5ea377306 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchImpl.java
index a3c59aa7a..afda59d7c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchWriteSet.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchWriteSet.java
index 888d0de88..970b9a200 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchWriteSet.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatchWriteSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java
index e0dcd0721..7808bfbef 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementEventImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementEventImpl.java
index 7a44d5925..bcb58d421 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementEventImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementInternalError.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementInternalError.java
index 67b28035d..3db59e189 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementInternalError.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementInternalError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java
index d47dac3bb..611b5899b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementServices.java
index 2ac046ad2..7f11b6d5c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementServices.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestConfigurationImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestConfigurationImpl.java
index e0af7fa3a..48fe184ac 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestConfigurationImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestConfigurationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestImpl.java
index 9cda2318a..7b2d06a83 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/ForestImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java
index b7b9b63ee..ed70fb2b9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportListener.java
index d62d1079e..a429271d2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java
index d261f3b65..95af1b2ce 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobTicketImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatchImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatchImpl.java
index 00a1140a3..a5954681f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatchImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java
index 556446b40..76fb0f17a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryJobReportListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryJobReportListener.java
index 3942ea0e7..70577ea3c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryJobReportListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryJobReportListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatchImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatchImpl.java
index 49ff11262..64a311f6f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatchImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java
index 01a37b72b..038bf9a4c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteBatcherImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteEventImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteEventImpl.java
index 75cf1e62f..9ef31366a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteEventImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteEventImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteJobReportListener.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteJobReportListener.java
index 3c7b82917..c437fd3c1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteJobReportListener.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/WriteJobReportListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/package-info.java
index 6a93af6ab..0e575c9fd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/package-info.java
@@ -228,7 +228,7 @@
  * <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
  */
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/ExecEndpoint.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/ExecEndpoint.java
index 576aa47fa..f6f26896d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/ExecEndpoint.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/ExecEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/IOEndpoint.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/IOEndpoint.java
index c9a3474c8..9ff9b5986 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/IOEndpoint.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/IOEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputEndpoint.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputEndpoint.java
index 3b9478dcd..e5ddfd144 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputEndpoint.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputOutputEndpoint.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputOutputEndpoint.java
index 28fec1320..1bea76604 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputOutputEndpoint.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/InputOutputEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/OutputEndpoint.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/OutputEndpoint.java
index ee44ddd35..6c3b5b502 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/OutputEndpoint.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/OutputEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/BaseCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/BaseCallerImpl.java
index 39eff2149..a736f6fa6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/BaseCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/BaseCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecCallerImpl.java
index 4c9ad13ba..4bda346f0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecEndpointImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecEndpointImpl.java
index 0438acc71..360850242 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecEndpointImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/ExecEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOCallerImpl.java
index 47e3a83ff..dc3e4a473 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOEndpointImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOEndpointImpl.java
index cff8469f6..18177551c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOEndpointImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/IOEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputCallerImpl.java
index 19986d24a..cb0103422 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputEndpointImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputEndpointImpl.java
index fce86f659..4f23ff11a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputEndpointImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputCallerImpl.java
index 3d196acdf..c26f566e0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputEndpointImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputEndpointImpl.java
index c4c3b2279..e11afdbe4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputEndpointImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/InputOutputEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputCallerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputCallerImpl.java
index 301267968..1258dc75b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputCallerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputCallerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputEndpointImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputEndpointImpl.java
index 10edb38c9..c31121ba1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputEndpointImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/dataservices/impl/OutputEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/BinaryDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/BinaryDocumentManager.java
index 6d9fe258c..2ca053168 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/BinaryDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/BinaryDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/ContentDescriptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/ContentDescriptor.java
index 7d9a9c6de..4154d80d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/ContentDescriptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/ContentDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentDescriptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentDescriptor.java
index 0f5502cd2..189287035 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentDescriptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentManager.java
index 7da74da43..a1fd5d715 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentManager.java
@@ -1,4 +1,4 @@
-/* * Copyright 2012-2019 MarkLogic Corporation
+/* * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentMetadataPatchBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentMetadataPatchBuilder.java
index ead711e80..d6141cd7d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentMetadataPatchBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentMetadataPatchBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPage.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPage.java
index baa009807..6fc279300 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPage.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java
index fb124348c..8932c2a68 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentPatchBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentRecord.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentRecord.java
index d08a69517..16cc63d7f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentRecord.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentUriTemplate.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentUriTemplate.java
index 8d867383d..736a14157 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentUriTemplate.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentUriTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteOperation.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteOperation.java
index 1ce953269..847bf1e17 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteOperation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteSet.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteSet.java
index fcf405df7..09f6c4367 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteSet.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/DocumentWriteSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/GenericDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/GenericDocumentManager.java
index 1edef62b8..cb762f264 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/GenericDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/GenericDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/JSONDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/JSONDocumentManager.java
index 0e6a8f4b8..5a464404f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/JSONDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/JSONDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/ServerTransform.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/ServerTransform.java
index a50f39234..3b4217fcc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/ServerTransform.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/ServerTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/TextDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/TextDocumentManager.java
index e40dc9286..71593fb85 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/TextDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/TextDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/XMLDocumentManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/XMLDocumentManager.java
index 866a4ed1e..daac1be0e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/XMLDocumentManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/XMLDocumentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/document/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/document/package-info.java
index 76e6adf0a..ad498cdab 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/document/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/document/package-info.java
@@ -5,7 +5,7 @@
  * in different formats.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResult.java b/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResult.java
index f152d6806..dae34121e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResult.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResultIterator.java b/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResultIterator.java
index 6420086d7..f74d07653 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResultIterator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/eval/EvalResultIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java b/marklogic-client-api/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java
index 722aef0b7..9f258d124 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/eval/ServerEvaluationCall.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/AllCookbookExamples.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/AllCookbookExamples.java
index 9166f35d1..7cf7cd42c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/AllCookbookExamples.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/AllCookbookExamples.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ClientCreator.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ClientCreator.java
index 231a85bc3..ef1a7e15d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ClientCreator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ClientCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentDelete.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentDelete.java
index 06c0328fe..da244cb52 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentDelete.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentDelete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentFormats.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentFormats.java
index 01313a247..1f4acb947 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentFormats.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentFormats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataRead.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataRead.java
index 812c6ed01..ab2d066b0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataRead.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataWrite.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataWrite.java
index bc86c4a3f..f85b74097 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataWrite.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentMetadataWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentOutputStream.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentOutputStream.java
index 51fe8a9f2..a23bedcdb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentOutputStream.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentRead.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentRead.java
index f8e8c6ace..00c635d0c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentRead.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentRead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentReadTransform.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentReadTransform.java
index 17e96ee1b..62a94d6dc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentReadTransform.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentReadTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWrite.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWrite.java
index d3a094c46..2a4156b7c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWrite.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWrite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteServerURI.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteServerURI.java
index fdd6e87dd..80be51de0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteServerURI.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteServerURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteTransform.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteTransform.java
index 86b1d0bc7..e6a82bc77 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteTransform.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/DocumentWriteTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JAXBDocument.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JAXBDocument.java
index 171b5a769..49d6dbf7a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JAXBDocument.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JAXBDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JavascriptResourceExtension.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JavascriptResourceExtension.java
index 630fb793f..528de1dcb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JavascriptResourceExtension.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/JavascriptResourceExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosClientCreator.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosClientCreator.java
index c72ae5c86..35bb2dadd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosClientCreator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosClientCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosSSLClientCreator.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosSSLClientCreator.java
index d979eb76d..8a391adc6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosSSLClientCreator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/KerberosSSLClientCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/MultiStatementTransaction.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/MultiStatementTransaction.java
index b05d8b6cc..b8e37ac38 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/MultiStatementTransaction.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/MultiStatementTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/OptimisticLocking.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/OptimisticLocking.java
index 7ec2ab519..22c419744 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/OptimisticLocking.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/OptimisticLocking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/QueryOptions.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/QueryOptions.java
index 6ebe87137..cec1d3a0a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/QueryOptions.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/QueryOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawClientAlert.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawClientAlert.java
index 88c894b08..686fd8c66 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawClientAlert.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawClientAlert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawCombinedSearch.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawCombinedSearch.java
index a1f611554..dc058caeb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawCombinedSearch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/RawCombinedSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ResourceExtension.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ResourceExtension.java
index 3bd36b8fe..8a623b9d1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ResourceExtension.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/ResourceExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SSLClientCreator.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SSLClientCreator.java
index fc72ee4e7..5604c1d8e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SSLClientCreator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SSLClientCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SearchResponseTransform.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SearchResponseTransform.java
index 16e76da01..3b4eb5d44 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SearchResponseTransform.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/SearchResponseTransform.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StringSearch.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StringSearch.java
index ef3d0f4d7..de1246f56 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StringSearch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StringSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StructuredSearch.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StructuredSearch.java
index c58396f60..358da48e1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StructuredSearch.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/StructuredSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Suggest.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Suggest.java
index a9d567c45..a4f3914ad 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Suggest.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Suggest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Util.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Util.java
index d71d53ff2..b59ba40d9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Util.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/Util.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportServices.java
index 904d2d586..e3f06ce71 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportServices.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportToJdbc.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportToJdbc.java
index 557f81265..7ed106e54 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportToJdbc.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportToJdbc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportWithDataService.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportWithDataService.java
index 53a28a87c..68189d2e5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportWithDataService.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkExportWithDataService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java
index f387bdd44..e06c76306 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithJoins.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithJoins.java
index 2e788becd..06eb95470 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithJoins.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithJoins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithSimpleJoins.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithSimpleJoins.java
index 2148d9a40..b5b274ee7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithSimpleJoins.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcWithSimpleJoins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java
index 3e8f65c84..85ad5733c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/Employee.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/Employee.java
index 648e34551..5db1a035f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/Employee.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/Employee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java
index d3440695b..19d93c3fa 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/IncrementalLoadFromJdbc.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/IncrementalLoadFromJdbc.java
index 40742cc63..9072d4c2e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/IncrementalLoadFromJdbc.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/IncrementalLoadFromJdbc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/LoadDetail.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/LoadDetail.java
index 33b4827e4..e566e212e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/LoadDetail.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/LoadDetail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/WriteandReadPOJOs.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/WriteandReadPOJOs.java
index 25eaccd91..84a6146ce 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/WriteandReadPOJOs.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/datamovement/WriteandReadPOJOs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/package-info.java
index 96f5db9a0..3ac2f1e90 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/cookbook/package-info.java
@@ -6,7 +6,7 @@
  * order for viewing the examples
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManager.java
index dacafd17a..0db7ab53b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManagerExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManagerExample.java
index a8e87f0a4..b3fbb7564 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManagerExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/BatchManagerExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/DocumentSplitter.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/DocumentSplitter.java
index b4c683113..c8c66fdd8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/DocumentSplitter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/DocumentSplitter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/GraphSPARQLExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/GraphSPARQLExample.java
index dcd52c9b7..0686be076 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/GraphSPARQLExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/GraphSPARQLExample.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/NameConverter.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/NameConverter.java
index eaed905e4..685dde523 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/NameConverter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/NameConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcher.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcher.java
index 6391d408d..2c4369538 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcher.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcherExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcherExample.java
index 809ed3fc5..ffdf377f7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcherExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/OpenCSVBatcherExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollector.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollector.java
index 865a06b80..fcf64ca9c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollector.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollectorExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollectorExample.java
index b0e7ab37c..35ce078e6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollectorExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/SearchCollectorExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/package-info.java
index 3da664290..3c3299381 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/extension/package-info.java
@@ -3,7 +3,7 @@
  * of database documents.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/DOM4JHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/DOM4JHandleExample.java
index 98d22468f..d522ef8cf 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/DOM4JHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/DOM4JHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/GSONHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/GSONHandleExample.java
index 765cce0dc..fbbe5a145 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/GSONHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/GSONHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandle.java
index 72288c528..f1b15d9cd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandleExample.java
index 33a501d69..adfe0ff1b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/HTMLCleanerHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JDOMHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JDOMHandleExample.java
index caf39f9a1..5af6c348a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JDOMHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JDOMHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JacksonHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JacksonHandleExample.java
index 64f32ace8..f1afbb368 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JacksonHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/JacksonHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandle.java
index 9a252fff3..c827212b5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandleExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandleExample.java
index 7a5665e9c..ef358e5a5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandleExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/URIHandleExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/package-info.java
index 177e521a0..7714eb74e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/handle/package-info.java
@@ -5,7 +5,7 @@
  * XML documents using the Open Source JDOM library.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/util/Bootstrapper.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/Bootstrapper.java
index fd02d0454..e166f14c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/util/Bootstrapper.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/Bootstrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/util/BootstrapperExample.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/BootstrapperExample.java
index 0e8f84a28..2c0ca464d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/util/BootstrapperExample.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/BootstrapperExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/example/util/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/package-info.java
index 30d5319db..7c55b34a2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/example/util/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/example/util/package-info.java
@@ -2,7 +2,7 @@
  * The package provides utilities for bootstrapping and tearing down a MarkLogic REST instance.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java
index ca1f6a496..67e6ee673 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/CtsExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java
index 5950c097e..a264a6bfa 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/FnExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/JsonExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/JsonExpr.java
index 632cacfa9..1992bd5cd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/JsonExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/JsonExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/MapExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/MapExpr.java
index 21d3b0eb4..4675bf471 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/MapExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/MapExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java
index 56a03ca88..ed2672185 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/MathExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java
index be522a6c0..13ee8764e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java
index dd92dd74c..f5e75126d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/PlanBuilderBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfExpr.java
index 94714e3a0..13f5b2793 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfValue.java
index d63272a63..bb349cc7d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/RdfValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemExpr.java
index 4891fa212..06c55df4c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemValue.java
index b242193db..b812e6017 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SemValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/SpellExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SpellExpr.java
index 1a18d1aff..8c5b6e6ab 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/SpellExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SpellExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/SqlExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SqlExpr.java
index 6a21e848d..9033bfa9e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/SqlExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/SqlExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/XdmpExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XdmpExpr.java
index 9181d22b2..b47cab37f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/XdmpExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XdmpExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsExpr.java
index 058b489a0..aaa113f55 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsValue.java
index 008c52df2..337156c0a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/XsValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/expression/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/expression/package-info.java
index 4fb6ff686..331018a7d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/expression/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/expression/package-info.java
@@ -17,7 +17,7 @@
  * </p>
  */
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceManager.java
index 9ac37f449..3752189e1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceServices.java
index 029389d90..197ab1518 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceServices.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/ResourceServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extensions/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/package-info.java
index ac57185eb..80215f800 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extensions/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extensions/package-info.java
@@ -8,7 +8,7 @@
  * for an example.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java
index a3913ff52..a45b0dcbe 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/DOM4JHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/package-info.java
index e4a5e2353..f942db8b0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/dom4j/package-info.java
@@ -4,7 +4,7 @@
  * data structures.  You must install the dom4j library to use this package.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java
index e2e5beab9..b7002426f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/GSONHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/package-info.java
index 8cc05d8da..d278775d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/gson/package-info.java
@@ -4,7 +4,7 @@
  * input and output.  You must install the GSON library to use this package.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/HttpClientConfigurator.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/HttpClientConfigurator.java
index a20e7e24f..672fe2f0c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/HttpClientConfigurator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/HttpClientConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/package-info.java
index d5cb2705b..3de4ffe2b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/httpclient/package-info.java
@@ -6,7 +6,7 @@
  * HTTP configuration. 
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java
index 3a9311feb..ed510b0ba 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/JDOMHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/package-info.java
index 9db3e9e75..b7da65fc1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/jdom/package-info.java
@@ -4,7 +4,7 @@
  * data structures.  You must install the JDOM library to use this package.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/extra/okhttpclient/OkHttpClientConfigurator.java b/marklogic-client-api/src/main/java/com/marklogic/client/extra/okhttpclient/OkHttpClientConfigurator.java
index c629d712f..88c3235b2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/extra/okhttpclient/OkHttpClientConfigurator.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/extra/okhttpclient/OkHttpClientConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 MarkLogic Corporation
+ * Copyright (c) 2018 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractLoggingManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractLoggingManager.java
index 7f0d342bc..843a5c530 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractLoggingManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractLoggingManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractQueryDefinition.java
index 1fda720bc..57ee81d94 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/AbstractQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseProxy.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseProxy.java
index 7506cee38..8d67679d4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseProxy.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseTypeImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseTypeImpl.java
index c4830cd20..e6cfc3ec5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseTypeImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BaseTypeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/BasicPage.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BasicPage.java
index ccc2647dd..91cb3e444 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/BasicPage.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BasicPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java
index 2f1035bce..36f7d952c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/BinaryDocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientCookie.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientCookie.java
index 777be8d70..95d67aafe 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientCookie.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientCookie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientPropertiesImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientPropertiesImpl.java
index 5dc3e194b..3bd44568d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientPropertiesImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ClientPropertiesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilder.java
index 2fe101ce3..c6545804b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilderImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilderImpl.java
index 7625daf3e..66a39bc95 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilderImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryDefinition.java
index 6e8326bb2..2ce066ea7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CombinedQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java
index 5c70003a1..61c0fc001 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/CtsExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DOMWriter.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DOMWriter.java
index bb9e37f22..c1340dfc0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DOMWriter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DOMWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java
index 6b3993ee3..96904f9de 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DeleteQueryDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DeleteQueryDefinitionImpl.java
index 5c51a3a6f..8c8325b89 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DeleteQueryDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DeleteQueryDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentDescriptorImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentDescriptorImpl.java
index 378ba7ebe..68d0acc5f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentDescriptorImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentDescriptorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java
index f9febf299..373bd917e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentMetadataPatchBuilderImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentMetadataPatchBuilderImpl.java
index 1274faf09..9b4fcf98e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentMetadataPatchBuilderImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentMetadataPatchBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java
index 6a8d1139c..0cf3ba628 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentPatchBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentUriTemplateImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentUriTemplateImpl.java
index d277acb56..2d341cd56 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentUriTemplateImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentUriTemplateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteOperationImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteOperationImpl.java
index 77efc2f4e..b93132221 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteOperationImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteOperationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteSetImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteSetImpl.java
index 0d9d78c8b..b00436cb7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteSetImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/DocumentWriteSetImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ExtensionLibrariesManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ExtensionLibrariesManagerImpl.java
index fe2384770..cc481a749 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ExtensionLibrariesManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ExtensionLibrariesManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
index 1c3f48b55..0f26b5b9a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequestParser.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequestParser.java
index c4de83488..156a196c6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequestParser.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FailedRequestParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/FnExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FnExprImpl.java
index 66cce87b9..d871a58be 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/FnExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/FnExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/GenericDocumentImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GenericDocumentImpl.java
index 1cc4e4e1b..d3a3a68eb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/GenericDocumentImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GenericDocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphManagerImpl.java
index 9c6e7a89b..fc3a01bcd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphPermissionsImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphPermissionsImpl.java
index f22c271e5..215f479b8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphPermissionsImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/GraphPermissionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPBasicAuthInterceptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPBasicAuthInterceptor.java
index 13031aada..0ecd32740 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPBasicAuthInterceptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPBasicAuthInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java
index 48fb75684..b38d06617 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPKerberosAuthInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java
index fb236344f..9771aefef 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HTTPSamlAuthInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleAccessor.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleAccessor.java
index 1119e4c17..07d08a380 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleAccessor.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleFactoryRegistryImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleFactoryRegistryImpl.java
index 10738e053..5055c2a9f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleFactoryRegistryImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleFactoryRegistryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleImplementation.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleImplementation.java
index 7e65a337f..c5080c745 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleImplementation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/HandleImplementation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/InputStreamTee.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/InputStreamTee.java
index 98adce71d..830e2b1ba 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/InputStreamTee.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/InputStreamTee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONDocumentImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONDocumentImpl.java
index 56f337ce4..3ab57b652 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONDocumentImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONDocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONStringWriter.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONStringWriter.java
index 008f5fffa..ca9ba396c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONStringWriter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JSONStringWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/JacksonBaseHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JacksonBaseHandle.java
index 37b4b6f60..71fa7037d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/JacksonBaseHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JacksonBaseHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/JsonExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JsonExprImpl.java
index a0a6a517f..169bf90b2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/JsonExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/JsonExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/MapExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/MapExprImpl.java
index b599eca95..427b1fd35 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/MapExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/MapExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/MathExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/MathExprImpl.java
index 42cc89c4f..25892480c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/MathExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/MathExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/NameMapBase.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NameMapBase.java
index af92c4b83..b4a2acfeb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/NameMapBase.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NameMapBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/NamespacesManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NamespacesManagerImpl.java
index 010b65eda..fd3fcc153 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/NamespacesManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NamespacesManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/NodeConverter.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NodeConverter.java
index ad9428a59..19da4d8fa 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/NodeConverter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/NodeConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java
index cb181fc9d..932789fcb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/OutputStreamTee.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/OutputStreamTee.java
index de254b4b6..127014659 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/OutputStreamTee.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/OutputStreamTee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderBaseImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderBaseImpl.java
index f0b44659e..94ec3de2d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderBaseImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderBaseImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderImpl.java
index 09479e06f..ef9442fcd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderSubImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderSubImpl.java
index a75a95b32..d658f2000 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderSubImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PlanBuilderSubImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoPageImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoPageImpl.java
index da980648d..37c561733 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoPageImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoPageImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoQueryBuilderImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoQueryBuilderImpl.java
index b41f122e7..cf2aecd9c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoQueryBuilderImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoQueryBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoRepositoryImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoRepositoryImpl.java
index effeb2987..4149fbb89 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoRepositoryImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/PojoRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryManagerImpl.java
index 5c5eea023..4be06175c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsManagerImpl.java
index bd8bbe81c..196d2525c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsTransformInjectNS.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsTransformInjectNS.java
index 3d483b840..842264eba 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsTransformInjectNS.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/QueryOptionsTransformInjectNS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RESTServices.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RESTServices.java
index bcd57cf1a..6239cd9c0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RESTServices.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RESTServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RawQueryDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RawQueryDefinitionImpl.java
index 9fd1fc1b3..08ce574ef 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RawQueryDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RawQueryDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfExprImpl.java
index c41746aee..1101a6778 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfValueImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfValueImpl.java
index 1f4ae6b52..fb285e3eb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfValueImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RdfValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ReaderTee.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ReaderTee.java
index 89a82b621..90263d40a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ReaderTee.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ReaderTee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestLoggerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestLoggerImpl.java
index 2bf188cc0..183d75893 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestLoggerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestLoggerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestParametersImplementation.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestParametersImplementation.java
index 7b86c034e..3ed44398c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestParametersImplementation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RequestParametersImplementation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceExtensionsImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceExtensionsImpl.java
index 469c67759..e1e931708 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceExtensionsImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceExtensionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceManagerImplementation.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceManagerImplementation.java
index 87f6a359c..c22ec6b26 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceManagerImplementation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceManagerImplementation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceServicesImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceServicesImpl.java
index 10da1af33..50ca8e8c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceServicesImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ResourceServicesImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RowManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RowManagerImpl.java
index 9b034af1c..c3007c866 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RowManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RowManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/RuleManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RuleManagerImpl.java
index f74156974..6dfa9ec8c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/RuleManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/RuleManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingImpl.java
index 4da32e77a..fe1a881ec 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingsImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingsImpl.java
index a6494e96a..d5720222a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingsImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLBindingsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryDefinitionImpl.java
index a269ae7a5..f8aef6d8e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryManagerImpl.java
index 7e97aa648..59b96da32 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SPARQLQueryManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemExprImpl.java
index 2db2b7d70..151bf697f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemValueImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemValueImpl.java
index d9da6cb3a..b061976f9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemValueImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SemValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerConfigurationManagerImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerConfigurationManagerImpl.java
index d6438e721..54dd58e64 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerConfigurationManagerImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerConfigurationManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java
index 61be4cbeb..2cec99e91 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ServerEvaluationCallImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SessionStateImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SessionStateImpl.java
index 7c39920aa..96638dc81 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SessionStateImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SessionStateImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SpellExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SpellExprImpl.java
index a7021c80f..68ba89e94 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SpellExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SpellExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SqlExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SqlExprImpl.java
index 43833f99c..c48c0b827 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SqlExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SqlExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/StreamingOutputImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/StreamingOutputImpl.java
index 5343e054b..2ea57e61f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/StreamingOutputImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/StreamingOutputImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/StringQueryDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/StringQueryDefinitionImpl.java
index d0c099a16..04761f466 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/StringQueryDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/StringQueryDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/SuggestDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SuggestDefinitionImpl.java
index fe88bc40c..3e8b382c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/SuggestDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/SuggestDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/TextDocumentImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TextDocumentImpl.java
index 1b4399432..241a2fc00 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/TextDocumentImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TextDocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransactionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransactionImpl.java
index 5ad86f3dc..0d5b0c2e4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransactionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransactionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransformExtensionsImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransformExtensionsImpl.java
index 7bc0d3ea0..805231a20 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransformExtensionsImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TransformExtensionsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/TuplesBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TuplesBuilder.java
index 42887cdfd..9ab896781 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/TuplesBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/TuplesBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisHandle.java
index 963a321be..f2af334df 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisReadHandle.java
index 61138ae0a..5e8e0c7a2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/UrisReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/Utilities.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/Utilities.java
index 6f2351be6..81cd4d383 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/Utilities.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/Utilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValueConverter.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValueConverter.java
index a60406bef..7cbb12ec4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValueConverter.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValueConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesBuilder.java
index fca17598d..24cd51e9c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesDefinitionImpl.java
index eb98608f3..57e8af4c0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListBuilder.java
index ca179357b..513eb6482 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListDefinitionImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListDefinitionImpl.java
index 4c60bdb04..af3243f46 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListDefinitionImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesListDefinitionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricImpl.java
index 7d5062f19..bc223ecd2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricsImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricsImpl.java
index caae78eaa..fb0d49666 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricsImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/ValuesMetricsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/XMLDocumentImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XMLDocumentImpl.java
index 9a3da33ec..94c9184e7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/XMLDocumentImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XMLDocumentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/XdmpExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XdmpExprImpl.java
index d35050a2b..4db24cecb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/XdmpExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XdmpExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/XmlFactories.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XmlFactories.java
index 69b6097ff..8fcb9bbe2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/XmlFactories.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XmlFactories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsExprImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsExprImpl.java
index dcf5e13bf..41eaa3673 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsExprImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsExprImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsValueImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsValueImpl.java
index 52f88c040..13e86f83d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsValueImpl.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/impl/XsValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/BaseHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/BaseHandle.java
index 1764baa05..6ea086b71 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/BaseHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/BaseHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/BytesHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/BytesHandle.java
index b02409bf9..6c95057a1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/BytesHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/BytesHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/DOMHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/DOMHandle.java
index 8925f5f21..9bda72284 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/DOMHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/DOMHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java
index 5dd6fd71e..2703c70a7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/DocumentMetadataHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/FileHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/FileHandle.java
index 7e53dc41c..f718deeba 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/FileHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/FileHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/Format.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/Format.java
index 9ffb8cd1c..b96bb6af2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/Format.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/Format.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/InputSourceHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/InputSourceHandle.java
index 7e825f475..5a2268d53 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/InputSourceHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/InputSourceHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/InputStreamHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/InputStreamHandle.java
index 157e6a833..bede9265f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/InputStreamHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/InputStreamHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/JAXBHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/JAXBHandle.java
index 63a0b526c..50244f20d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/JAXBHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/JAXBHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/JSONErrorParser.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/JSONErrorParser.java
index cf3458508..8a4bee977 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/JSONErrorParser.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/JSONErrorParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java
index 774280152..4b40dfdc7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonDatabindHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonHandle.java
index 59145bd86..6518a6dbc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonParserHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonParserHandle.java
index 9b5ec9c17..ff97cbb48 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonParserHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/JacksonParserHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamHandle.java
index 31b41e536..4479d1f17 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamSender.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamSender.java
index 03ecf0fe8..3dd74a0df 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamSender.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/OutputStreamSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/QueryOptionsListHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/QueryOptionsListHandle.java
index 10232ccd3..5f7d5730d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/QueryOptionsListHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/QueryOptionsListHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/ReaderHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/ReaderHandle.java
index 818ea01ea..a22f749a2 100755
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/ReaderHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/ReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/SearchHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/SearchHandle.java
index 87756409f..f5f589ee2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/SearchHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/SearchHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/SourceHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/SourceHandle.java
index 6c3e08623..ea6d8fcc8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/SourceHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/SourceHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/StringHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/StringHandle.java
index 849705ca3..721004f01 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/StringHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/StringHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/TuplesHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/TuplesHandle.java
index 71e27c652..87d7e7cf6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/TuplesHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/TuplesHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesHandle.java
index 6b852f8ff..3aa80e5c0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesListHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesListHandle.java
index 61b8da6c8..747ad185e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesListHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/ValuesListHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLEventReaderHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLEventReaderHandle.java
index 09bb06f0c..226fb6b36 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLEventReaderHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLEventReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLStreamReaderHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLStreamReaderHandle.java
index 0d39785ad..cb4cb3a2e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLStreamReaderHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/XMLStreamReaderHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractReadHandle.java
index c35f3e3b9..c549b5cc9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractWriteHandle.java
index 5291fcae2..32edce0d6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/AbstractWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryReadHandle.java
index ea1cecbaf..bb20305ca 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryWriteHandle.java
index eda56bd99..409783148 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BinaryWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BufferableHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BufferableHandle.java
index 46c7bd123..4b4a9c8bf 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BufferableHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/BufferableHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandle.java
index 2f8aec6f0..3cccb69e6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandleFactory.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandleFactory.java
index 12641673f..3213126b9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandleFactory.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ContentHandleFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/CtsQueryWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/CtsQueryWriteHandle.java
index df6fb4b35..c58d21e07 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/CtsQueryWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/CtsQueryWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataReadHandle.java
index 93e81bb09..dc97eaf3d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataWriteHandle.java
index 9bfc8d6eb..3b93b7f72 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentMetadataWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentPatchHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentPatchHandle.java
index 235944e46..f79ac4516 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentPatchHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/DocumentPatchHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericReadHandle.java
index 4ca87269d..1e37c0e82 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericWriteHandle.java
index dca40acc7..ec8136884 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/GenericWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONReadHandle.java
index 60c1d73fb..d64b5ffcf 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONWriteHandle.java
index f6c733d58..91c4183f9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/JSONWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/OperationNotSupported.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/OperationNotSupported.java
index fceb51560..bd51fedea 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/OperationNotSupported.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/OperationNotSupported.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QuadsWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QuadsWriteHandle.java
index 6d633692a..b58dd5e40 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QuadsWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QuadsWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsListReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsListReadHandle.java
index 681efe71a..f93789796 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsListReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsListReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsReadHandle.java
index b279d3bec..749fbf145 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsWriteHandle.java
index 22dbe78b6..26b8b75f6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/QueryOptionsWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleListReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleListReadHandle.java
index a496c3b0a..96c03031c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleListReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleListReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleReadHandle.java
index 023b44643..e73dc4b65 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleWriteHandle.java
index 231c0330c..15712ba38 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/RuleWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SPARQLResultsReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SPARQLResultsReadHandle.java
index 31ce1bbc0..ec5c249e4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SPARQLResultsReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SPARQLResultsReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SearchReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SearchReadHandle.java
index c7002f186..fb3fc3471 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SearchReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/SearchReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureReadHandle.java
index 0552d77ab..cfd15acae 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureWriteHandle.java
index edaa8a0d3..1bb3e298f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/StructureWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextReadHandle.java
index ad3805509..666c9dc25 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextWriteHandle.java
index d8d3aacd4..4841fa6d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TextWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesReadHandle.java
index 625f05456..5b1223b08 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesWriteHandle.java
index ea4519e6f..2aba101b5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TriplesWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TuplesReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TuplesReadHandle.java
index 9a466cf0f..feffb42e6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TuplesReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/TuplesReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesListReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesListReadHandle.java
index 89e359ff0..4eadbc9ca 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesListReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesListReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesReadHandle.java
index cfd960f2a..f73b65ff8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/ValuesReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLReadHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLReadHandle.java
index 85cb0ed08..41673fb07 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLReadHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLReadHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLWriteHandle.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLWriteHandle.java
index 023d3e673..e0121cb60 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLWriteHandle.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/XMLWriteHandle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/package-info.java
index 555bf4b66..411becf02 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/marker/package-info.java
@@ -5,7 +5,7 @@
  * content when writing documents implement the {com.marklogic.client.io.marker.XMLWriteHandle} interface.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/io/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/io/package-info.java
index 21f698175..ea01373e2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/io/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/io/package-info.java
@@ -6,7 +6,7 @@
  * some handles to read or write document metadata or query options or to read search results.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/package-info.java
index 6d7871f44..59e16efc3 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/package-info.java
@@ -9,7 +9,7 @@
  * exceptions in this package enumerate the ways in which a REST server request can go wrong.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoPage.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoPage.java
index 69d9cbff6..a25596ca8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoPage.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryBuilder.java
index fb12084ea..8fac425da 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryDefinition.java
index fff8d8f9f..fefb2cd46 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoRepository.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoRepository.java
index e42762d70..8f5c5279d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoRepository.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/PojoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialLatitude.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialLatitude.java
index e3907340a..8051f1925 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialLatitude.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialLatitude.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialPathIndexProperty.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialPathIndexProperty.java
index 9a6f90302..9cf3a91ca 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialPathIndexProperty.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/GeospatialPathIndexProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/Id.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/Id.java
index 1770b9b75..c20afee7e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/Id.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/Id.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/PathIndexProperty.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/PathIndexProperty.java
index 30dff3db9..c0590786e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/PathIndexProperty.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/annotation/PathIndexProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/package-info.java
index 388a98b6f..f549b7957 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/package-info.java
@@ -7,7 +7,7 @@
  * objects persisted using PojoRepository.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/pojo/util/GenerateIndexConfig.java b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/util/GenerateIndexConfig.java
index aa6525eef..7ed5d9719 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/pojo/util/GenerateIndexConfig.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/pojo/util/GenerateIndexConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/AggregateResult.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/AggregateResult.java
index 46f349556..1b765547f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/AggregateResult.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/AggregateResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/CountedDistinctValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/CountedDistinctValue.java
index 7ff3cb8c4..a4e103e9a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/CountedDistinctValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/CountedDistinctValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/DeleteQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/DeleteQueryDefinition.java
index 380b90271..b1d3b589e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/DeleteQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/DeleteQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedItem.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedItem.java
index 2e0120f44..2b2815b67 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedItem.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedResult.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedResult.java
index 7cbb91c39..4cfc09320 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedResult.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ExtractedResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetHeatmapValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetHeatmapValue.java
index 7bc9eea6f..95f5a0f83 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetHeatmapValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetHeatmapValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetResult.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetResult.java
index 73d22618f..76cc53597 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetResult.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetValue.java
index 37be01b43..920b7f19a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/FacetValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchDocumentSummary.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchDocumentSummary.java
index 243a3cf53..7fbba0a1d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchDocumentSummary.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchDocumentSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchLocation.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchLocation.java
index 82878e46b..b5dcffd21 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchLocation.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchSnippet.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchSnippet.java
index fe605ae9d..a4af9a77b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchSnippet.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/MatchSnippet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryDefinition.java
index dc4c1b249..6a48ee951 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryManager.java
index 019118f0e..44425ade8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListBuilder.java
index 7f17fb7fd..341ce7675 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListResults.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListResults.java
index 82ed6d13b..3235afb46 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListResults.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/QueryOptionsListResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCombinedQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCombinedQueryDefinition.java
index 36e04696e..04ceb56d5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCombinedQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCombinedQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCtsQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCtsQueryDefinition.java
index 5aa7b6b34..767f5441a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCtsQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawCtsQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryByExampleDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryByExampleDefinition.java
index c48d514f8..d6e00d6eb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryByExampleDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryByExampleDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryDefinition.java
index dd678840d..6b0a086ee 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/RawStructuredQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawStructuredQueryDefinition.java
index c149f2657..aa37d84f0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/RawStructuredQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/RawStructuredQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchMetrics.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchMetrics.java
index ab621449d..c686446c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchMetrics.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchResults.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchResults.java
index 3f7b0ed44..8e126fb90 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchResults.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/SearchResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/StringQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/StringQueryDefinition.java
index faaec1c32..298e7ddc8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/StringQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/StringQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java
index b21e3ad8b..48b8629d5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryDefinition.java
index df64ff043..a6616deec 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/StructuredQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/SuggestDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/SuggestDefinition.java
index c941345bb..aea7c819d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/SuggestDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/SuggestDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/Tuple.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/Tuple.java
index 9a818471c..a13c2b9dc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/Tuple.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/Tuple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/TuplesResults.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/TuplesResults.java
index 69fcefec4..4dcb490e9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/TuplesResults.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/TuplesResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/TypedDistinctValue.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/TypedDistinctValue.java
index 092108ac6..c32dc78fe 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/TypedDistinctValue.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/TypedDistinctValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValueQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValueQueryDefinition.java
index 8f4bbd648..1f68410cc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValueQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValueQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesDefinition.java
index 27079fd6c..b3c294eb2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListDefinition.java
index 546b784b2..7b5560d35 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListResults.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListResults.java
index c1870fc5f..fdb627a6d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListResults.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesListResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesMetrics.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesMetrics.java
index a1a199eee..2595c59f4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesMetrics.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesResults.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesResults.java
index 45cbb8e82..655da11ce 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesResults.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/ValuesResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/query/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/query/package-info.java
index da6b0355e..46e6226f6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/query/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/query/package-info.java
@@ -5,7 +5,7 @@
  * for different ways of querying the database.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/row/RawPlanDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/row/RawPlanDefinition.java
index 396e47b3d..96c1527cf 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/row/RawPlanDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/row/RawPlanDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/row/RowManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowManager.java
index 7abc1e68a..a76e5bce0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/row/RowManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/row/RowRecord.java b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowRecord.java
index 852c6c593..f0de445dd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/row/RowRecord.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/row/RowSet.java b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowSet.java
index c2f0a4b86..8f058a611 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/row/RowSet.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/row/RowSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/row/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/row/package-info.java
index 2c1f273b6..4d8d3e51e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/row/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/row/package-info.java
@@ -6,7 +6,7 @@
  * to build plan requests.
  */
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/Capability.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/Capability.java
index 3b97bd4f4..941606dc0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/Capability.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/Capability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphManager.java
index 55362da44..94a0142f4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphPermissions.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphPermissions.java
index 7933e71be..baa488fab 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphPermissions.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/GraphPermissions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFMimeTypes.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFMimeTypes.java
index 3b00ffd40..b13cb0327 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFMimeTypes.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFMimeTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFTypes.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFTypes.java
index 92db97d04..cc9e34f52 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFTypes.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/RDFTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBinding.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBinding.java
index c2b98c6a9..7bc46d32e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBinding.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBinding.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBindings.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBindings.java
index ec4336ad7..81f734786 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBindings.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLBindings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLMimeTypes.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLMimeTypes.java
index 85503e9cc..b5fbab867 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLMimeTypes.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLMimeTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryDefinition.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryDefinition.java
index 0426d7a95..a35a9662c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryDefinition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryManager.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryManager.java
index adfe60b8b..05acbee05 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryManager.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLQueryManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLRuleset.java b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLRuleset.java
index 6b7709d6c..ed6dfcc6c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLRuleset.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/semantics/SPARQLRuleset.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxExpr.java
index bb55df9c4..902d3452a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxSeqExpr.java
index eaee8067f..29e55f20d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsBoxSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleExpr.java
index f87e4958b..b96932710 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleSeqExpr.java
index ff9ac6515..c0c4b8c98 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsCircleSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodExpr.java
index 41bffbf9e..5d3295148 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodSeqExpr.java
index 3283e3455..957aac29b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPeriodSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointExpr.java
index 8f9106aff..9ed03f6c1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointSeqExpr.java
index fcfdb812c..0d85923f1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPointSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonExpr.java
index 66111254e..6c5c0ccb0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonSeqExpr.java
index 99c2d71d7..f57d565ab 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsPolygonSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQueryExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQueryExpr.java
index 2740b640e..f834f2e59 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQueryExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQueryExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQuerySeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQuerySeqExpr.java
index 51e6440c9..eb34dd85d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQuerySeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsQuerySeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceExpr.java
index d5ccf9871..89d9cff3a 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceSeqExpr.java
index 8067d7db5..b9db99805 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsReferenceSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionExpr.java
index e69ddac57..81abd9a58 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionSeqExpr.java
index 0a12088f1..8bc5eb8f4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/CtsRegionSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemSeqVal.java
index a74baa531..c5fb5803b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemVal.java
index 475040f47..56fbcb1eb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/ItemVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateCol.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateCol.java
index b662fd0f5..2d17bea42 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateCol.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateCol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateColSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateColSeq.java
index 06bc12f48..0590a07b4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateColSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanAggregateColSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCase.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCase.java
index bec40dda4..2692dd640 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCase.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCaseSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCaseSeq.java
index 6476e4e44..86cb5a473 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCaseSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCaseSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumn.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumn.java
index 18a78339a..5ce3ab139 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumn.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumnSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumnSeq.java
index bdfb7a3c6..bca799063 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumnSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanColumnSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCondition.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCondition.java
index 887fffd94..b166a4abb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCondition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanConditionSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanConditionSeq.java
index d527e39c4..33cb9c7ac 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanConditionSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanConditionSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprCol.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprCol.java
index e8dd799a0..f56c3ddbd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprCol.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprCol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprColSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprColSeq.java
index 0eabd64a8..f647b5529 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprColSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanExprColSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunction.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunction.java
index ae18f13d8..684444654 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunction.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunctionSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunctionSeq.java
index 51a80656b..825da06d5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunctionSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanFunctionSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOption.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOption.java
index a4c9c3a7b..24e5f36d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOption.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOptionSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOptionSeq.java
index 204114750..91fa15282 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOptionSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanGroupConcatOptionSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKey.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKey.java
index a7f1c8eee..45a9486bb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKey.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKeySeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKeySeq.java
index ef9afc807..8bcd5d327 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKeySeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJoinKeySeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonProperty.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonProperty.java
index 232e654a9..b59a4347c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonProperty.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonPropertySeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonPropertySeq.java
index 7e7a539ce..6959fe1f8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonPropertySeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanJsonPropertySeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingSeqVal.java
index a4a98ade0..5f423dcc6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingVal.java
index 788901d34..a6810a328 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamBindingVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamExpr.java
index 62919092e..5b7661b23 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamSeqExpr.java
index 9a8643cd9..9ead796aa 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanParamSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixer.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixer.java
index a711885c6..987ff3974 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixer.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixerSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixerSeq.java
index 097e603f6..8a93dea85 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixerSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanPrefixerSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKey.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKey.java
index 35f0626df..fa8ffbc44 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKey.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKeySeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKeySeq.java
index b3c86d104..dd6aab464 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKeySeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSortKeySeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumn.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumn.java
index 3aeec5485..fad91220c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumn.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumnSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumnSeq.java
index 5ad18a18a..7cd6a203e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumnSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanSystemColumnSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTripleOption.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTripleOption.java
index 78670fe96..ad58061dc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTripleOption.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTripleOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePattern.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePattern.java
index 0f0c37e4e..91f8f4575 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePattern.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePatternSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePatternSeq.java
index 624fb31c0..4e4fbe385 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePatternSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePatternSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePosition.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePosition.java
index dbc0ff845..c4dd133c4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePosition.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePosition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePositionSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePositionSeq.java
index 5d1987bd4..2c1192883 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePositionSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanTriplePositionSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOption.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOption.java
index 3f67202aa..72bf030e1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOption.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOptionSeq.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOptionSeq.java
index 2231cce87..e7db7a3a3 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOptionSeq.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/PlanValueOptionSeq.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringSeqVal.java
index 03ae50f14..6f4178ebb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringVal.java
index c9c41ec41..aafff23bb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/RdfLangStringVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriSeqVal.java
index 6b3d5ed10..ec6f1b049 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriVal.java
index cbda8ece6..4c34510db 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemIriVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreExpr.java
index 54354640a..fe0a21c70 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreSeqExpr.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreSeqExpr.java
index a96c4df48..597248b17 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreSeqExpr.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/SemStoreSeqExpr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/ServerExpression.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/ServerExpression.java
index dfcff8eae..15c1f7bca 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/ServerExpression.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/ServerExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeSeqVal.java
index 1d08f4070..448358d5b 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeVal.java
index 34cccec0a..31cd1bf96 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyAtomicTypeVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeSeqVal.java
index 0330787b9..69a44a844 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeVal.java
index 831ab377f..943f3f76f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnySimpleTypeVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURISeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURISeqVal.java
index 209589a9d..c50dc15f6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURISeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURISeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURIVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURIVal.java
index 3bfa38520..ebdd0bde5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURIVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsAnyURIVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinarySeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinarySeqVal.java
index 0306e9072..a191e28c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinarySeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinarySeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinaryVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinaryVal.java
index 7f7918991..297a2e299 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinaryVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBase64BinaryVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanSeqVal.java
index b3265d52c..6d2fec9b6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanVal.java
index 857bee11c..29cf2fda9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsBooleanVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteSeqVal.java
index 71c070216..c7697eb27 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteVal.java
index 3abcbff77..073f9850c 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsByteVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateSeqVal.java
index ce65692f8..bff7f6db4 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeSeqVal.java
index 1f6bf2415..2144a032e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeVal.java
index a9656d71f..f1f3c7358 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateTimeVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateVal.java
index de7b16450..aef6d8808 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDateVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationSeqVal.java
index 015649ff2..9bb5dbcda 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationVal.java
index 1b4cfd6dd..07960d749 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDayTimeDurationVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalSeqVal.java
index 66fe7d623..2918674cb 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalVal.java
index 9f492df4b..39090bc34 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDecimalVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleSeqVal.java
index 73020b1d5..5cfcd444d 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleVal.java
index 9bad08761..1d25e83ff 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDoubleVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationSeqVal.java
index aaebf4a57..76fe1aa98 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationVal.java
index 062b22fbc..04f0ccb6f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsDurationVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatSeqVal.java
index 9c0ae4a68..f9db559dc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatVal.java
index 4ffd53758..07887474e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsFloatVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDaySeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDaySeqVal.java
index 2da15acd6..729743812 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDaySeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDaySeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDayVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDayVal.java
index 65064f1bc..afe4d8138 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDayVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGDayVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDaySeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDaySeqVal.java
index a28ac2397..4528cd103 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDaySeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDaySeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDayVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDayVal.java
index 1d3d78ac3..fa6aaa6e1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDayVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthDayVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthSeqVal.java
index 84f24423c..5d9f58a1f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthVal.java
index 518094471..b48d14b8f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGMonthVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthSeqVal.java
index bf7bc52d9..1eefd50ca 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthVal.java
index 61d117ba8..5dd0750d2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearMonthVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearSeqVal.java
index f11fddf6c..bacfd5ab5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearVal.java
index bfa480256..f24cade70 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsGYearVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinarySeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinarySeqVal.java
index 67e09cd6f..d5824370e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinarySeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinarySeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinaryVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinaryVal.java
index 6706109b0..d34c3e4c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinaryVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsHexBinaryVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntSeqVal.java
index cb93d65f2..207bd3b42 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntVal.java
index cd8964b01..e27b635da 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerSeqVal.java
index dfdfecd19..12283fc45 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerVal.java
index 810e34de8..ea02f84b8 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsIntegerVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongSeqVal.java
index 464e8265b..8e320f3f9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongVal.java
index 21d95392b..aee64a9fc 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsLongVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerSeqVal.java
index 68af3e1a5..3ff836323 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerVal.java
index 3cec87340..33bc07508 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNonNegativeIntegerVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericSeqVal.java
index f1d9ed06d..c891acef6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericVal.java
index 3ecb0c49f..55b4bfb90 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsNumericVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameSeqVal.java
index f3aadc89a..97aa2c275 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameVal.java
index c03a0bf96..6e6dbe4ed 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsQNameVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortSeqVal.java
index 51479fff0..22dcc2191 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortVal.java
index 7ea2416f4..ef3e0a327 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsShortVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringSeqVal.java
index 1e4bd4581..c694497c2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringVal.java
index b02eacc67..318a9379f 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsStringVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeSeqVal.java
index 4e7450b6b..33f1e9e5e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeVal.java
index ebddedb98..4c6181b2e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsTimeVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteSeqVal.java
index e6f9d6e4c..f2b0b9101 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteVal.java
index bb200612f..009536019 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedByteVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntSeqVal.java
index 53778088a..be46434d0 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntVal.java
index 771d8fe7d..002c5ec67 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedIntVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongSeqVal.java
index 3c302cac2..dd2bf89ad 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongVal.java
index dbd3ee17d..de52d3566 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedLongVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortSeqVal.java
index 1efd09f7a..50651bba6 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortVal.java
index 1e340b26b..bb1a06368 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUnsignedShortVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicSeqVal.java
index 78ad0ff62..de61c4e85 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicVal.java
index 59ebab0b1..48ae0dbc5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsUntypedAtomicVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationSeqVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationSeqVal.java
index afafebe85..d334dbcb7 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationSeqVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationSeqVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationVal.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationVal.java
index be1e83ee0..9fa9e9cbd 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationVal.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/XsYearMonthDurationVal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/type/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/type/package-info.java
index 77b1c58cf..1cb8662f5 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/type/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/type/package-info.java
@@ -4,7 +4,7 @@
  * or returned from a {@link com.marklogic.client.row.RowRecord} method.
  */
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/EditableNamespaceContext.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/EditableNamespaceContext.java
index 1ca9262ad..e3c6c70c1 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/EditableNamespaceContext.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/EditableNamespaceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/IterableNamespaceContext.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/IterableNamespaceContext.java
index 71b6bd896..920eef600 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/IterableNamespaceContext.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/IterableNamespaceContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/NameMap.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/NameMap.java
index e54c9756c..ddf518fc2 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/NameMap.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/NameMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestLogger.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestLogger.java
index fc56d8b6f..59e8311d9 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestLogger.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestParameters.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestParameters.java
index 4689be60a..ba5570898 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestParameters.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/RequestParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/java/com/marklogic/client/util/package-info.java b/marklogic-client-api/src/main/java/com/marklogic/client/util/package-info.java
index d93d315ca..569f6540e 100644
--- a/marklogic-client-api/src/main/java/com/marklogic/client/util/package-info.java
+++ b/marklogic-client-api/src/main/java/com/marklogic/client/util/package-info.java
@@ -3,7 +3,7 @@
  * shared across other packages.
  */
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/main/resources/property.xsd b/marklogic-client-api/src/main/resources/property.xsd
index 499cfe346..fd9465c06 100644
--- a/marklogic-client-api/src/main/resources/property.xsd
+++ b/marklogic-client-api/src/main/resources/property.xsd
@@ -1,4 +1,4 @@
-<!-- Copyright 2002-2019 MarkLogic Corporation.  All Rights Reserved. -->
+<!-- Copyright (c) 2019 MarkLogic Corporation -->
 <xs:schema targetNamespace="http://marklogic.com/xdmp/property"
  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd
                      http://marklogic.com/xdmp/security security.xsd"
diff --git a/marklogic-client-api/src/main/resources/scripts/dictionary.xqy b/marklogic-client-api/src/main/resources/scripts/dictionary.xqy
index 0464251ad..ba94355f3 100644
--- a/marklogic-client-api/src/main/resources/scripts/dictionary.xqy
+++ b/marklogic-client-api/src/main/resources/scripts/dictionary.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-(: Copyright 2011-2019 MarkLogic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2019 MarkLogic Corporation :)
 
 module namespace dictionary = "http://marklogic.com/rest-api/resource/dictionary";
 
diff --git a/marklogic-client-api/src/main/resources/scripts/docbatch.xqy b/marklogic-client-api/src/main/resources/scripts/docbatch.xqy
index 7edb68b37..42e94ea13 100644
--- a/marklogic-client-api/src/main/resources/scripts/docbatch.xqy
+++ b/marklogic-client-api/src/main/resources/scripts/docbatch.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-(: Copyright 2011-2019 MarkLogic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2019 MarkLogic Corporation :)
 
 module namespace docbatch = "http://marklogic.com/rest-api/resource/docbatch";
 
diff --git a/marklogic-client-api/src/main/resources/scripts/docsplit.xqy b/marklogic-client-api/src/main/resources/scripts/docsplit.xqy
index d808dc28a..e78a07fbe 100644
--- a/marklogic-client-api/src/main/resources/scripts/docsplit.xqy
+++ b/marklogic-client-api/src/main/resources/scripts/docsplit.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-(: Copyright 2011-2019 MarkLogic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2019 MarkLogic Corporation :)
 
 module namespace docsplit = "http://marklogic.com/rest-api/resource/docsplit";
 
diff --git a/marklogic-client-api/src/main/resources/scripts/html2xhtml.xqy b/marklogic-client-api/src/main/resources/scripts/html2xhtml.xqy
index 2d0f0cc1a..45723220b 100644
--- a/marklogic-client-api/src/main/resources/scripts/html2xhtml.xqy
+++ b/marklogic-client-api/src/main/resources/scripts/html2xhtml.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-(: Copyright 2011-2019 MarkLogic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2019 MarkLogic Corporation :)
 
 (: An XQuery transform must follow some conventions rigorously:
    *  The transform must be an XQuery library module
diff --git a/marklogic-client-api/src/main/resources/scripts/searchcollect.xqy b/marklogic-client-api/src/main/resources/scripts/searchcollect.xqy
index 2dd0a9485..ea8beba61 100644
--- a/marklogic-client-api/src/main/resources/scripts/searchcollect.xqy
+++ b/marklogic-client-api/src/main/resources/scripts/searchcollect.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-(: Copyright 2011-2019 MarkLogic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2019 MarkLogic Corporation :)
 
 module namespace searchcollect = "http://marklogic.com/rest-api/resource/searchcollect";
 
diff --git a/marklogic-client-api/src/main/resources/search.xsd b/marklogic-client-api/src/main/resources/search.xsd
index 69f8e096d..743dd0dde 100644
--- a/marklogic-client-api/src/main/resources/search.xsd
+++ b/marklogic-client-api/src/main/resources/search.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2002-2019 MarkLogic Corporation.  All Rights Reserved. -->
+<!-- Copyright (c) 2019 MarkLogic Corporation -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://marklogic.com/appservices/search" xmlns:search="http://marklogic.com/appservices/search">
   <!--
     Notice: The *.rnc are the normative human-edited versions
diff --git a/marklogic-client-api/src/main/resources/security.xsd b/marklogic-client-api/src/main/resources/security.xsd
index 97015a3d0..f91f0c8fd 100644
--- a/marklogic-client-api/src/main/resources/security.xsd
+++ b/marklogic-client-api/src/main/resources/security.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2002-2019 MarkLogic Corporation.  All Rights Reserved. -->
+<!-- Copyright (c) 2019 MarkLogic Corporation -->
 <xs:schema targetNamespace="http://marklogic.com/xdmp/security"
  xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd
                      http://www.w3.org/1999/xhtml xhtml-inlstyle-1.xsd"
diff --git a/marklogic-client-api/src/test/java/com/marklogic/client/test/AlertingTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/AlertingTest.java
index 586ddb4b4..ba11ba02a 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/AlertingTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/AlertingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/BinaryDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BinaryDocumentTest.java
index d89904e8f..bfe558525 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BinaryDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BinaryDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalFeaturesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalFeaturesTest.java
index 828b12509..a8df17e83 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalFeaturesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalFeaturesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java
index 6b3064231..61d1a0761 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BitemporalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/BufferableHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BufferableHandleTest.java
index 3650ef007..d88d2b2ac 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BufferableHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BufferableHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java
index 07f2dbb3a..d4c37f742 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/BulkReadWriteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/City.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/City.java
index 4c12def36..69fe7a944 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/City.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/City.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ClosingHandlesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ClosingHandlesTest.java
index 0aca3559e..e0f3f7914 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ClosingHandlesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ClosingHandlesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/CombinedQueryBuilderTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/CombinedQueryBuilderTest.java
index 9b55e6b35..6291b055d 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/CombinedQueryBuilderTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/CombinedQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java
index b209c73e0..2122991c2 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ConditionalDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ConditionalDocumentTest.java
index ed4eadff7..fc6eb8cb0 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ConditionalDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ConditionalDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/Country.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/Country.java
index e705dc324..a5f3fe084 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/Country.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/Country.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/DOMSearchResultTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/DOMSearchResultTest.java
index 2b1a13c58..b4a9d8b7f 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/DOMSearchResultTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/DOMSearchResultTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientFactoryTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientFactoryTest.java
index ebd524fca..c85249bcf 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientFactoryTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientTest.java
index 9d9e0ff99..6cfda47bc 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/DatabaseClientTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/DeleteSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/DeleteSearchTest.java
index 825495337..c086157df 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/DeleteSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/DeleteSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/DocumentMetadataHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/DocumentMetadataHandleTest.java
index 677099905..2fccc2746 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/DocumentMetadataHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/DocumentMetadataHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/EvalTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/EvalTest.java
index 243855f47..f3de9c0cb 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/EvalTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/EvalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ExtensionLibrariesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ExtensionLibrariesTest.java
index 372bef488..979bf7394 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ExtensionLibrariesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ExtensionLibrariesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java
index b85a94c06..2e41bbc85 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/FailedRequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/GenericDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/GenericDocumentTest.java
index bd90da616..5e002bbde 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/GenericDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/GenericDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/GeospatialRegionQueriesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/GeospatialRegionQueriesTest.java
index 5e4e2be4f..283af06e9 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/GeospatialRegionQueriesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/GeospatialRegionQueriesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/GraphsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/GraphsTest.java
index 3e30e8a45..96206c87e 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/GraphsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/GraphsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAccessorTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAccessorTest.java
index 2156eddfb..2e5b748ea 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAccessorTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAccessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java
index 3eeb4af16..60d5fb41c 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/HandleAsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/InvalidUserTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/InvalidUserTest.java
index 8051e73f9..cc18292ca 100755
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/InvalidUserTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/InvalidUserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/JAXBHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/JAXBHandleTest.java
index a4917b284..c6d948bcf 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/JAXBHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/JAXBHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/JSONDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/JSONDocumentTest.java
index 61cf311ec..8e2fe1ffc 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/JSONDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/JSONDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonDatabindTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonDatabindTest.java
index 51ad4dca2..3ab373e19 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonDatabindTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonDatabindTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonHandleTest.java
index 1ced6e506..b085f77dc 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonStreamTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonStreamTest.java
index 6bd5524d3..fa48bd60e 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonStreamTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/JacksonStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/NamespacesManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/NamespacesManagerTest.java
index 13bbaff76..e09c7727d 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/NamespacesManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/NamespacesManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/PageTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/PageTest.java
index cf9b68ae9..523ce15e2 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/PageTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/PageTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedBase.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedBase.java
index 5dc9ce39a..f5bb33263 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedBase.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedTest.java
index 64c2fb78f..2e3c8943d 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/PlanGeneratedTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/PojoFacadeTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/PojoFacadeTest.java
index bf17caa45..93e362338 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/PojoFacadeTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/PojoFacadeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryByExampleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryByExampleTest.java
index 1fa80ed62..dd02ebfbe 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryByExampleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryByExampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsListHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsListHandleTest.java
index f61d6d556..2ce323eac 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsListHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsListHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsManagerTest.java
index f76aeefbd..db00e4c06 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/QueryOptionsManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/RawCtsQueryDefinitionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/RawCtsQueryDefinitionTest.java
index bdeb87ff0..b9535b3e9 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/RawCtsQueryDefinitionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/RawCtsQueryDefinitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/RawQueryDefinitionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/RawQueryDefinitionTest.java
index b23a8b4ae..1e24eca29 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/RawQueryDefinitionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/RawQueryDefinitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/RequestLoggerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/RequestLoggerTest.java
index a9bbd7036..88705e4d9 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/RequestLoggerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/RequestLoggerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceExtensionsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceExtensionsTest.java
index 7d1b9a746..62a3b4bf0 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceExtensionsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceExtensionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceServicesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceServicesTest.java
index 8b679238b..5cc3bf9d4 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceServicesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ResourceServicesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/RowManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/RowManagerTest.java
index 7b9a83d8e..ab55d8ff5 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/RowManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/RowManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/RowRecordTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/RowRecordTest.java
index 9a64b9028..664226f84 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/RowRecordTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/RowRecordTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLManagerTest.java
index 991607bc7..3234f70e5 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryDefinitionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryDefinitionTest.java
index 93f1d52a1..d72e651ab 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryDefinitionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryDefinitionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryManagerImplTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryManagerImplTest.java
index f4fa66556..944611379 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryManagerImplTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SPARQLQueryManagerImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SSLTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SSLTest.java
index 0d6b521ae..41c83d14d 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SSLTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SSLTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SearchFacetTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SearchFacetTest.java
index ed3be1d22..518597781 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SearchFacetTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SearchFacetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java
index 047068cdc..6304507ef 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ServerConfigurationManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ServerConfigurationManagerTest.java
index 0c352f662..eb2f64747 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ServerConfigurationManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ServerConfigurationManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/StringSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/StringSearchTest.java
index 517cf9dc3..b3513cc0c 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/StringSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/StringSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredQueryBuilderTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredQueryBuilderTest.java
index d07f264ae..e27286e88 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredQueryBuilderTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredSearchTest.java
index cbbf78ebb..ceaaee4d6 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/StructuredSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/SuggestTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/SuggestTest.java
index d0be0e560..e64b58727 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/SuggestTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/SuggestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/TextDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/TextDocumentTest.java
index abf855fa1..6c1bac6fc 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/TextDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/TextDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/TimeTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/TimeTest.java
index dcf1064e6..69dc2aa2e 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/TimeTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/TimeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformExtensionsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformExtensionsTest.java
index c4593f73d..e17cd6456 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformExtensionsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformExtensionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformTest.java
index 7559a88ff..7cc69428b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/TransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/TuplesHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/TuplesHandleTest.java
index 8bf1f5203..dde6b5d76 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/TuplesHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/TuplesHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ValueConverterTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ValueConverterTest.java
index e1b311896..aa46a7053 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ValueConverterTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ValueConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/ValuesHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/ValuesHandleTest.java
index 8610164c5..87cc0cfe7 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/ValuesHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/ValuesHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/XMLDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/XMLDocumentTest.java
index 879fba2bc..7ee1e8f94 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/XMLDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/XMLDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ApplyTransformTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ApplyTransformTest.java
index 115f48c86..f25197bce 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ApplyTransformTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ApplyTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/DeleteListenerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/DeleteListenerTest.java
index de63c57d0..ab39ed516 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/DeleteListenerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/DeleteListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ExportToWriterListenerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ExportToWriterListenerTest.java
index 8f8af740b..551cf8c29 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ExportToWriterListenerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ExportToWriterListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/FilteredForestConfigTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/FilteredForestConfigTest.java
index 2c6c30b08..4f485766e 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/FilteredForestConfigTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/FilteredForestConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ForestConfigTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ForestConfigTest.java
index 491b93b96..b3ec960d3 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ForestConfigTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ForestConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/JacksonCSVSplitterTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/JacksonCSVSplitterTest.java
index 1ba2b8b1a..881572ce0 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/JacksonCSVSplitterTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/JacksonCSVSplitterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/LegalHoldsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/LegalHoldsTest.java
index 3afb51648..d4e628622 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/LegalHoldsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/LegalHoldsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/PointInTimeQueryTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/PointInTimeQueryTest.java
index 1cac6a17f..5834d0f7b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/PointInTimeQueryTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/PointInTimeQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ProgressListenerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ProgressListenerTest.java
index 1c7621c47..060828028 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ProgressListenerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ProgressListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherImplTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherImplTest.java
index 2b40262a2..6d553a7c7 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherImplTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherIteratorTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherIteratorTest.java
index 10e91910a..ebd1481ec 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherIteratorTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherIteratorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherTest.java
index 50573c763..8f99898c1 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/QueryBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ScenariosTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ScenariosTest.java
index 79354701b..6aaeec5d7 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ScenariosTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ScenariosTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java
index da7a0dc37..45f89a025 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/XMLSplitterTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/XMLSplitterTest.java
index 448da15fe..1cfe403a2 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/XMLSplitterTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/XMLSplitterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/PackageExamplesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/PackageExamplesTest.java
index b498f0f8f..11f71c9f8 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/PackageExamplesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/PackageExamplesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/UrisToWriterListenerExamplesTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/UrisToWriterListenerExamplesTest.java
index 4be93124b..15fd4faeb 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/UrisToWriterListenerExamplesTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/javadocExamples/UrisToWriterListenerExamplesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkIOEndpointTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkIOEndpointTest.java
index 1b84ae69d..a459e4f8c 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkIOEndpointTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkIOEndpointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkInputCallerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkInputCallerTest.java
index fd4f8333f..31b6ea8af 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkInputCallerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkInputCallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerNext.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerNext.java
index f11a3b467..b89c2e2cf 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerNext.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerNext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerTest.java
index 39adefb83..357b80249 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/BulkOutputCallerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOCallerImplTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOCallerImplTest.java
index 22aa8a065..d3f90b604 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOCallerImplTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOCallerImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOTestUtil.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOTestUtil.java
index 1f6bc8799..bcba2494b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOTestUtil.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/IOTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/InputEndpointImplTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/InputEndpointImplTest.java
index c57edcc49..4e2426b82 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/InputEndpointImplTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/InputEndpointImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/OutputEndpointImplTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/OutputEndpointImplTest.java
index cb09a6b27..3eccce871 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/OutputEndpointImplTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/dataservices/OutputEndpointImplTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/document/DocumentWriteOperationTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/document/DocumentWriteOperationTest.java
index 938a86935..542435bf8 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/document/DocumentWriteOperationTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/document/DocumentWriteOperationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ClientCreatorTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ClientCreatorTest.java
index c6b7cdfd2..e6ae7ed4b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ClientCreatorTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ClientCreatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentDeleteTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentDeleteTest.java
index a2281b1b0..a24e0ea23 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentDeleteTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentDeleteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentFormatsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentFormatsTest.java
index 1cedab80d..64b714573 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentFormatsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentFormatsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataReadTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataReadTest.java
index cbe1c8b29..bcea2309a 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataReadTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataReadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataWriteTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataWriteTest.java
index fc6158a18..0b99b3516 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataWriteTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentMetadataWriteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentOutputStreamTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentOutputStreamTest.java
index 62748b827..33f1f3cc3 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentOutputStreamTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentOutputStreamTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTest.java
index bfc8594d5..e9d38d02b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTransformTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTransformTest.java
index 51ad37898..458acaf45 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTransformTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentReadTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteServerURITest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteServerURITest.java
index 7af890e64..e868dd150 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteServerURITest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteServerURITest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTest.java
index d19838765..1b12872e0 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTransformTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTransformTest.java
index cce5b6f8b..c756a8b34 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTransformTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/DocumentWriteTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ExtractRowsViaTemplateTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ExtractRowsViaTemplateTest.java
index 673bd41dc..a639f408a 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ExtractRowsViaTemplateTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ExtractRowsViaTemplateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JAXBDocumentTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JAXBDocumentTest.java
index cfe379ad6..3f60a047f 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JAXBDocumentTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JAXBDocumentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JavascriptExtensionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JavascriptExtensionTest.java
index 902f36501..3821edd87 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JavascriptExtensionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/JavascriptExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/MultiStatementTransactionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/MultiStatementTransactionTest.java
index 0d89fbe44..fa7677cef 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/MultiStatementTransactionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/MultiStatementTransactionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/OptimisticLockingTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/OptimisticLockingTest.java
index 8810605b6..9cea89bee 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/OptimisticLockingTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/OptimisticLockingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/QueryOptionsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/QueryOptionsTest.java
index f2ba7c5e5..23a761aa7 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/QueryOptionsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/QueryOptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawClientAlertTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawClientAlertTest.java
index 7abbac1ce..c50f823a6 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawClientAlertTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawClientAlertTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawCombinedSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawCombinedSearchTest.java
index 6999f249a..f8bf0644f 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawCombinedSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/RawCombinedSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ResourceExtensionTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ResourceExtensionTest.java
index bf3bb930f..51e350ddc 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ResourceExtensionTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/ResourceExtensionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/SearchResponseTransformTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/SearchResponseTransformTest.java
index 5fb568a9b..478255166 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/SearchResponseTransformTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/SearchResponseTransformTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StringSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StringSearchTest.java
index 040aae270..d228c1aca 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StringSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StringSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StructuredSearchTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StructuredSearchTest.java
index fa53a3f77..a0e7d797d 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StructuredSearchTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/StructuredSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/WriteandReadPOJOsTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/WriteandReadPOJOsTest.java
index d210775d2..5f168c20b 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/WriteandReadPOJOsTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/cookbook/WriteandReadPOJOsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/BatchManagerTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/BatchManagerTest.java
index bd37d5e8a..e5d428f1a 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/BatchManagerTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/BatchManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/GraphSPARQLExampleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/GraphSPARQLExampleTest.java
index baa16ebdc..94751122a 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/GraphSPARQLExampleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/GraphSPARQLExampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/OpenCSVBatcherTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/OpenCSVBatcherTest.java
index d8dbc2c40..581306cec 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/OpenCSVBatcherTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/OpenCSVBatcherTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/SearchCollectorTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/SearchCollectorTest.java
index 1b4227873..9f57d590e 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/SearchCollectorTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/extension/SearchCollectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/HTMLCleanerHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/HTMLCleanerHandleTest.java
index 0994d0728..41549d37c 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/HTMLCleanerHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/HTMLCleanerHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/URIHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/URIHandleTest.java
index f17a8e0a1..1ff0da1f5 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/URIHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/example/handle/URIHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/DOM4JHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/DOM4JHandleTest.java
index 3bbaffd66..07a917c18 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/DOM4JHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/DOM4JHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/GSONHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/GSONHandleTest.java
index 238c636df..dccd4b3af 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/GSONHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/GSONHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/JDOMHandleTest.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/JDOMHandleTest.java
index 3d91d0d59..d6a541f88 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/JDOMHandleTest.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/extra/JDOMHandleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Referred.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Referred.java
index 346e6ec1a..015d6d5e8 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Referred.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Referred.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Refers.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Refers.java
index 0b2c034a3..f077f9931 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Refers.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/Refers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/java/com/marklogic/client/test/util/TestServerBootstrapper.java b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/TestServerBootstrapper.java
index 17b629395..966574567 100644
--- a/marklogic-client-api/src/test/java/com/marklogic/client/test/util/TestServerBootstrapper.java
+++ b/marklogic-client-api/src/test/java/com/marklogic/client/test/util/TestServerBootstrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/marklogic-client-api/src/test/resources/bootstrap.xqy b/marklogic-client-api/src/test/resources/bootstrap.xqy
index ec7d71847..27e278dbc 100644
--- a/marklogic-client-api/src/test/resources/bootstrap.xqy
+++ b/marklogic-client-api/src/test/resources/bootstrap.xqy
@@ -1,7 +1,7 @@
 xquery version "1.0-ml";
 
 module namespace bootstrap = "http://marklogic.com/rest-api/resource/bootstrap";
-(: Copyright 2002-2018 Mark Logic Corporation.  All Rights Reserved. :)
+(: Copyright (c) 2018 MarkLogic Corporation :)
 
 import module namespace admin = "http://marklogic.com/xdmp/admin" at "/MarkLogic/admin.xqy";
 import module namespace temporal = "http://marklogic.com/xdmp/temporal" at "/MarkLogic/temporal.xqy";
diff --git a/marklogic-client-api/src/test/resources/data/people.xml b/marklogic-client-api/src/test/resources/data/people.xml
index f57515232..4d29f3290 100644
--- a/marklogic-client-api/src/test/resources/data/people.xml
+++ b/marklogic-client-api/src/test/resources/data/people.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2020 MarkLogic Corporation
+ Copyright (c) 2020 MarkLogic Corporation
 
  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/marklogic-client-api/src/test/resources/search.xsd b/marklogic-client-api/src/test/resources/search.xsd
index c7166420a..6b6b73c49 100644
--- a/marklogic-client-api/src/test/resources/search.xsd
+++ b/marklogic-client-api/src/test/resources/search.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2002-2019 MarkLogic Corporation.  All Rights Reserved. -->
+<!-- Copyright (c) 2019 MarkLogic Corporation -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://marklogic.com/appservices/search" xmlns:search="http://marklogic.com/appservices/search">
   <!-- Root element -->
   <xs:complexType name="OptionsType">
diff --git a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnclassgen.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnclassgen.kt
index bccf8fb2b..10c9cde36 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnclassgen.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnclassgen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnmodinit.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnmodinit.kt
index 106ff9f2b..931901b1e 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnmodinit.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/fnmodinit.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesConfig.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesConfig.kt
index d13e98e51..d737bc6ee 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesConfig.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesGenTask.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesGenTask.kt
index 778509821..30c9abb8e 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesGenTask.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/EndpointProxiesGenTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ModuleInitTask.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ModuleInitTask.kt
index b60ce2114..b2d998533 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ModuleInitTask.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ModuleInitTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ServiceCompareTask.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ServiceCompareTask.kt
index eefb5864d..49ca9005e 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ServiceCompareTask.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ServiceCompareTask.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ToolsPlugin.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ToolsPlugin.kt
index ff2e0d253..73e2b6fe2 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ToolsPlugin.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/gradle/ToolsPlugin.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt
index fe904a1c8..53f6057e0 100644
--- a/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt
+++ b/ml-development-tools/src/main/kotlin/com/marklogic/client/tools/proxy/Generator.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/main/resources/META-INF/gradle-plugins/com.marklogic.ml-development-tools.properties b/ml-development-tools/src/main/resources/META-INF/gradle-plugins/com.marklogic.ml-development-tools.properties
index f4099f436..af5fbd734 100644
--- a/ml-development-tools/src/main/resources/META-INF/gradle-plugins/com.marklogic.ml-development-tools.properties
+++ b/ml-development-tools/src/main/resources/META-INF/gradle-plugins/com.marklogic.ml-development-tools.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2019 MarkLogic Corporation
+# Copyright (c) 2019 MarkLogic Corporation
 #
 # 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/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorBaseBundleTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorBaseBundleTest.java
index 405ed9d91..b65431261 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorBaseBundleTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorBaseBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorCustomBundleTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorCustomBundleTest.java
index 0b5b1bbda..9f3cc1eaf 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorCustomBundleTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DecoratorCustomBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DescribedBundleTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DescribedBundleTest.java
index b5652e68d..51b3c2b00 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DescribedBundleTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/DescribedBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/MimetypeBundleTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/MimetypeBundleTest.java
index 48f4f99a8..19080dbf9 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/MimetypeBundleTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/MimetypeBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/SessionsBundleTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/SessionsBundleTest.java
index 4be2e625e..364ac1b9c 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/SessionsBundleTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/positive/SessionsBundleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/EndpointProxiesGenTaskTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/EndpointProxiesGenTaskTest.java
index 41d718f01..fb1b9d39a 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/EndpointProxiesGenTaskTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/EndpointProxiesGenTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/GradleTestUtil.java b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/GradleTestUtil.java
index a6760f16f..4459a3b59 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/GradleTestUtil.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/GradleTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ModuleInitTaskTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ModuleInitTaskTest.java
index a0b74b6dd..851009e6d 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ModuleInitTaskTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ModuleInitTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ServiceCompareTaskTest.java b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ServiceCompareTaskTest.java
index e302190a5..8815623f9 100644
--- a/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ServiceCompareTaskTest.java
+++ b/ml-development-tools/src/test/java/com/marklogic/client/test/gradle/ServiceCompareTaskTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestconf.kt b/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestconf.kt
index 312743d02..23b4745af 100644
--- a/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestconf.kt
+++ b/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestconf.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestgen.kt b/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestgen.kt
index a0c955f1f..5bee33a26 100644
--- a/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestgen.kt
+++ b/ml-development-tools/src/test/kotlin/com/marklogic/client/test/dbfunction/fntestgen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2020 MarkLogic Corporation
  *
  * 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/ml-development-tools/src/test/resources/testInspector.sjs b/ml-development-tools/src/test/resources/testInspector.sjs
index bf78f6472..ab5590a2b 100644
--- a/ml-development-tools/src/test/resources/testInspector.sjs
+++ b/ml-development-tools/src/test/resources/testInspector.sjs
@@ -1,6 +1,6 @@
 'use strict';
 /*
- * Copyright 2018-2019 MarkLogic Corporation
+ * Copyright (c) 2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.