diff --git a/tck/communication-tck/communication-tck-column/pom.xml b/tck/communication-tck/communication-tck-column/pom.xml
index 3913f7323..6a8c261c9 100644
--- a/tck/communication-tck/communication-tck-column/pom.xml
+++ b/tck/communication-tck/communication-tck-column/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnConditionTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnConditionTest.java
index 878c14aeb..ffe8aff95 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnConditionTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnConditionTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnDeleteQueryTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnDeleteQueryTest.java
index 16595451d..27f8306b2 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnDeleteQueryTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnDeleteQueryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnEntityTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnEntityTest.java
index 70a62a34e..bce039006 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnEntityTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnEntityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnParamsTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnParamsTest.java
index a81a890d6..43983ea53 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnParamsTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnParamsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java
index e14052df5..c77b0caaa 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryParserTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryTest.java
index 79f3cf88e..1c92b04e7 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnQueryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnTest.java
index 913b5f3ca..c61c8ca4a 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnsTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnsTest.java
index a938ebe08..71df71740 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnsTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/ColumnsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryBuilderTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryBuilderTest.java
index 1f995e3e5..9864d6334 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryBuilderTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryFluentBuilderTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryFluentBuilderTest.java
index 7d6520625..5240b1b8c 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryFluentBuilderTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/DeleteQueryFluentBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryBuilderTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryBuilderTest.java
index 246f7760f..3bc78dfe2 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryBuilderTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryFluentBuilderTest.java b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryFluentBuilderTest.java
index 3df55cb28..3f0966a00 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryFluentBuilderTest.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/jakarta/nosql/communication/column/SelectQueryFluentBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-column/src/main/java/module-info.java b/tck/communication-tck/communication-tck-column/src/main/java/module-info.java
index 3cd6f3d61..518423ae5 100644
--- a/tck/communication-tck/communication-tck-column/src/main/java/module-info.java
+++ b/tck/communication-tck/communication-tck-column/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/pom.xml b/tck/communication-tck/communication-tck-core/pom.xml
index e9e6e7421..5d5a5e4e5 100644
--- a/tck/communication-tck/communication-tck-core/pom.xml
+++ b/tck/communication-tck/communication-tck-core/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ParamValueTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ParamValueTest.java
index d19ea9c68..936ac1a9c 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ParamValueTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ParamValueTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsBuilderTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsBuilderTest.java
index a18a58fec..b159ad7bd 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsBuilderTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsTest.java
index a2ca9b078..17e26ac6d 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SettingsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SortTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SortTest.java
index 8f0acdf49..8948d7621 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SortTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/SortTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueReaderDecoratorTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueReaderDecoratorTest.java
index f82783f47..9e71eb216 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueReaderDecoratorTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueReaderDecoratorTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueTest.java b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueTest.java
index 6a045d9fa..bc2d733cb 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueTest.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/jakarta/nosql/communication/tck/ValueTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-core/src/main/java/module-info.java b/tck/communication-tck/communication-tck-core/src/main/java/module-info.java
index 346a7a4d8..10f64d4c3 100644
--- a/tck/communication-tck/communication-tck-core/src/main/java/module-info.java
+++ b/tck/communication-tck/communication-tck-core/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/pom.xml b/tck/communication-tck/communication-tck-document/pom.xml
index 81b647108..da1ad278e 100644
--- a/tck/communication-tck/communication-tck-document/pom.xml
+++ b/tck/communication-tck/communication-tck-document/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryBuilderTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryBuilderTest.java
index 318d46158..61a8abae5 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryBuilderTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryFluentBuilderTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryFluentBuilderTest.java
index 409959674..ed32f5e69 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryFluentBuilderTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DeleteQueryFluentBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentConditionTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentConditionTest.java
index 7c1537703..1bc0cd527 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentConditionTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentConditionTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentDeleteQueryTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentDeleteQueryTest.java
index ef3e2f657..c069211c0 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentDeleteQueryTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentDeleteQueryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentEntityTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentEntityTest.java
index c772376c1..09f5d7c3a 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentEntityTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentEntityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentParamsTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentParamsTest.java
index 136d80576..1ef0796d4 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentParamsTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentParamsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java
index 186811301..6df9cfb3b 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryParserTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryTest.java
index d41c5466e..10979d356 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentQueryTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentTest.java
index 25f6e2bde..911ecba03 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentsTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentsTest.java
index 75c40d007..9f5bf3452 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentsTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/DocumentsTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryBuilderTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryBuilderTest.java
index 2bdd07e92..0ea8fe58a 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryBuilderTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryFluentBuilderTest.java b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryFluentBuilderTest.java
index 5dd6a6117..54c9a5530 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryFluentBuilderTest.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/jakarta/nosql/communication/tck/document/SelectQueryFluentBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-document/src/main/java/module-info.java b/tck/communication-tck/communication-tck-document/src/main/java/module-info.java
index 0a7cdb40a..21fe5dfe1 100644
--- a/tck/communication-tck/communication-tck-document/src/main/java/module-info.java
+++ b/tck/communication-tck/communication-tck-document/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-key-value/pom.xml b/tck/communication-tck/communication-tck-key-value/pom.xml
index 4f953f8bb..d11bc7016 100644
--- a/tck/communication-tck/communication-tck-key-value/pom.xml
+++ b/tck/communication-tck/communication-tck-key-value/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueEntityTest.java b/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueEntityTest.java
index f77a292db..db84e995a 100644
--- a/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueEntityTest.java
+++ b/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueEntityTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java b/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java
index a0ec65374..4ec783ceb 100644
--- a/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java
+++ b/tck/communication-tck/communication-tck-key-value/src/main/java/jakarta/nosql/communication/tck/keyvalue/KeyValueQueryParserTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/communication-tck-key-value/src/main/java/module-info.java b/tck/communication-tck/communication-tck-key-value/src/main/java/module-info.java
index ecd7ec8f7..bdb8df2ac 100644
--- a/tck/communication-tck/communication-tck-key-value/src/main/java/module-info.java
+++ b/tck/communication-tck/communication-tck-key-value/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/communication-tck/pom.xml b/tck/communication-tck/pom.xml
index 65bdaa68f..2eae528f5 100644
--- a/tck/communication-tck/pom.xml
+++ b/tck/communication-tck/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/pom.xml b/tck/driver-tck/driver-tck-column/pom.xml
index 9c31326da..bf9f97e4a 100644
--- a/tck/driver-tck/driver-tck-column/pom.xml
+++ b/tck/driver-tck/driver-tck-column/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgument.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgument.java
index 16dcd8cb1..2c4bc6b2c 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgument.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgument.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgumentProvider.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgumentProvider.java
index a0b4caa9b..654cd68c8 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgumentProvider.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnArgumentProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnConfigurationTest.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnConfigurationTest.java
index b5e0ae8ae..067f6948c 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnConfigurationTest.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnDriverException.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnDriverException.java
index c23f6d297..7c3cd3739 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnDriverException.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnDriverException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java
index 1efb19d45..ea1be016a 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerTest.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerTest.java
index 4bb0282a1..706b6c67f 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerTest.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnFamilyManagerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnSource.java b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnSource.java
index 5b7033afd..ea3c756cd 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnSource.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/jakarta/nosql/tck/communication/driver/column/ColumnSource.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-column/src/main/java/module-info.java b/tck/driver-tck/driver-tck-column/src/main/java/module-info.java
index 4a54ceaf2..d9b63c360 100644
--- a/tck/driver-tck/driver-tck-column/src/main/java/module-info.java
+++ b/tck/driver-tck/driver-tck-column/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/pom.xml b/tck/driver-tck/driver-tck-document/pom.xml
index a858b4587..188e84f67 100644
--- a/tck/driver-tck/driver-tck-document/pom.xml
+++ b/tck/driver-tck/driver-tck-document/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgument.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgument.java
index 0fcdf394a..1010e9555 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgument.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgument.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgumentProvider.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgumentProvider.java
index f3842ab5e..2df299e59 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgumentProvider.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentArgumentProvider.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java
index e7e2d9425..2a92c9ed6 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerTest.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerTest.java
index 79f8ca008..ab7b74460 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerTest.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentCollectionManagerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentConfigurationTest.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentConfigurationTest.java
index 26af519bc..6183433dc 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentConfigurationTest.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentDriverException.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentDriverException.java
index e7cab5f5f..ebb4e0406 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentDriverException.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentDriverException.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentSource.java b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentSource.java
index 0c51d1ff5..4f0103cc4 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentSource.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/jakarta/nosql/tck/communication/driver/document/DocumentSource.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-document/src/main/java/module-info.java b/tck/driver-tck/driver-tck-document/src/main/java/module-info.java
index 3e2f1a36f..2fec6bf1e 100644
--- a/tck/driver-tck/driver-tck-document/src/main/java/module-info.java
+++ b/tck/driver-tck/driver-tck-document/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/pom.xml b/tck/driver-tck/driver-tck-key-value/pom.xml
index ac245ce81..5dbb5b3f8 100644
--- a/tck/driver-tck/driver-tck-key-value/pom.xml
+++ b/tck/driver-tck/driver-tck-key-value/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerSupplier.java b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerSupplier.java
index 9fd0100fd..35449af68 100644
--- a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerSupplier.java
+++ b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerSupplier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerTest.java b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerTest.java
index b2bddb3a1..9cc91ff13 100644
--- a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerTest.java
+++ b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/BucketManagerTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/KeyValueConfigurationTest.java b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/KeyValueConfigurationTest.java
index 910199405..90e43a8ce 100644
--- a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/KeyValueConfigurationTest.java
+++ b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/KeyValueConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/User.java b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/User.java
index 9f86ea0e9..66a547aee 100644
--- a/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/User.java
+++ b/tck/driver-tck/driver-tck-key-value/src/main/java/jakarta/nosql/tck/communication/driver/keyvalue/User.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2020 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/driver-tck-key-value/src/main/java/module-info.java b/tck/driver-tck/driver-tck-key-value/src/main/java/module-info.java
index cfca58f37..52008ccf8 100644
--- a/tck/driver-tck/driver-tck-key-value/src/main/java/module-info.java
+++ b/tck/driver-tck/driver-tck-key-value/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Otavio Santana and others
+ *  Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  *  This program and the accompanying materials are made available under the
  *  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/driver-tck/pom.xml b/tck/driver-tck/pom.xml
index 9b0af3c6d..eeafc41e6 100644
--- a/tck/driver-tck/pom.xml
+++ b/tck/driver-tck/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at
diff --git a/tck/mapping-tck/mapping-tck-column/pom.xml b/tck/mapping-tck/mapping-tck-column/pom.xml
index d9b0e9f39..0a6f4f007 100644
--- a/tck/mapping-tck/mapping-tck-column/pom.xml
+++ b/tck/mapping-tck/mapping-tck-column/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterConstructorTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterConstructorTest.java
index 860dc9854..470c3d148 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterConstructorTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterInheritanceTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterInheritanceTest.java
index e7af21abf..6c5377c7d 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterInheritanceTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterInheritanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterTest.java
index 5c863e8f8..ef6845163 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnEntityConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperDeleteBuilderTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperDeleteBuilderTest.java
index 674092a3b..18a933541 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperDeleteBuilderTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperDeleteBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperSelectBuilderTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperSelectBuilderTest.java
index 65986eac2..e5c7ffd37 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperSelectBuilderTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnMapperSelectBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryMapperBuilderTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryMapperBuilderTest.java
index 27de087f5..c7df15fc5 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryMapperBuilderTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryMapperBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryPaginationTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryPaginationTest.java
index 7cbaa0a97..3d5a31b59 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryPaginationTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnQueryPaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryPaginationTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryPaginationTest.java
index 734769e20..508fc4def 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryPaginationTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryPaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryProducerTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryProducerTest.java
index 225dc72a9..fe8472a49 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositorySortTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositorySortTest.java
index b106e13ba..47bca59a8 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositorySortTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositorySortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryTest.java
index 8919e21a8..518af8329 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnRepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnTemplateProducerTest.java b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnTemplateProducerTest.java
index da0ca755f..9102ff30c 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnTemplateProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/jakarta/nosql/tck/mapping/column/ColumnTemplateProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-column/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-column/src/main/java/module-info.java
index 7d1f2468e..d2567f102 100644
--- a/tck/mapping-tck/mapping-tck-column/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-column/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-core/pom.xml b/tck/mapping-tck/mapping-tck-core/pom.xml
index fcdfdc758..959c5e406 100644
--- a/tck/mapping-tck/mapping-tck-core/pom.xml
+++ b/tck/mapping-tck/mapping-tck-core/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/PaginationTest.java b/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/PaginationTest.java
index a2b295a0a..44c462b10 100644
--- a/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/PaginationTest.java
+++ b/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/PaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/SortsTest.java b/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/SortsTest.java
index e66236763..4f70d196d 100644
--- a/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/SortsTest.java
+++ b/tck/mapping-tck/mapping-tck-core/src/main/java/jakarta/nosql/tck/mapping/SortsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-core/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-core/src/main/java/module-info.java
index ae3c6b42f..0ce1cba18 100644
--- a/tck/mapping-tck/mapping-tck-core/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-core/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/pom.xml b/tck/mapping-tck/mapping-tck-document/pom.xml
index f72fbcfa3..ac198a2f6 100644
--- a/tck/mapping-tck/mapping-tck-document/pom.xml
+++ b/tck/mapping-tck/mapping-tck-document/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterConstructorTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterConstructorTest.java
index 893b798f5..75b465007 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterConstructorTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterConstructorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterInheritanceTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterInheritanceTest.java
index 7470ac897..48c75ed28 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterInheritanceTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterInheritanceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterTest.java
index 06047ccf0..31aef6310 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentEntityConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperDeleteBuilderTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperDeleteBuilderTest.java
index f94cf1efe..7c76b72be 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperDeleteBuilderTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperDeleteBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperSelectBuilderTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperSelectBuilderTest.java
index b29ae5394..ac1f8d7ab 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperSelectBuilderTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentMapperSelectBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentQueryMapperTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentQueryMapperTest.java
index 67ea69d36..62fbf134d 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentQueryMapperTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentQueryMapperTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryPaginationTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryPaginationTest.java
index 7a7611807..64bec884f 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryPaginationTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryPaginationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryProducerTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryProducerTest.java
index 9f3d7be2e..98dc642a6 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositorySortTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositorySortTest.java
index 45eade5e1..ccec8660f 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositorySortTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositorySortTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryTest.java
index 31625d1eb..dd517fb55 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentRepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentTemplateProducerTest.java b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentTemplateProducerTest.java
index 1e679a3c6..d9ca3e815 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentTemplateProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/jakarta/nosql/tck/mapping/document/DocumentTemplateProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-document/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-document/src/main/java/module-info.java
index 954ad7a56..14f435e5c 100644
--- a/tck/mapping-tck/mapping-tck-document/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-document/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/pom.xml b/tck/mapping-tck/mapping-tck-entities/pom.xml
index 53df37b86..fd521da3a 100644
--- a/tck/mapping-tck/mapping-tck-entities/pom.xml
+++ b/tck/mapping-tck/mapping-tck-entities/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Actor.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Actor.java
index e660a2016..7427eb337 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Actor.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Actor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ActorBuilder.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ActorBuilder.java
index e4d0a7047..3a0a71ecb 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ActorBuilder.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ActorBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Address.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Address.java
index 4ecfe2820..b49375a4c 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Address.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Animal.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Animal.java
index 8f209fd46..302b128c2 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Animal.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Animal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/AppointmentBook.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/AppointmentBook.java
index b019ddc06..7896fab3f 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/AppointmentBook.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/AppointmentBook.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Book.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Book.java
index eb4cb52af..37201d2df 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Book.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Book.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/BookRepository.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/BookRepository.java
index 0af42b425..736e8fbab 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/BookRepository.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/BookRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Car.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Car.java
index 16606242c..0d8faea87 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Car.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Car.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Contact.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Contact.java
index fbddce51c..b94797378 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Contact.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Contact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ContactType.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ContactType.java
index cb9be657c..16c65b5f1 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ContactType.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ContactType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Director.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Director.java
index 8a0940bdc..626f79d76 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Director.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Director.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Download.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Download.java
index da8bf8660..dc3c84ca3 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Download.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Download.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/IgnoreRepository.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/IgnoreRepository.java
index 4c57ddb9d..2de38f2ca 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/IgnoreRepository.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/IgnoreRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Job.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Job.java
index ca08e4068..42958d697 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Job.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Job.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Machine.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Machine.java
index d9634aea2..1db83b0c3 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Machine.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Machine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Money.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Money.java
index 134a22f82..8aec120ec 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Money.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Money.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/MoneyConverter.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/MoneyConverter.java
index 050691875..aa469b0c1 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/MoneyConverter.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/MoneyConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Movie.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Movie.java
index 1771c1542..9563f4f36 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Movie.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Movie.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/NoConstructorEntity.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/NoConstructorEntity.java
index dd44d1e7d..daf6f2ed0 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/NoConstructorEntity.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/NoConstructorEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Person.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Person.java
index c1cf3b1e6..e3b5a97ff 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Person.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonBuilder.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonBuilder.java
index 095d1c9ba..9f3c60624 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonBuilder.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonIgnoreRepository.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonIgnoreRepository.java
index 2ecf60064..8be59ba44 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonIgnoreRepository.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonIgnoreRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonRepository.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonRepository.java
index 73b24a83d..fd898e37f 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonRepository.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Plate.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Plate.java
index f796e0ce3..b38223bd0 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Plate.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Plate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PlateConverter.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PlateConverter.java
index b63e9a6e2..218e598fb 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PlateConverter.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/PlateConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/User.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/User.java
index d7bea2c9e..75c6811c9 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/User.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/UserRepository.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/UserRepository.java
index aae83fae0..aecced25e 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/UserRepository.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/UserRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Vendor.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Vendor.java
index cacff3a03..d83d51e52 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Vendor.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Vendor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Worker.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Worker.java
index 144ab9e6a..d17f780a4 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Worker.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/Worker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/WrongEntity.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/WrongEntity.java
index 2a44b3b59..ccd98cfcf 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/WrongEntity.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/WrongEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ZipCode.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ZipCode.java
index 1a9be6da0..af7aa287e 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ZipCode.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/ZipCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/BookUser.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/BookUser.java
index 31ff038bd..fd183590b 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/BookUser.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/BookUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/Computer.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/Computer.java
index 8281ae5db..17e86affb 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/Computer.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/Computer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/PetOwner.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/PetOwner.java
index a8a4e805b..8c06a1b95 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/PetOwner.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/constructor/PetOwner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/EmailNotification.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/EmailNotification.java
index a2591e04c..c29dde746 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/EmailNotification.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/EmailNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/LargeProject.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/LargeProject.java
index 7f24458a5..28f1b231f 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/LargeProject.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/LargeProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Notification.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Notification.java
index fcb0700c0..fa2029ebe 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Notification.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Notification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/NotificationReader.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/NotificationReader.java
index 969c99f17..6134439b0 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/NotificationReader.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/NotificationReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Project.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Project.java
index ce9c08224..8db5dfc8f 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Project.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/ProjectManager.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/ProjectManager.java
index d319d7e9f..3345fcfec 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/ProjectManager.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/ProjectManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmallProject.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmallProject.java
index a0defe045..07a68a916 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmallProject.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmallProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmsNotification.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmsNotification.java
index bdbfc8fc7..00e86668a 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmsNotification.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SmsNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SocialMediaNotification.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SocialMediaNotification.java
index 96484a316..819977767 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SocialMediaNotification.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/jakarta/nosql/tck/entities/inheritance/SocialMediaNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-entities/src/main/java/module-info.java
index 0e6298e50..684dab816 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-entities/src/main/resources/META-INF/beans.xml b/tck/mapping-tck/mapping-tck-entities/src/main/resources/META-INF/beans.xml
index e10152ccf..67b06e8bd 100644
--- a/tck/mapping-tck/mapping-tck-entities/src/main/resources/META-INF/beans.xml
+++ b/tck/mapping-tck/mapping-tck-entities/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/pom.xml b/tck/mapping-tck/mapping-tck-key-value/pom.xml
index 6f94c734f..f2792e39d 100644
--- a/tck/mapping-tck/mapping-tck-key-value/pom.xml
+++ b/tck/mapping-tck/mapping-tck-key-value/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueEntityConverterTest.java b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueEntityConverterTest.java
index 8f5077c17..fd52ce4f1 100644
--- a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueEntityConverterTest.java
+++ b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueEntityConverterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryProducerTest.java b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryProducerTest.java
index 86163dfe7..249f2e0d1 100644
--- a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryTest.java b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryTest.java
index 15bccd07e..bff165411 100644
--- a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryTest.java
+++ b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueRepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueTemplateProducerTest.java b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueTemplateProducerTest.java
index 931f51b1b..0145e35b6 100644
--- a/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueTemplateProducerTest.java
+++ b/tck/mapping-tck/mapping-tck-key-value/src/main/java/jakarta/nosql/tck/mapping/keyvalue/KeyValueTemplateProducerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-key-value/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-key-value/src/main/java/module-info.java
index eacb740e7..1a79a9cda 100644
--- a/tck/mapping-tck/mapping-tck-key-value/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-key-value/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/pom.xml b/tck/mapping-tck/mapping-tck-test/pom.xml
index ae9c0513d..c5b410f86 100644
--- a/tck/mapping-tck/mapping-tck-test/pom.xml
+++ b/tck/mapping-tck/mapping-tck-test/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/AnnotationUtils.java b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/AnnotationUtils.java
index cb91c67e5..e264a1f72 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/AnnotationUtils.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/AnnotationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIExtension.java b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIExtension.java
index bfc1d56c3..330d6c93e 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIExtension.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIJUnitExtension.java b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIJUnitExtension.java
index b1276abd3..773166ec3 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIJUnitExtension.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/CDIJUnitExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/ContainerSupplier.java b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/ContainerSupplier.java
index b0d887acb..1c14b501c 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/ContainerSupplier.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/ContainerSupplier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/Preconditions.java b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/Preconditions.java
index 535e18a38..af554f09f 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/Preconditions.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/jakarta/nosql/tck/test/Preconditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/java/module-info.java b/tck/mapping-tck/mapping-tck-test/src/main/java/module-info.java
index 16b47b9ba..7cf68e350 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/java/module-info.java
+++ b/tck/mapping-tck/mapping-tck-test/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Otavio Santana and others
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
  * http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/mapping-tck-test/src/main/resources/META-INF/beans.xml b/tck/mapping-tck/mapping-tck-test/src/main/resources/META-INF/beans.xml
index e10152ccf..67b06e8bd 100644
--- a/tck/mapping-tck/mapping-tck-test/src/main/resources/META-INF/beans.xml
+++ b/tck/mapping-tck/mapping-tck-test/src/main/resources/META-INF/beans.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/mapping-tck/pom.xml b/tck/mapping-tck/pom.xml
index d0b27a6f5..77769b028 100644
--- a/tck/mapping-tck/pom.xml
+++ b/tck/mapping-tck/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020 Otavio Santana and others
+  ~ Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~ This program and the accompanying materials are made available under the
   ~ terms of the Eclipse Public License v. 2.0 which is available at
   ~ http://www.eclipse.org/legal/epl-2.0.
diff --git a/tck/pom.xml b/tck/pom.xml
index 3c9d8a10e..ba0502bb4 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~  Copyright (c) 2020 Otavio Santana and others
+  ~  Copyright (c) 2022 Contributors to the Eclipse Foundation
   ~
   ~  This program and the accompanying materials are made available under the
   ~  terms of the Eclipse Public License v. 2.0 which is available at