diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Application.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Application.java
index dc7537a975500b4d43d046f611a48af22d7bf7e3..261695af65476de92029736d9040d09c9a8158b6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Application.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.lang.reflect.Field;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Command.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Command.java
index 1165d196825aca8877aed6fb086b2aaf2ae87dbb..2dd5651e6449dc56c8c828819f84d864ff31d7f6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Command.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/CommandNotSuccessful.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/CommandNotSuccessful.java
index 0ad0b42cbf202738235beb6c39f359e5bba43d69..363c6b2e4fb83b6480f6360a872ded0c7d9e4f79 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/CommandNotSuccessful.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/CommandNotSuccessful.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Console.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Console.java
index 56c813c0af626ef60e2d4263d7ed7c31efd3fa5b..a5e1e8a6b63ee6607e19e9df5e3f2d5acc87ae67 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Console.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Console.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.io.IOException;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/DataSetSearchCommandBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/DataSetSearchCommandBuilder.java
index c6e4ad99f027e2e6820cb0d8962f9d932dc591ce..f8e3fa648d378ee71f164c5d6175a3fe38b0aa92 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/DataSetSearchCommandBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/DataSetSearchCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/GeneralBatchImportFileBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/GeneralBatchImportFileBuilder.java
index 322aad018d8764abb8212e7493ab1aa1e3506f5f..e3a3cd79cb67a8fba24ecd1ff363b239f70dad23 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/GeneralBatchImportFileBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/GeneralBatchImportFileBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.type.Builder;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/IdentifiedBy.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/IdentifiedBy.java
index 932c130c7af162f65772eee9da999a62cfaf1186..500a1af8f85ddd6ba738ccbe63f636005ef4379f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/IdentifiedBy.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/IdentifiedBy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import ch.systemsx.cisd.openbis.uitest.type.Sample;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Inject.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Inject.java
index 63356246533c8517c15697a2357e417c0d0c0c56..b80f1b18a2d2a350368b0778f67ab4db036a49eb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Inject.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Inject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.lang.annotation.ElementType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/MaterialSearchCommandBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/MaterialSearchCommandBuilder.java
index 2f1159873966b412b05a8492025fe8b48f72c21c..b1f041ee92664cf371868adcc47f0c47a4c10f45 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/MaterialSearchCommandBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/MaterialSearchCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SampleSearchCommandBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SampleSearchCommandBuilder.java
index 0d2b814d23acf9b44ce162e4fadfd85eaa24f089..334894dddb6016d6c2bf38fcdb08757bb5f904b0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SampleSearchCommandBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SampleSearchCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SearchCommandBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SearchCommandBuilder.java
index 3800b1aec4cafc985bfbe76eafa989883b213826..fb687bbe35fd3589019c26648004e44545e03713 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SearchCommandBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SearchCommandBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SeleniumTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SeleniumTest.java
index 387797f6a1f1010b994f414932d61c9f4dcb98bc..8e9deeaf8999ecf0d8c3ad6056971cf963f3547d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SeleniumTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/SeleniumTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import static org.hamcrest.CoreMatchers.not;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartApplicationServer.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartApplicationServer.java
index ddaf02531f9454b21c1d946d9a9a7eba39092baf..3c3e961e88be1b6486105c49658473a0c45c963a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartApplicationServer.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartApplicationServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.io.BufferedReader;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartDataStoreServer.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartDataStoreServer.java
index 65aa81fcca376a8b0bdd38ded9f4f809c310393c..50e9dff96ea6d0fe02ed89707fc5731d1af48b6d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartDataStoreServer.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/StartDataStoreServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 import java.io.BufferedReader;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Ui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Ui.java
index 36b8e731587384dc87d0280450d18f2469d2d4b9..a99926157131ed8a4bc802e33e93e143b2f9c535 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Ui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/Ui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CellContentMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CellContentMatcher.java
index 664cb70a8c3fd0464fec1f7cdab56da7c37162c4..8fb5c98be9b3ee0df5f544d82c649e7ccbfcddcd 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CellContentMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CellContentMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import org.hamcrest.Description;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsExactlyMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsExactlyMatcher.java
index 80814651983560276d4b8696d4bd83c915fb4030..7a61dbf5357bf655cccc46cbe8e735576fa88be7 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsExactlyMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsExactlyMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsMatcher.java
index 53816bbab32b95a2b763ff2dae0d851a09a29155..49a3fd5dcf56e76b655a897318ff2e04c18a9907 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CollectionContainsMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CurrentPageMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CurrentPageMatcher.java
index 85b0db7db182723ad696eb69a4c02b4737ce69cf..168564654af821ebdf1e72d15ef71c63bd3be84e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CurrentPageMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/CurrentPageMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import org.hamcrest.Description;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RegisterSampleFormContainsInputsForPropertiesMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RegisterSampleFormContainsInputsForPropertiesMatcher.java
index b152256eab89f540492290ef2ed8a1f8453920a2..8167318ac850e6403589225c080dc049e96a9b6d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RegisterSampleFormContainsInputsForPropertiesMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RegisterSampleFormContainsInputsForPropertiesMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RowExistsMatcher.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RowExistsMatcher.java
index fdde4146ecb9c42ed82939fbc25e602c43ab2ca4..8cd5542dd7cc1a7e17631641d415619e9bc0fd40 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RowExistsMatcher.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/matcher/RowExistsMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.matcher;
 
 import org.hamcrest.Description;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/Builder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/Builder.java
index 5abcb5e01c4fb4d9aae6861065ddef7a59be029d..56f492bc0437aa65f4b420e1c6d829b3a098ddea 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/Builder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/Builder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetBuilder.java
index f7a76f9a45efaa118a0ef576faa17a404b18a1c2..b310d0a96f6509bf8a1fe3a1398d810fb737501d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetDsl.java
index f09dddc1e00d2c3c2cbf2d946e7d68a7d7d554a4..a9b134b03f2e87131c3dd19c239227458b21f9ff 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetPropertyTypeAssignmentBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetPropertyTypeAssignmentBuilder.java
index 1c9042f83e7630311b45880bca01a7bdb3c03b51..14486a3181c1fed9318e1567b16ecaba47d8cc82 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetPropertyTypeAssignmentBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetPropertyTypeAssignmentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeBuilder.java
index 870a4c809b96ff544a3f8fd5203aaba685af80a6..817cc026f9fc514c9653011b0c2325dcd4557a7b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeDsl.java
index 5fdcdac2982e9549066dcb5ed50477c55e97dbae..dd2c1665568ea8511a6a5e3848b9683f230b599e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/DataSetTypeDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentBuilder.java
index 35b1fe729d3b7fa83490c6c90d5f6e3a458957a3..d09be45a382f3214be9c62de3f264c6439ee6568 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentDsl.java
index 882f93186e0611239bb54ba83dff380c09bbf717..44d426d0c1977bb3f264efa9dc4c6f1cde9170f4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeBuilder.java
index 25e0d3d8cd882bcd1559f9bb072f98c71171b63c..10b9b483284a901339c9c4a7ee6efd095e98b0c7 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeDsl.java
index 3b0e200b831e59af3e61e6f03069a8c5b79eb612..c512b556b8d77029e6adb34fd7375224ef5a5c8f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ExperimentTypeDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.ExperimentType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialBuilder.java
index 27f7eb4cc7b856edfdd353a548d20fd93ca76061..7497cc12362404e05846f147ddf972df2ff5fc6d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialDsl.java
index 18b2a87ffbe0eddf9bfe2c1648424589f547e760..53ea2ffecdd9471ee38713a672197f61bac272cc 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeBuilder.java
index bef16485e5391b9b8ff1743e66aa8ba9a0f5c1ad..e3200b39a6eafb4954b543befdd27f52392d899e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeDsl.java
index 1e387878144d5af07a99503d73564315cba662b4..d3efede6e82a6034f85019cc7ce601b942e8e0f9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MaterialTypeDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.MaterialType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectBuilder.java
index 7465be7360db84192d8072af6cb49008c0e46f5d..d3d6316651b2b7fcdc090111a8e39c5958bb0032 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectDsl.java
index f63ac5100a47106ccbb05e50078a7338d42b5f7c..53fda7cd573680584447bdbbe3f1691c5261681a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/MetaProjectDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.MetaProject;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectBuilder.java
index cad815c704f7202104882d7e862405ebf49c0e16..c37f75c106951194ce567caaba8c912bc906ed9e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectDsl.java
index aa28c37e5d43ac0604a402a352a7cbc872d8205b..97aa33c4b2f13ecbf405378254a345949ee7546c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ProjectDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.Project;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeAssignmentDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeAssignmentDsl.java
index 6a9681da7da8b2a3db69b730168ebd3b43ebea99..e7bbef3f4b93f6174f42af2b722ad330a9955b6d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeAssignmentDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeAssignmentDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.EntityType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeBuilder.java
index 5f91bb7f35dab9dcf0847850174601afbaefb003..8e0035b416802d71ea083730913f3a9b54a51d65 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeDsl.java
index 606bc76c035fa4dd46e6e3889e6f6351770908f2..86318175172f5b48d82857f520dd1fa64a0e6940 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/PropertyTypeDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.PropertyType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleBuilder.java
index 9a3d342c9ded4db1bc4407412df4d20d774ec655..2d8e1d1e16a11e099dfb6bcfb829a3945fef8bec 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleDsl.java
index f35403b3dc89bcd2ebe2ff7d3eef095c80a48ff3..de840c9a0fa007c21af887dac9da63aaacd33991 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SamplePropertyTypeAssignmentBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SamplePropertyTypeAssignmentBuilder.java
index 9d0c5bcec4bf15264116abe7acee38eae2a99224..0fc5d4099e0f182dfaa186ff0e3ccccc8f122913 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SamplePropertyTypeAssignmentBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SamplePropertyTypeAssignmentBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeBuilder.java
index ef0d5641275a58bfe416a79fd2bce58a59471c4c..1c9702abab1647dd1d396005206ad507b648e355 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeDsl.java
index b0abfee58ff992dca88c85a647b63fd72b4085d4..af6e79d2388bcd552ee6abcf193417937b31c41c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeUpdateBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeUpdateBuilder.java
index 9d324bb6028ba24d3a4809cbdefe0530dcc70ab8..fb7932394924a52ba211aff135b681dddcf240d8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeUpdateBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleTypeUpdateBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleUpdateBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleUpdateBuilder.java
index 66d52d8ab4f86a1e019b3166caf617e3e6bf9f5a..370908a788f293ccc9a24fdca14382f2549dd63c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleUpdateBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SampleUpdateBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptBuilder.java
index 69b688fa37b2f0032721d96c8ad0cf552dcf4cf8..2243f976ea89ded3f14163432e7a9622cdba9886 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.io.File;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptDsl.java
index 958bf8254b8c15fba8c3b47b5c9f9316af02a6cd..10ae4e74041d0b4115d2f8561bfc8798e2e9709d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/ScriptDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.EntityKind;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceBuilder.java
index 25de21843cf54e02063a7dbf84f21e09aeb517d4..103b6511d12718b649b3f37d95f178efc4d97b9c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.UUID;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceDsl.java
index 0bec690d924aa0a8401f5c2b8352e61ee19c1ac2..1511a20ef106ccda34e0fe7c84f2564dabe91c13 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/SpaceDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.Space;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UpdateBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UpdateBuilder.java
index 491b96b1c30d415a90476e790e49b2637218855d..f11985b1477b3db0c0db3a71ec5615e08405d137 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UpdateBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UpdateBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Application;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserBuilder.java
index c05b76f0b52a91e62562c5479bfb9eb9c034fc96..7da8c10c07f00a8e98eff01f98145c903cbb17ca 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserDsl.java
index 8fa611d8c48b6ddb9bbb2cf3e0c699f3189c67f2..5c988ca141bb0c3d6d9d6a997a681d63a1794a4a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/UserDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import ch.systemsx.cisd.openbis.uitest.type.User;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyBuilder.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyBuilder.java
index 6a828fc538e94d3c1f2ca32ccb6897d9fb00d8c8..5fb5ddff85f37ca58a3d44e592a14257acb43882 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyBuilder.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.HashSet;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyDsl.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyDsl.java
index 97b763021b65b39486db95c99316928eed4d2b14..7e8130f39ccee969c03db4283de7324d824e9201 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyDsl.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/dsl/type/VocabularyDsl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.dsl.type;
 
 import java.util.Set;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateDataSetPropertyTypeAssignmentGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateDataSetPropertyTypeAssignmentGui.java
index b0d4efaf4944dfe117d8587d8aa2d92d5dee5015..6479f64cdf15eb24aa54b74ce89dffeeb9a4ca72 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateDataSetPropertyTypeAssignmentGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateDataSetPropertyTypeAssignmentGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentGui.java
index ce218066e66049cee0626676f55e753d37d16e1c..e32a83f83bb27e88b8f49c2cb52ff2fd286a2d5a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentTypeGui.java
index c40baf596abcbcacd5aed453720c7e934e1bc160..a86d0135d5e32250947db4030ffe4dcc05c2b30e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateExperimentTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateProjectGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateProjectGui.java
index 45291b4cbda52917cfdfb3ba9f6ed63dcbcd86aa..adc1af632cbf13233dd39d90053d40e048fb83ed 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateProjectGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateProjectGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreatePropertyTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreatePropertyTypeGui.java
index cc6cbdd80f2d053ca784409fe5c2d14ae81f55a3..41f733861e9eff2e3f93e0af0c46c444cf45f6e6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreatePropertyTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreatePropertyTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleGui.java
index 38ac3b4723e88539f1ca19455811771a69c3f6da..8151d9d3455a7e2c0467a252bf05154a53d37aa5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSamplePropertyTypeAssignmentGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSamplePropertyTypeAssignmentGui.java
index e737ac9d4fbac215099cc9ac4a72ca1cc84efae8..bf07c6901010b840a5ebba2c0186713b583b9228 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSamplePropertyTypeAssignmentGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSamplePropertyTypeAssignmentGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleTypeGui.java
index f9a2d8816437a2cd4395e174b013bdd7a9b3729a..f25220ee16e90f5517a8b60ac2807c47576655b4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSampleTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateScriptGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateScriptGui.java
index 4a91d4bb6849e55638059d1b583b85e0027379fe..a2d88386d25c3e0f0eb004497be94ecc600af551 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateScriptGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateScriptGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSpaceGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSpaceGui.java
index 1596b47312783c2e2fc87149bd11be6161dfbda8..18810d60d8ea9bb91ed8875baaafa89ad0e38630 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSpaceGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateSpaceGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateVocabularyGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateVocabularyGui.java
index 09da22b1308796c51132bab538f3ebd9ea931e47..de34d6b04be6593807272ae3085797efbbda3649 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateVocabularyGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/CreateVocabularyGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentTypeGui.java
index 2d3d54e4c06b67db6663bacd52211f95e46cb6de..457d92f160e018d9cbdbff0c7d77b986237dae83 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentsOfProjectGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentsOfProjectGui.java
index 288caf7e5559f6ed25cfcc3ff42c3aab96f470be..a2826fde41a56c7e633015d38f801625677cad58 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentsOfProjectGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteExperimentsOfProjectGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteProjectGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteProjectGui.java
index b5170ef452f384536958d373b5267a43084ed6be..4c798e4e1ef3af99144c22d4074151ce16fbb38a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteProjectGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteProjectGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeletePropertyTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeletePropertyTypeGui.java
index bfd038347f944232b216cff298e6271c65bf231a..4ce4eaa9c5880be88aa8323ce5ac9dc1818a4af2 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeletePropertyTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeletePropertyTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleGui.java
index 64a101ac86bdbe5e93f394da2ecc07ad23cf75db..dca29a0a96611923e00242452c31c2e22fabd7fa 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleTypeGui.java
index 744bd3c7e54cc12a5930c5851baee51a22d8f572..b4b8e34ea74d4214ece90c5c7d97aaf1c15987d9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSampleTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSpaceGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSpaceGui.java
index abbe981f2adf73a5a5b4711d74b9cfef06f09fa4..2a7e68cf33b70fac7e72bf1f9940678a6a0a9ee9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSpaceGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteSpaceGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteVocabularyGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteVocabularyGui.java
index a4e80a73d10829cfc16be796ad06b5ae5077f837..7f227b36bcffd41f2264006e22c860e5f35d49ef 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteVocabularyGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/DeleteVocabularyGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/EmptyTrashGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/EmptyTrashGui.java
index 4444c538ed109f982784a00d566f4c16090500ab..ffe6c27f5e3bb63ed3ef3bf544f4b37581cfd9be 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/EmptyTrashGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/EmptyTrashGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/GeneralBatchImportGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/GeneralBatchImportGui.java
index 1343b4f90a2259c71ff5d77a3cb867a57381494c..56fa3802e16bc1a02f1a2d37a2d35c3751855bd0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/GeneralBatchImportGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/GeneralBatchImportGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LoginGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LoginGui.java
index b9705e81f6dba7be79e7f2134b413bcb64985a6e..34e47b850673f297af38ebecdc52439bf3a28423 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LoginGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LoginGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LogoutGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LogoutGui.java
index 3abe9609b12027a4918052a6a23be2064c1ad9d5..32800ccf50bc287e2d644f69fe957481c09a6d4b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LogoutGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/LogoutGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/RegisterSampleBatchGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/RegisterSampleBatchGui.java
index 50ff4579c0a9f387515811168551c9f1d9787aad..510d01e9a51bc7c3ee2c6ed4d0958e81516110e2 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/RegisterSampleBatchGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/RegisterSampleBatchGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import java.io.IOException;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/UpdateSampleTypeGui.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/UpdateSampleTypeGui.java
index 3fa87e99e9c06c51bfbcd7fa7929f4c845da1caf..c030a190b672f53360249df732e3d71151318564 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/UpdateSampleTypeGui.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/gui/UpdateSampleTypeGui.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.gui;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.Command;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/help/StartSystem.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/help/StartSystem.java
index c24749fa734693fce819770881ab398522159718..b4981ca1154570d9ef9c4523cde16400070218ec 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/help/StartSystem.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/help/StartSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.help;
 
 import org.testng.annotations.Test;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddExperimentTypeLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddExperimentTypeLocation.java
index 94781db27190358b73073d4aff1a6a65917ad536..886516d2dfea904063b76f39ae04498706020127 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddExperimentTypeLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddExperimentTypeLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.page.AddExperimentTypeDialog;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddPropertyTypeLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddPropertyTypeLocation.java
index 750678f3a365e23fd8bc3ee294cfd8d933ac4f47..65cdd120ad518433d3cfda7f1211d7f6ae2a1c2d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddPropertyTypeLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddPropertyTypeLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSampleTypeLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSampleTypeLocation.java
index 80b3e2b077d2643edb9c4f55515fd18e8b2b9e6f..3d11ee756d7d03cfee16bd5ecbe768dedda5b534 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSampleTypeLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSampleTypeLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.page.AddSampleTypeDialog;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSpaceDialogLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSpaceDialogLocation.java
index eff9f68956f1046dcf02ee75ece74dbfa4ede89a..19d1402285b6348357d8d9d40a0a7421980e1a09 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSpaceDialogLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddSpaceDialogLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.page.AddSpaceDialog;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddVocabularyLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddVocabularyLocation.java
index 8b9420f278be875a9e0fa7d715caf78f1800409c..ebb3cf12a5d5148328a66de196b54d1db218cf8b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddVocabularyLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AddVocabularyLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.page.AddVocabularyDialog;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignDataSetPropertyLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignDataSetPropertyLocation.java
index c42907729609fba8af21951d5b5bbb38dbde0865..6aaa8c6c7126447dd42f9a2e6ab03f3a7a355587 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignDataSetPropertyLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignDataSetPropertyLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignSamplePropertyLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignSamplePropertyLocation.java
index e1f8dd75db9a42ba811d09e803002f225a4c8d91..cf5bf2f8aa816ea0beb0e6aed9ebaa1ee496c7af 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignSamplePropertyLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/AssignSamplePropertyLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/DataSetTypeBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/DataSetTypeBrowserLocation.java
index eebbb91794f8f834ab01a6284a1937ea3e6fc3b9..6b5575a00dcd04923570519dcb2d97dbe4090a09 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/DataSetTypeBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/DataSetTypeBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentBrowserLocation.java
index 24a85b8a243ddcea54e0964e464ed329442bd48e..8b43521a948b9a1d2d5be14dcc9afa3be883e0e4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.BrowseMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentTypeBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentTypeBrowserLocation.java
index 7366e2dda900f004abf285d7b18a09afd72af61b..367da27477aa29392f4ce87c807bb6b1a8bf0c99 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentTypeBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ExperimentTypeBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/GeneralBatchImportLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/GeneralBatchImportLocation.java
index 985cc4891eea903f1c0764036fa524aba90d7589..a7a5718d0f5ca23e6f44474f7dcd7e0814578682 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/GeneralBatchImportLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/GeneralBatchImportLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.ImportMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/Location.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/Location.java
index 16e8f3c06f1c4030f8a5ad3bac55987a7c9f8266..adc9919c2fc8f3b31702bd032edebfa61e3fdc3f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/Location.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Pages;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ProjectBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ProjectBrowserLocation.java
index f3bf0091673cde9840a9846bb8df0e88c230e744..9059a033e879c2ddfbf886201f3ab7cf23d41842 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ProjectBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ProjectBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.BrowseMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeAssignmentBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeAssignmentBrowserLocation.java
index 488389747ed03410f162eaffc22246acd72e378a..0e5b79bb71a7f558944d23d9f2cbafc89533bd51 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeAssignmentBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeAssignmentBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeBrowserLocation.java
index 69f814467e5358e676d300384b1b3c269b3b16e4..dbdd15ba8560feb83e840b645d076d6dcf165e56 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/PropertyTypeBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterExperimentLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterExperimentLocation.java
index 20ad4598ea31401abb4b7cd3cf0524124e6d7bc1..0c616fa3cd72d94efc84f45cba4c43ede3af21cb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterExperimentLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterExperimentLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.NewMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterProjectLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterProjectLocation.java
index 4f4465f6add6b6e093e09a5815fb55c16a769bb5..45b3a755db00d0263555c0ecfe733d5926693b88 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterProjectLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterProjectLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.NewMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterSampleLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterSampleLocation.java
index 64233806c88f1264671f37b76de24f0c60c152cb..971537351b65492e2b0faeb6b7f6764ed1489033 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterSampleLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterSampleLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.NewMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterScriptLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterScriptLocation.java
index 53967bf6ea1d0443691b893470c71c64555826c6..fc85df853c9449abff08c79f35dacc24fba36820 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterScriptLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/RegisterScriptLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.page.RegisterScript;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBatchRegistrationLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBatchRegistrationLocation.java
index 1e4c39aad8e7460e2617772e100855da03738249..aeebd65e98aa8128f65886e122bc92cff3164b68 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBatchRegistrationLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBatchRegistrationLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.ImportMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBrowserLocation.java
index 481d8e4cd658a1e08efd5bc4d4c608b93215185f..0c59aae00f48123a4e67cc466490dcc6b4c5a93e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.BrowseMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleTypeBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleTypeBrowserLocation.java
index 33a047b326abed423b24d67ae08b6ace84c277c4..f7e01a70a1159eeee3a4710854ef33e50193019d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleTypeBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SampleTypeBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ScriptBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ScriptBrowserLocation.java
index baf4081b2d12f1d7944e903554a6310678b3a7b7..3faccc1211c7722ec41a7b13978cd767b4993761 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ScriptBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/ScriptBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SpaceBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SpaceBrowserLocation.java
index 84bfba905326f96c12d14bec80008caf7196b41c..f78b52fc21eff211423277d65a44d973bd2336ca 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SpaceBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/SpaceBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/TrashLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/TrashLocation.java
index cc59c10cfa243eb10d8030d104ebf044bb6224b5..37a1423fa299bab1e367a85e4342df69f202d0ba 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/TrashLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/TrashLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.TopBar;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/UserSettingsDialogLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/UserSettingsDialogLocation.java
index 53e2d1b04040cd613ce4e94a5cb9785580af3864..fc045b59941f8d27b3505ca58afffa3aefd26523 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/UserSettingsDialogLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/UserSettingsDialogLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.TopBar;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/VocabularyBrowserLocation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/VocabularyBrowserLocation.java
index f18b671a3ee79048240b7ae8b82729427ce7db4b..62cd6c67c57e978d28844e97448f6bc2b67b8414 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/VocabularyBrowserLocation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/layout/VocabularyBrowserLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.layout;
 
 import ch.systemsx.cisd.openbis.uitest.menu.AdminMenu;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/AdminMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/AdminMenu.java
index 24a366388fa0569f37c7f6f159db97df36f89d18..85b5cc7f25877ace97aec6d9de1f0af97bdb2590 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/AdminMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/AdminMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/BrowseMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/BrowseMenu.java
index 442cde649eb00bc1828ffe7e6b6136439f0cc68d..98ffbfac8ef8dfc5a33d96a14c11da974c25bfb1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/BrowseMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/BrowseMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/ImportMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/ImportMenu.java
index 4a26cad83fc12ea030e22fddaaaab2fad2d8d122..ec2c55633df6d7dbc60f76713a3853f27f84325e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/ImportMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/ImportMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/NewMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/NewMenu.java
index cf4ad987a61024a81d46c825d87dcfabdcdab963..970dfb66f19d0b10fd7db70257f52a7a68f540c4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/NewMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/NewMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TabBar.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TabBar.java
index 6d059c74f0189ef76c1b3706db56afbf9c529fab..a78a2355146a3e8729a394441c5839a6dd737b04 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TabBar.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TabBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TopBar.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TopBar.java
index af94563eda7f78581be7801d32b780a43647bee1..a29a8f03529bb07ddb2ac881f35a0acf3ce301e5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TopBar.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/TopBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UserMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UserMenu.java
index 18061d598cddf09f42b82af5aa504949dd2e58db..2dba68173ea1119bbcd3204c2b4e741971543b5b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UserMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UserMenu.java
@@ -1,5 +1,5 @@
 /*
-@ * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UtilitiesMenu.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UtilitiesMenu.java
index 6cd18f9a9caa9017ff276cc791460cc1841cf8c9..f5b04e21bebd9b967c042ae18d79c6466b2df074 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UtilitiesMenu.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/menu/UtilitiesMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.menu;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddExperimentTypeDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddExperimentTypeDialog.java
index c3ac21e85f1f7a50ca02ce7190001fb63221212a..ff2efbcea52477768cec5e84eefc86d54d8aa295 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddExperimentTypeDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddExperimentTypeDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.ExperimentType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddPropertyType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddPropertyType.java
index 8d45c5f2fbd0559e3db5073b9aa0b160af062386..bf357937e8a64013b98328ed3f89b0db11dec41c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddPropertyType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddPropertyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import org.openqa.selenium.By;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleTypeDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleTypeDialog.java
index 57c95c6c5dc8e8393a8ed54ec5d0343e1968cc80..e82d5ecfc3a6154ae1d9a1ad62b6a12d41ff61a3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleTypeDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSampleTypeDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.SampleType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSpaceDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSpaceDialog.java
index 593878b8f76784a7a448d067e4ccec8e2bcb756c..f9d1e1076f61d7e90c00f85d1b26e3f6f3ac768e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSpaceDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddSpaceDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.Space;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddVocabularyDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddVocabularyDialog.java
index 187ba3c5b2e7bd391ec831ca85b5bdd287686424..128bee46b8bd8f522098f82872160c12b2211ec3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddVocabularyDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AddVocabularyDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.Vocabulary;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignDataSetPropertyType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignDataSetPropertyType.java
index 363d65e689265ce5e94f79806c3ef9301dd22925..3339531f85ffd6fd5b4e764635f88e3077c3f950 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignDataSetPropertyType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignDataSetPropertyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.concurrent.TimeUnit;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignSamplePropertyType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignSamplePropertyType.java
index 25f942c93c3f6d11713ef1e2d0a6c1a45ca352d6..826bf50afb18c82ba072f3c0f9785b1396afe6e8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignSamplePropertyType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/AssignSamplePropertyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.concurrent.TimeUnit;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browsable.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browsable.java
index 1c5fe1f9ddaa37af2fecb7ea7fdb205b383031d8..f56fbaab67b4bbe73c1fcaaa43f913e7a8134887 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browsable.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browsable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browser.java
index 583127e918adab39b7b508320fa109b168e10be3..c0a5cf7bac122dcbd22ad99cb8990feb295a42b5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Browser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserCell.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserCell.java
index 23039a0f5ecfe265199c52c7a344b68a4c036cb4..63a7bc35fe7f369e5622f2d7f1795094a659792b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserCell.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserCell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserRow.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserRow.java
index 7a55676e9b00a686f310577545759a884af6bf2b..980a29f8b08aee6e9fda058b80f8f534cdc135ad 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserRow.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/BrowserRow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.HashMap;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/DataSetTypeBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/DataSetTypeBrowser.java
index f35d77ceb9019c533d9eed1457e5b5c926524df6..33e8df013a375b457b4d49bc431372e8ff7acef3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/DataSetTypeBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/DataSetTypeBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/EditSampleTypeDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/EditSampleTypeDialog.java
index 47efcceb786003d1988f05fc7e35f07b3c3204e6..aa65363b4f566e3dc656772dd86ca0a249881d94 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/EditSampleTypeDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/EditSampleTypeDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.SampleType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentBrowser.java
index 58a9bfea0b17abcad910d74948dcc8025303ca7c..877c9be227bb5208ce8f706641e733216baa7988 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.concurrent.TimeUnit;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentTypeBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentTypeBrowser.java
index ae3b6083a33b0849f9685b32e8f322b328a926d4..81662818627d8068fb7fa6f409a672e24657bc53 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentTypeBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ExperimentTypeBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/GeneralBatchImport.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/GeneralBatchImport.java
index a057d2423f5b63a82c04f57e2f20f6387f562438..458371d246968f0b479cada9126f39fc05a6897a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/GeneralBatchImport.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/GeneralBatchImport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/InvalidPasswordDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/InvalidPasswordDialog.java
index df8ddb661b3854ba7de4567a9eb642b1da1c7ba7..0bd80cfa02388769c9bd39764b10278690bb2a95 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/InvalidPasswordDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/InvalidPasswordDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/LoginPage.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/LoginPage.java
index 2cdd928bf87c0c53a7f64e02d51e944d2deac10f..752565d92c1d0335ab1337c8c199b22c8e9bea41 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/LoginPage.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/LoginPage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.SeleniumTest;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ProjectBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ProjectBrowser.java
index c63930fe6102da2722f9cb25ba69334b7ad58dd6..86793f88ee71613c7b3887176913c5875ec4444b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ProjectBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ProjectBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeAssignmentBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeAssignmentBrowser.java
index ea3f3da1f96bb9c54ed5d995db21652e38792799..329b5f817515af06ee64ad3cae9bcccafdb642b5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeAssignmentBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeAssignmentBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeBrowser.java
index 60b4eb60b6d26d392333cfdf3ac609ad3fe7a564..ccb5fa37e9b04fcb819d5082dc27b2e7c922c11f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/PropertyTypeBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterExperiment.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterExperiment.java
index 8016458190a95e23231d2d53c1015671c174bc83..d1027761c576ab8f7a5a0f971a1f91a57bbe7180 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterExperiment.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterExperiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.concurrent.TimeUnit;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterProject.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterProject.java
index f19c4c032a0aa7068588fe98ce27399b6c175a7c..fc0beab19c8cdd8cbc971bcc10e9c127fef80e56 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterProject.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import org.openqa.selenium.By;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterSample.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterSample.java
index ddb419228507f3bf052263fe1d4bee2056b9d5b7..01ab361a85e27801060f9adfabe2e11982c2659d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterSample.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterSample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterScript.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterScript.java
index 2c16e1c3d3945d5b6be05c6f1e781aa82ed77b33..2de948c54511c5d56353f60801b932fe18c181ae 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterScript.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RegisterScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import org.openqa.selenium.By;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RoleAssignmentBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RoleAssignmentBrowser.java
index 7a2162b1672c2ea9546caf332308f1ec3dc8bf52..445c44c7c3d7210674eef4ecf68ac36ad8147d25 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RoleAssignmentBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/RoleAssignmentBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistration.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistration.java
index c609087e34c2cd9ac1dd59752b512b25d20e8bd0..f90265213bb8402d8e63b7c6c95652e2378c4758 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistration.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.type.SampleType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistrationFile.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistrationFile.java
index 0a635a5d9c70879bafe6c535ac0195704bbfe59e..1c8a381ab7fd04be7aca9d9c41900610556e59e5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistrationFile.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBatchRegistrationFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.io.BufferedWriter;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBrowser.java
index d01c765d624287fd36c5a74f4f149992d7c246e5..947fd6499ecd49c22180d50171f43435a1399c90 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleDetails.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleDetails.java
index 8117a80ddf66c996ef57ab59d33d54094df520a5..1cf33b2e0c28f15682cbaaef066b3ec1cca11d4a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleDetails.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleDetails.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleTypeBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleTypeBrowser.java
index 6885b2f7e49a428afa8449fe4aa1bc55e54fd0a2..39e37ad213495b9599aa8f057e4ace6cb60f6796 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleTypeBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SampleTypeBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ScriptBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ScriptBrowser.java
index 7488c550eb099e2b08ea2bb82d7c31d49e4f7015..92ea3a594d31d40162187ea9eb850d1f62cf2525 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ScriptBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/ScriptBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SpaceBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SpaceBrowser.java
index 2696df55505e9db1503b9b8cf17cb2b317bf84a7..bddf6d16ce89f7b90a32c884156b1f6b1effe1f1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SpaceBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/SpaceBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Trash.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Trash.java
index 431656d9e6ab65bac07a4431db1214ef307012c5..bf69863e4ca2666c81b09c0155e0fc8d12db7fc4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Trash.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/Trash.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/UserSettingsDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/UserSettingsDialog.java
index c910eab29c985d7dde70d349f0cb469f639ccff3..ecaec0a8744d13fe59ed392138b5312d88f395b5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/UserSettingsDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/UserSettingsDialog.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Locate;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/VocabularyBrowser.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/VocabularyBrowser.java
index 625338055aa75f0a1c5bb78f0919e2fc9c7ae32b..b710c3e0fa8fae34cedee0a0a1d527115fd41bc6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/VocabularyBrowser.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/page/VocabularyBrowser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.page;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Lazy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AddEntitiesToMetaProjectRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AddEntitiesToMetaProjectRmi.java
index 1a5d9e091437848529a6fc3a97ef085bb4f530a1..4037121b2579023efa15afaf871b958c4681ee57 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AddEntitiesToMetaProjectRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AddEntitiesToMetaProjectRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AggregationReportRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AggregationReportRmi.java
index 40df7ac73e23cf8606c03dfa7aab0e2773903f45..c2b421eeafa55e5c4247ecde6f25fbbc6d117f99 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AggregationReportRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/AggregationReportRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.Map;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetRmi.java
index a738ddac58b6fd5ad814e499cd1466b52279d83c..7d94b0bdce1d88d4fc91bbf2400c502a132124af 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetTypeRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetTypeRmi.java
index 0ceefb64c6ac1ec3f5d8bef49868c6fd63db087a..7a59c14b768c64a3f28496acfd6782085bf15eeb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetTypeRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateDataSetTypeRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentRmi.java
index 046d1e5b86a3a69d717e7729cadd15be502ebc54..c6c14114e0dda21c8a78d93755e393e6adb720a1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentTypeRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentTypeRmi.java
index 043dda193fd53b9a4260d50d77bd73f8d640fa2e..00f1cbf1b38ea74b43ff37c56dade1b2beaae545 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentTypeRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateExperimentTypeRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialRmi.java
index 5fb7e4eb1891ac304d462bf5682e154794ab3609..e20304f6d0d59c6d3e12d259dba45e8806cb3035 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialTypeRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialTypeRmi.java
index 538863b84fb543b412f55444fc509af55bb4dc97..cc400d387d0fae6f0912c68909ebef129140d1c3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialTypeRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMaterialTypeRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMetaProjectRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMetaProjectRmi.java
index 90cb1744e351978b1e98e97f34442bc187d31274..2347e6e9f18cbc8ff3fd09ad7f86c95675f6772e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMetaProjectRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateMetaProjectRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.IGeneralInformationChangingService;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateProjectRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateProjectRmi.java
index 9045a14abf9d658fd9c17f5a59f458306ea81a4c..9b0bfdc3d5e633e4980cf881991ba3f94ca6a1f4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateProjectRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateProjectRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleRmi.java
index ab929f95a4550e45ffe84f8fbe60d27bed2b0188..18db4ffa954ddca80eaa96ab43973c4afb75c5b7 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleTypeRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleTypeRmi.java
index 1f5653e4804d083b54d5e1e268e24129f5c2ab22..c98662cd2fd6a4229c9dd5081f7ae70245cb165b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleTypeRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSampleTypeRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSpaceRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSpaceRmi.java
index f23d5c2d8bd7fbe708c9fa30815b469eca2220b4..ffb7db606a8d0fbdc3cf46989c7457cda300c9d1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSpaceRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateSpaceRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateUserRmi.java
index a236eba30be07fd77dbbb1acab342401bc604df5..6191fc1b0fa453157f0073988536d5a91841f77c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/CreateUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/DataSetCreator.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/DataSetCreator.java
index 9a6606a793aff9b21ffbcd32fc5af489cfd902b4..8099c05b61a38847bfbe604149e3ac11577dfada 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/DataSetCreator.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/DataSetCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.io.File;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/GetDataSetMetaDataRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/GetDataSetMetaDataRmi.java
index 5adc523198cc6e1a07d0d1c3d6a990a86f791a69..796ff6865764a888fc921ab42d09efe4617a08a3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/GetDataSetMetaDataRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/GetDataSetMetaDataRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/Identifiers.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/Identifiers.java
index 6d1cf1dc35a5ed2aea15e1aab06293e6e15c5a6d..afa2577e712b79638dec4996ab9a5d6623296c2f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/Identifiers.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/Identifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.MaterialIdentifier;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsOnBehalfOfUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsOnBehalfOfUserRmi.java
index 21027b3d95bb1ddb75edeffe0052fd4ab7810196..c588a1a2c2e7c66f3fb36399aa2d26037765e864 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsOnBehalfOfUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsOnBehalfOfUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsRmi.java
index fde25506190bc1d0525e2a7efbcdd369e77fc5c6..a7993c5fcbcd9ca5cd9c65a46817f3a69b33a6f2 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfExperimentsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSampleRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSampleRmi.java
index c32859e19a95f1fef9b1877393fbec96b637b9b4..7ba3f20fb437c5b1e3230f0193d11510304b64ee 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSampleRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSampleRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesOnBehalfOfUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesOnBehalfOfUserRmi.java
index dfd8d2e04306458b5572bc0a7720976e8cbcbaa0..9db361320259cb8f5b65c7b87d2767ab772825f6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesOnBehalfOfUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesOnBehalfOfUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesRmi.java
index 27e0528b7e810495fc2f7f6ef01687204989b8d1..dad87df87c981d31bf505ddc4a373c00036ffdcb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesWithConnectionsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesWithConnectionsRmi.java
index 878ece53d49522a2a87dc85a63fd0899ef23659c..ca6f21651a264962610ef0843e07e913b767e522 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesWithConnectionsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListDataSetsOfSamplesWithConnectionsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingDataSetsOfProjectsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingDataSetsOfProjectsRmi.java
index 1b4f6e270ad602734a3b53b39c8c7fbff645b297..a8d42cb0de2cb82fc01610bb74990bb5bdaa9bab 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingDataSetsOfProjectsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingDataSetsOfProjectsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingSamplesOfProjectsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingSamplesOfProjectsRmi.java
index b674093e6138d949f0419bd599b4cbec3f89bf6c..4d019b844ef78cf9340396dc73e53a5356cc3976 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingSamplesOfProjectsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsHavingSamplesOfProjectsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsOfProjectsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsOfProjectsRmi.java
index 32c4953831afe9c35aaaaa8cb64db8d426bae451..2e240661bb98a7ad79a598580aded30d4531f772 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsOfProjectsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsOfProjectsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsRmi.java
index 04ae8d583a897225d6a85098c2d73324ab2d5358..748c18a42de79473c88e0391f94084b40edb91ed 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListExperimentsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMaterialsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMaterialsRmi.java
index 3873d80a99df7574df45351900fbfa290ed6ada9..666afa7e40d524e76c416ec5bf6c4e1c39c13abe 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMaterialsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMaterialsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMetaProjectsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMetaProjectsRmi.java
index e0c8018d0142d3753cca7b8921d7d0d40d34ccc2..5d6e67f129547b7895a2d98c42913001f51a61a4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMetaProjectsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListMetaProjectsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentOnBehalfOfUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentOnBehalfOfUserRmi.java
index 33cea9e8601c0b14a55205f8b6e3a268bebab21e..6106e181b8a36f13e9698971a13982c1d81521f3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentOnBehalfOfUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentOnBehalfOfUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentRmi.java
index 583aceaf4d9cc06ea5d4ad55eb7e345fc42c2b43..ea130c755a7d4f35e1aa51e7e1b27308b31108c0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ListSamplesOfExperimentRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ReportFromDataSetsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ReportFromDataSetsRmi.java
index b159b284625a434331bb642133344a2ae92865da..8a3290d2bd20e2ebbcafaaa66b2d1eb28ba4a0c5 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ReportFromDataSetsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/ReportFromDataSetsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsOnBehalfOfUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsOnBehalfOfUserRmi.java
index 26131b29c1bafb2bfe4fdffc50c00512ee17e238..48377c03634e7eacdd2155253f72040478acddab 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsOnBehalfOfUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsOnBehalfOfUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsRmi.java
index dab78d797da85e6de4bd9e267259269f455d16e5..210641024d2e9a5f1d628b964e8c1d24bf4938d9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForDataSetsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForMaterialsRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForMaterialsRmi.java
index 5a2579e50958561eea62b1bb1abbe29a2619d94e..d8c9dd94f606176d5a3805976981e39ef57893fd 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForMaterialsRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForMaterialsRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesOnBehalfOfUserRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesOnBehalfOfUserRmi.java
index 3a9b7252f6a5e9a118c7140b6c2773662e0c40bb..6de09c8f415df3a4cd634504f1601df915780421 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesOnBehalfOfUserRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesOnBehalfOfUserRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesRmi.java
index 76d8aa0aa35c4dcf93ea216f5c43d512ce2a9fac..9e8e4a01ec5d480ce096e5a62194757a97eb8112 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/SearchForSamplesRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/DataSetRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/DataSetRmi.java
index 60c123a9ced5ed19ba670329dc6944a04b9a3615..b8b749eef06587cfd2269247463f63bd2d17394a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/DataSetRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/DataSetRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.eager;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/ExperimentRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/ExperimentRmi.java
index ab8eefb7674838123bdfb67c984a4159f5174e82..680f301f845f0ee78605f4c7da2f00ff2d004052 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/ExperimentRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/ExperimentRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.eager;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MaterialRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MaterialRmi.java
index acef8ce8763df731f58704968be6c47352a1e33e..622d368d879b26dfd384c1c6a86b5c5583e7e034 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MaterialRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MaterialRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.eager;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MetaProjectRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MetaProjectRmi.java
index f9ffae69120b0f1683e2ec2001819afb9331615d..55e9a3c32b33b13f99d854b2214211b52b9860b2 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MetaProjectRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/MetaProjectRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2009 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.eager;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Metaproject;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/SampleRmi.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/SampleRmi.java
index 3a6a852b89f0763e33cd309b7a57c7acdde44b01..f53a2d5be32274dba7bf2f743d66ce22413ae448 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/SampleRmi.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/eager/SampleRmi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.eager;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/ExperimentLazy.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/ExperimentLazy.java
index b50bd855c47a6e261e24f56cabe5b311197533c0..e3ff5e5ccb115570f91dbd62b845705bd1479a06 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/ExperimentLazy.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/ExperimentLazy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.lazy;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SampleTypeLazy.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SampleTypeLazy.java
index 7dfe06aec00bc982c04917c059a8fcf34ad4bb23..ed307ee57cdedbbb35bd5417437bffbc5576280d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SampleTypeLazy.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SampleTypeLazy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.lazy;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SpaceLazy.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SpaceLazy.java
index d2603ffb52044e017123b4debdf15b0cfb8a1bca..7fdfc504cedb9b9bdcdf7d804e765a72daa5936e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SpaceLazy.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/rmi/lazy/SpaceLazy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.rmi.lazy;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/FileScreenShotter.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/FileScreenShotter.java
index dee5d2ad5ac3f81fc2436d19406190357a62282a..e1faea3cc844facef897be41f9644ca6cc6daa3f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/FileScreenShotter.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/FileScreenShotter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.screenshot;
 
 import java.io.File;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/ScreenShotter.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/ScreenShotter.java
index 46bfe3411183084a47265214dec33291d87d91c7..1b8b11066ea293925da7466f8cdf7cec5629da4f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/ScreenShotter.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/screenshot/ScreenShotter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.screenshot;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
index cc5cd566c5bb073d53b36c92b6c2cf543c0eed51..188d0b32f61a6849a1cf62c5e141e8f537bfd4af 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/authentication/AuthenticationTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.suite.authentication;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/DataSetsContainMetaProjectInformation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/DataSetsContainMetaProjectInformation.java
index 06b1e84c9f573c010de07ad78fc97d2e8483623e..f2f1c733111621ea0cbb541a331815c4bbd0bb22 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/DataSetsContainMetaProjectInformation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/DataSetsContainMetaProjectInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/ExperimentsContainMetaProjectInformation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/ExperimentsContainMetaProjectInformation.java
index 3ecc2a3017e41c6eee7b97f2c4c102708e98efc7..c93a635cb014e46e7defca9243230f995fe61131 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/ExperimentsContainMetaProjectInformation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/ExperimentsContainMetaProjectInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/HeadlessSuite.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/HeadlessSuite.java
index d904db69a3cf120b8e1c4c40d6a427fd8f8483c4..2c83ae92ad543aa49389e64144d7bbb14585d308 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/HeadlessSuite.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/HeadlessSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import org.testng.annotations.BeforeTest;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MaterialsContainMetaProjectInformation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MaterialsContainMetaProjectInformation.java
index 8cf50e922022339392a93c8678faf850292d4244..822572ca2b0bc7c3eb1ae515c888cbdadfb6fbbf 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MaterialsContainMetaProjectInformation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MaterialsContainMetaProjectInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MetaProjectCreation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MetaProjectCreation.java
index 73c7498e6590fa715189bf1f553d86588504a4ff..04087a648de0d7e2530977d9195e94272009215a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MetaProjectCreation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MetaProjectCreation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MultiDssReporting.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MultiDssReporting.java
index ff109391504eb869907abbbd304209682a776185..3086ac709361eb28299114983ce0da4096d26ea4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MultiDssReporting.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/MultiDssReporting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.CoreMatchers.is;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/SamplesContainMetaProjectInformation.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/SamplesContainMetaProjectInformation.java
index 969f9bc8921f3732dcb74d4f6eeab3a42a95cd43..42115da96086a6f5f26b439930acecd9829052f3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/SamplesContainMetaProjectInformation.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/headless/SamplesContainMetaProjectInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.headless;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
index 9ab584de1f93ad1210a79419705bbb31de51e2e0..a9d4a4bae220e248de86b56de607f9cccdef3332 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/DataSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import org.testng.annotations.Test;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
index 021dd81c68ab71638c355bb06f817c2848deb228..0576c5ec115376fe2d3ae858da66b8da5ff56644 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
index e2f2a68d68ccbb1833acae85bca2debc44493d40..33866ff5a906f6d288c467214be34876fd06b342 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ExperimentTypeTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportRegistrationTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportRegistrationTest.java
index 9a4c34f5d62e6ac1ea1d8c1b1d01e5d2a957f024..2dba5103ea81c86d68c4c867452211a91ae4d9b1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportRegistrationTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportRegistrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportUpdateTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportUpdateTest.java
index 467f22bc34adc8fe33e50deb0815ba94a2445481..d15fbf8d24372546427398e836e69dd96cad109e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportUpdateTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/GeneralBatchImportUpdateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuite.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuite.java
index aac0cbfcb95f9c900c9714ca5ab96f2b86fb0373..f17cdf9ea284424019cf031b709c75865fc7629f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuite.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/MainSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import ch.systemsx.cisd.openbis.uitest.page.SampleBrowser;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
index 4aae6dce29a57e10cfc65659eac26e447c927140..1591675a5098740ebc765c7183ffddd8ee65e68e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ProjectTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
index 6eb2558655636116983ff14e017b9d0ae10bb72d..fa794983c14a1135d7a516f0e568594c4684fb3a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeAssignmentTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
index bda8248f73b98dd3457732b7f1c2bf2f73cb4089..24555c2d0a885a2491bc74d5b509c4fa096eca58 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/PropertyTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
index e01a938bcae808e051072f3c2c3207213ca311c5..89f5b6fde8af55795ef360f378b07155136efc7b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
index 6bab3976a047303c6a6e5ffdfe5f41be988aa6f6..8f8f557a0a307132776d0cb2d4aa5728dd713265 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SampleTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ScriptTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ScriptTest.java
index b6e28e291b906e42af86fec7d17ba3ab8e83ffc1..3eeca51d88bde034142a96b71e84ed9bcc5a1dd1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ScriptTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/ScriptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
index 5f36d96ab4675c80c28549b6ceac6025b2b956c0..c24660ba0303d7900560ac93294be41d644cee92 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/SpaceTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
index dc7e0ea4300ad16d224776786600ef8da8192578..daffe15a3ec9e82f641836e3ade680f77ba0fb1a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/main/VocabularyTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ch.systemsx.cisd.openbis.uitest.suite.main;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuite.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuite.java
index 1f875efca0f1dbf55ec64e3c4cfc0eae01c69662..f0ac01361ce3ef42e643fd082901605a5ecc713d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuite.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintSuite.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.sprint;
 
 import ch.systemsx.cisd.openbis.uitest.page.SampleBrowser;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
index 2345dea717cbaa504390d6be8147b2ede1cbe2e3..629adee80753f1a25ee80376f7ead9a698a0c962 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/suite/sprint/SprintTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.suite.sprint;
 
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/BrowsableWrapper.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/BrowsableWrapper.java
index 87923a06d41a7301bb5c8bc738c112ed59cfc229..2c62574ec08f5b49010986a1a81b12ae80c371fb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/BrowsableWrapper.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/BrowsableWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Arrays;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSet.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSet.java
index c13ef6f1ecf6feb4c6641ab695fb0ec5c1b55368..b171b9cf4f53966ada8d686cde55cafe1f8c990d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSet.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSetType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSetType.java
index 12bb93a70759f7e97df23c6d28b7a99f8c432aee..6482f19f91ee9c4dcffc5fe059a17d092ec712b8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSetType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/DataSetType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Entity.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Entity.java
index 15bbff62769ca3c97c0e5605fc9d636a22c74a36..16f69f73449a6ea3cf483cc304714a9712c762d8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Entity.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Entity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityKind.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityKind.java
index 1f918b5d9f1d63213bd3ae10f1032c6f6b1917ac..44f502a5b46b0a9ca5a95564e0cde87a622788c4 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityKind.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityKind.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityType.java
index 5f05033dbc57837391a6bded65522cf8732710ac..fcd353924aad1e2cdabad3075c46361bb23dcc0b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/EntityType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Experiment.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Experiment.java
index 9c2d77033939975533cc21b4202ed866a0030ddf..5a638071634a69b123c662018eef79663b2d7244 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Experiment.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Experiment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ExperimentType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ExperimentType.java
index 6089b4fde06f5152a197caf51c69d9d81554a1aa..72f7670e4c17ed770199a98ca113187adb3aa550 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ExperimentType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ExperimentType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/GeneralBatchImportFile.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/GeneralBatchImportFile.java
index cead397e394019ce4e47a9b6c02b9d3fc38fd72a..65dfd7d42704178fe98eb68b624d0785cb1dbed9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/GeneralBatchImportFile.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/GeneralBatchImportFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.io.File;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Header.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Header.java
index 3613e3aa43774af806cf0d252dbaa67890b0a947..086bd44a4ae3b70d0c2d0a5f088ad7e915ad1550 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Header.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Header.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ImportFile.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ImportFile.java
index 0df7262ab5aa5a2b68111114bfea57ccb1dc63b3..0ceaf7345db0d6552e2cb914454cdabbc9d93666 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ImportFile.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ImportFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import ch.systemsx.cisd.openbis.uitest.dsl.IdentifiedBy;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Material.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Material.java
index 682e75d741de778541e8a1500a131f263fa3b74a..a4f3e3a6cd1ecf5e037c2b50211680a5a09463b1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Material.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Material.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MaterialType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MaterialType.java
index eccf4dceaf1eba8911fdad41926d74d87594f06a..385075219e06a69a8ba366f5294972d87af86565 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MaterialType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MaterialType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MetaProject.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MetaProject.java
index 0a16a72906f76fb9ee126e72049566c0e0a966e3..c93f05b4588e12c243606a368069d84972bb0cf8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MetaProject.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/MetaProject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Project.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Project.java
index b8df15d446ccfd17d8af3ff07da461148ce833f9..114c06ddf9dd5d72a8ba678b812009abb310b41a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Project.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Project.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyType.java
index a25f2ff337f2497a3fd42bef4135bf9fe4f7a2eb..cf74918d974c8fd67fa8317e303211bd54f354f7 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeAssignment.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeAssignment.java
index fc3ef7ac7d28ada07e260e79df2010c9f960861a..9bda72aa5e747ae97b08dc62ec471dfd2f8ea8a3 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeAssignment.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeAssignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeDataType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeDataType.java
index 3cc26021f615b3c7474bd4ca70bd8694555da164..1245803ec0eaacf501be43e09091af744af755ec 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeDataType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/PropertyTypeDataType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import ch.systemsx.cisd.openbis.uitest.widget.Checkbox;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Sample.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Sample.java
index ce1a3731f5b9dd13ca39430fba5720450e8c266d..0dcd462ec84bc1ea017a37952a2d5da3272106f1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Sample.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Sample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/SampleType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/SampleType.java
index a8bf633630bfa1de4ff8c9a2955ed54869d449b0..375f36384207cc2fc10fc16ae5585ec2c228c53e 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/SampleType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/SampleType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Script.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Script.java
index c5f9b42d1e78271ee49a6cbe32cfe827fdf6b71c..47452ae365d692ca529c071a2ab3d5cf06069118 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Script.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Script.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ScriptType.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ScriptType.java
index b1accbb1eaa6bdc576c5dbe9341108b3c2f88470..06499100a47bc0997e35c8d6b7d799b6485154fb 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ScriptType.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/ScriptType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Space.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Space.java
index 1540800936f177e11bf211709d12056b7cca02d9..ff919b7a8c2b878d73e2aa455114b72bfbfc947c 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Space.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Space.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/User.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/User.java
index be10331553c7421fbffdf6fd2dac72443deb39ad..b51687ddf9c2fcd2832ab87fef9bd14f2db0e220 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/User.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Vocabulary.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Vocabulary.java
index ddb93c5fca0303dcaf35be92ea476c8e2b1e2933..748f9a9cf194a13d3d014b786d71af62f310fb88 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Vocabulary.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/Vocabulary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.util.Set;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/WorkBookWriter.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/WorkBookWriter.java
index 9cff6b7d5f6c85ed67e7c366f4b150ea87414f22..a0666d84b84da0dcb76b74a04f7079d89d7668a6 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/WorkBookWriter.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/type/WorkBookWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 ETH Zuerich, CISD
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.type;
 
 import java.io.File;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/DictionaryUidGenerator.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/DictionaryUidGenerator.java
index acfa79e7c1a0cfcb2458a5989a6b74af01b14b4f..e9b20a7f581e07e745e2eea25343de09940a9b97 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/DictionaryUidGenerator.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/DictionaryUidGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.uid;
 
 import java.io.BufferedReader;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/UidGenerator.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/UidGenerator.java
index 9f67f456b4daf9c6b92f9895e0f33df524b63bd8..baa07386657190961028024e9c528c7f8f48581d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/UidGenerator.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/uid/UidGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.uid;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Contextual.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Contextual.java
index c32cf087b2f592fab924519817ea74389f99d312..c0ab65447ac28f30360f8687508be83f54d32160 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Contextual.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Contextual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.lang.annotation.ElementType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Lazy.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Lazy.java
index c67d2196ba56263d557c6fe6c53d8be8aa137585..99a62de35d9acbb9c3af8e27000a196872153f9f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Lazy.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Lazy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.lang.annotation.ElementType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/LazyLoader.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/LazyLoader.java
index 9d3f0a6038e7ee9535baa4e60be054bdf61ab978..dd3620e0dd37dbcd84192db930813bd8a7c45ff0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/LazyLoader.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/LazyLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.lang.reflect.InvocationHandler;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Locate.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Locate.java
index 86b9846c351aa2d6e75c65aebc62ac543a184207..96d838468f655df8c6d86f926fd6c3aa0bbdc5ae 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Locate.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Locate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2007 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.lang.annotation.ElementType;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Pages.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Pages.java
index 66925fa32c9e964989aae748126354183c8c7f6f..522c53e187192ea79a1e434d904ebf4356c79037 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Pages.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/Pages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.lang.reflect.Field;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/WidgetContext.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/WidgetContext.java
index f41814305f9ff467a7050ed6ea8959144473e580..8b0e3fa006be14a541f53339154590653fde4bb0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/WidgetContext.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/webdriver/WidgetContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.webdriver;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/AlertMessageBox.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/AlertMessageBox.java
index 468b4ffe95030b1ab459566abf738d08a8af013f..1c745dc157a51491c78631003e66445da60a2aa8 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/AlertMessageBox.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/AlertMessageBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Contextual;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Button.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Button.java
index f951b33a855fad73b44553da52900cc421ed394b..f865fdeeb15769e165414957eb7236bfa6da03e0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Button.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Button.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Checkbox.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Checkbox.java
index c3caf3aaa657f52d38c7ce41a0e606602e11f66a..4c6cbb9ff7136c20dbc96742f308cb7a1a68c320 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Checkbox.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Checkbox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DeletionConfirmationBox.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DeletionConfirmationBox.java
index ad0818a723c96867cb9c075375c7bd8b562c6950..13ea7d2262b07b4a7a7e9619247beaef159fcddf 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DeletionConfirmationBox.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DeletionConfirmationBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import ch.systemsx.cisd.openbis.uitest.webdriver.Contextual;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DropDown.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DropDown.java
index 517a420383e6361010d57be5ebe9f7968f091782..c0eaac2e91d2d0e017e062f25e3eaa3f70ffc935 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DropDown.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/DropDown.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Dynamic.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Dynamic.java
index bcb7096b4997841ca67ab257bc7d487eee3a7dc4..75e24a8d42a37938bc9639dd16cdcf0386cb24fd 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Dynamic.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Dynamic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FileUpload.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FileUpload.java
index c82c489dcd7e64473e3b4a61745138a4333fc792..ee96b58caba4282e9cefa82fca341ad39e0b735b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FileUpload.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FileUpload.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.JavascriptExecutor;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Fillable.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Fillable.java
index be2c5863796621d9e598d308be4a6abf81dca8ff..2e33e61f4aeff6bc46d79513c7295a12e24b8c01 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Fillable.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Fillable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FilterToolBar.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FilterToolBar.java
index d351c056b4d1f4c51c9a07420925b23bb1d6e03a..793ceab7a399e562c1ee5df85d7b07c2464d3e91 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FilterToolBar.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/FilterToolBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.Collection;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Form.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Form.java
index 26a15f8514cb20a5ba0f1be61b2243c4f11831de..28277b5f06f8879616f9d5fb77dc43e55678ed1d 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Form.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Form.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Grid.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Grid.java
index 4fcd686fac50d226601acdaadb837aa067accf3a..e2e300cd489c812aae2fe91f93d423d5bf9db4e7 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Grid.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Grid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Link.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Link.java
index a33f057eb0e1a39a9598728f2c36d6a88227f04e..7e456c4d5affd48ec1d6578f12049190a11f21c0 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Link.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Link.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/PagingToolBar.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/PagingToolBar.java
index 372c56e671ef2a321a180745b11ec12c5f0a30d7..cc43915f45ffe80b4545edbbdc61caad7c4458e9 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/PagingToolBar.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/PagingToolBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.StringTokenizer;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/RadioButton.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/RadioButton.java
index 17a0ac24aac157e59d151d547853d966692c28a8..02f249c43a69dbd7332f3e56b4695e6ccfce6b6a 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/RadioButton.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/RadioButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Refreshable.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Refreshable.java
index 9990e6b965a5fd80437b977a760957331eba3897..736c44838be070b002ba64d71235cb4c8baedb97 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Refreshable.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Refreshable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 /**
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SettingsDialog.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SettingsDialog.java
index d95b95658701e465194e06ef008c346ea01685db..cd25b9fcafb1c2997b6feb4aa6615158177b1185 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SettingsDialog.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SettingsDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.List;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SubmitButton.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SubmitButton.java
index be95d58823d60a4e22f91c546293949e4bf707db..e3fef7d117bacef2e3b96083a08613599c92e30b 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SubmitButton.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/SubmitButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Text.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Text.java
index 5ccfee155f8a81474e6961f5b96ca358187cbebb..42e563c773db22ccf0d5b0c65806126a466f15ae 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Text.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Text.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TextArea.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TextArea.java
index 469eb6ec70d7afec44be1d8d171a0a495ab73c8c..5bf18861189545afee67d64835ab5953b98b7a2f 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TextArea.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TextArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import org.openqa.selenium.WebElement;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TreeGrid.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TreeGrid.java
index 68b71e99183a65509ab7f2ed2d661c318c8986ba..7a9915a14e9ac7e5fce39ec43ec6666758478ec1 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TreeGrid.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/TreeGrid.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2012 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 import java.util.ArrayList;
diff --git a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Widget.java b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Widget.java
index 33b8b38a6067499e87fd433c3e01b9c6aded64ad..f92ba7678f78e0e2147618f48eb6588092e517df 100644
--- a/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Widget.java
+++ b/test-ui-core/source/java/ch/systemsx/cisd/openbis/uitest/widget/Widget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 ETH Zuerich, CISD
+ * Copyright ETH 2008 - 2023 Zürich, Scientific IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package ch.systemsx.cisd.openbis.uitest.widget;
 
 /**
diff --git a/test-ui-core/sourceTest/java/Dummy.java b/test-ui-core/sourceTest/java/Dummy.java
index 1106752bbd523fe9000d5207c100a448e2629018..99cb2ec54e5f7e544585fb64e42e704b6d061499 100644
--- a/test-ui-core/sourceTest/java/Dummy.java
+++ b/test-ui-core/sourceTest/java/Dummy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright ETH 2013 - 2023 Zürich, Scientific IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 public class Dummy
 {
 }