diff --git a/Makefile b/Makefile
index d13f23950a4302fc11aea54f1f3bb4a4d1de6d3c..fb5ebe37b8562a0d103fa4924c379f0906c7f616 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
 ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
 ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
 LOCALJARS=$(shell if [ -d lib ]; then find lib -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"; fi)
-JAR:=SLUBXmlFormatValidationPlugin.jar
+JAR:=XmlFormatValidationPlugin.jar
 
 # classpath
 JUNITCLASSPATH:=./java/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
@@ -41,16 +41,16 @@ jarclean:
 	@rm -Rf $(BUILD)
 
 test_dtd: $(JAR)
-	java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateDTD;
+	java -Djaxp.debug=1 -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateDTD;
 
 test_schema: $(JAR)
-	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateSchema;
+	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateSchema;
 
 test_relaxNG: $(JAR)
-	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestSLUBValidateRelaxNG;
+	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.Validation.TestValidateRelaxNG;
 
 test: test_dtd test_schema test_relaxNG
-	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.TestSLUBXmlFormatValidationPlugin
+	java -cp ${CLASSPATH}:$(JUNITCLASSPATH) org.junit.runner.JUnitCore  org.slub.rosetta.dps.repository.plugin.TestXmlFormatValidationPlugin
 
 clean: jarclean
 	@rm -Rf doc/
diff --git a/PLUGIN-INF/metadata_SLUBXmlFormatValidationPlugin.xml b/PLUGIN-INF/metadata_XmlFormatValidationPlugin.xml
similarity index 100%
rename from PLUGIN-INF/metadata_SLUBXmlFormatValidationPlugin.xml
rename to PLUGIN-INF/metadata_XmlFormatValidationPlugin.xml
diff --git a/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
index da958b44ed4c819bbd4d6b4172cb9f8ab463529b..a2bb7051e8c20e335e843382245b2a32ca8ae8bb 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/TestXmlFormatValidationPlugin.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import org.junit.Before;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
index 947cc2d4dffca9f3d62a0851c4df811a94c795bb..7d293b587318cf0a8111823423689127433c65ae 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateDTD.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.junit.Before;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
index 989ceba5152c4489bcbd5a32ab3c1018bdcd40cc..c785241dbb1e5e7d54daafa6e05434f64c9fc1dd 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateRelaxNG.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.junit.Before;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
index f0b06d88eb7878b1a03515e1687bf92eb2553123..28d24e9bc909eac1617afd4b51c528a935cbcd50 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/TestValidateSchema.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.junit.Before;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java
index 0d59286be1c2427ed593a376b2d1c94238614680..fdbe0a2fbdee4d47fa43d5550eba5b5879a6f673 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateDTD.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.slub.rosetta.dps.repository.plugin.XmlErrorHandler;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java
index 9b7a1e9fc722f13105fe6e7ab1a275f911be8908..2cdc76777f332e9695cfe5abfa16941de28c4c78 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateRelaxNG.java
@@ -1,3 +1,19 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import com.thaiopensource.util.PropertyMap;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java
index d32672afee431427e05a7379dbd9ab5fbb728557..d304183330bdc4cf9f17627d9a177df109b4142e 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchema.java
@@ -1,3 +1,19 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.apache.xerces.jaxp.validation.XMLSchemaFactory;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java
index e6344a598ca1f0e2ddf90936259efa6c17a80f96..94608a2ad3454fe069031a529de2dee4e2579f48 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/Validation/ValidateSchematron.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin.Validation;
 
 import org.w3c.dom.Document;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
index 4ead729ce97045a27f0c65297360207692fe154b..03798a5dc41042b35748a5d92707d96d32afcb67 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationCatalogResolver.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import org.apache.xerces.util.XMLCatalogResolver;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java
index 4addc3b969614d71ac0965ea20a218c857969f1f..0dc77f07fc0c19a12ebee2acd2a5f7c35d84a36b 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationLevel.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 public enum ValidationLevel {
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java
index ca111f9f5507c9098032ed6568e8c3b4bb418899..b1c70d37240bc34a30a0b29e8a3dab8b13b5b396 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationResourceResolver.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import org.apache.xerces.dom.DOMInputImpl;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
index 6c163a1d017efe099bd906c1558262f00099e2d3..eba01a91c597b123d37da5dd908b735403e22253 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationResultHandle.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import java.util.ArrayList;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java
index 11dd68617b3258ed77328f6a24f79b0b24184a49..30630ebe906b7f09b35fa82d47eb6789d325f424 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchema.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import org.xml.sax.SAXException;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java
index 261eb9645bed9d76574962c30eeb6a1490fe8e91..d6e2f9b46653985fa3b46255abdb121a61118ef7 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/ValidationSchemaType.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 public enum ValidationSchemaType {
diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
index adf7706dd6f345d4d792fb372f4bdb479d194103..3926cbd3e2eb17475e5e94d804cbe31e4188e750 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/XmlErrorHandler.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 import org.xml.sax.ErrorHandler;
diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
index 77c89aad138674d7a8f81e2a5bb25f0036c9a604..e53b18a319dfbd1a842ce5afba93f8c61bbe4845 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/XmlFormatValidationPlugin.java
@@ -44,7 +44,7 @@ import java.util.Optional;
 import java.util.Set;
 
 /**
- * SLUBXmlFormatValidationPlugin
+ * XmlFormatValidationPlugin
  *
  * @author andreas.romeyke@slub-dresden.de (Andreas Romeyke)
  * @see com.exlibris.dps.sdk.techmd.FormatValidationPlugin
@@ -335,7 +335,7 @@ public class XmlFormatValidationPlugin implements FormatValidationPlugin {
 
     @Override
     public String getAgent() {
-        return "SLUBXmlFormatValidationPlugin";
+        return "XmlFormatValidationPlugin";
     }
 
     @Override
diff --git a/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java b/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java
index 1ed413b117deb365332bfab7854e8074c14a4264..0cd7f48253f271194a7808fc5d3884ae70754d97 100644
--- a/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java
+++ b/java/org/slub/rosetta/dps/repository/plugin/XmlInfoRecord.java
@@ -1,3 +1,18 @@
+/*
+2023 by Andreas Romeyke (SLUB Dresden)
+
+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 org.slub.rosetta.dps.repository.plugin;
 
 class XmlInfoRecord {