diff --git a/src/main/java/org/openmuc/josistack/AcseAssociation.java b/src/main/java/org/openmuc/josistack/AcseAssociation.java
index e0d1685..857bba7 100644
--- a/src/main/java/org/openmuc/josistack/AcseAssociation.java
+++ b/src/main/java/org/openmuc/josistack/AcseAssociation.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/josistack/AcseAssociationListener.java b/src/main/java/org/openmuc/josistack/AcseAssociationListener.java
index 18c6fb7..dd80e4c 100644
--- a/src/main/java/org/openmuc/josistack/AcseAssociationListener.java
+++ b/src/main/java/org/openmuc/josistack/AcseAssociationListener.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/josistack/ByteBufferInputStream.java b/src/main/java/org/openmuc/josistack/ByteBufferInputStream.java
index ab73f0f..5d3a70e 100644
--- a/src/main/java/org/openmuc/josistack/ByteBufferInputStream.java
+++ b/src/main/java/org/openmuc/josistack/ByteBufferInputStream.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/josistack/ClientAcseSap.java b/src/main/java/org/openmuc/josistack/ClientAcseSap.java
index f00f9dd..191812d 100644
--- a/src/main/java/org/openmuc/josistack/ClientAcseSap.java
+++ b/src/main/java/org/openmuc/josistack/ClientAcseSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/josistack/DecodingException.java b/src/main/java/org/openmuc/josistack/DecodingException.java
index ae65be4..f07f617 100644
--- a/src/main/java/org/openmuc/josistack/DecodingException.java
+++ b/src/main/java/org/openmuc/josistack/DecodingException.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/josistack/ServerAcseSap.java b/src/main/java/org/openmuc/josistack/ServerAcseSap.java
index 53132bd..4a68e83 100644
--- a/src/main/java/org/openmuc/josistack/ServerAcseSap.java
+++ b/src/main/java/org/openmuc/josistack/ServerAcseSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/main/java/org/openmuc/jositransport/ClientTSap.java b/src/main/java/org/openmuc/jositransport/ClientTSap.java
index 9d33a04..0d1fa55 100644
--- a/src/main/java/org/openmuc/jositransport/ClientTSap.java
+++ b/src/main/java/org/openmuc/jositransport/ClientTSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/main/java/org/openmuc/jositransport/ServerTSap.java b/src/main/java/org/openmuc/jositransport/ServerTSap.java
index 965fe4a..c472632 100644
--- a/src/main/java/org/openmuc/jositransport/ServerTSap.java
+++ b/src/main/java/org/openmuc/jositransport/ServerTSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/main/java/org/openmuc/jositransport/ServerThread.java b/src/main/java/org/openmuc/jositransport/ServerThread.java
index aa11ce0..d655619 100644
--- a/src/main/java/org/openmuc/jositransport/ServerThread.java
+++ b/src/main/java/org/openmuc/jositransport/ServerThread.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/main/java/org/openmuc/jositransport/TConnection.java b/src/main/java/org/openmuc/jositransport/TConnection.java
index 512b931..95c7652 100644
--- a/src/main/java/org/openmuc/jositransport/TConnection.java
+++ b/src/main/java/org/openmuc/jositransport/TConnection.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/main/java/org/openmuc/jositransport/TConnectionListener.java b/src/main/java/org/openmuc/jositransport/TConnectionListener.java
index 8b59b22..92af61d 100644
--- a/src/main/java/org/openmuc/jositransport/TConnectionListener.java
+++ b/src/main/java/org/openmuc/jositransport/TConnectionListener.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/main/java/org/openmuc/openiec61850/AcseListener.java b/src/main/java/org/openmuc/openiec61850/AcseListener.java
index 31db8bf..8df1ebf 100644
--- a/src/main/java/org/openmuc/openiec61850/AcseListener.java
+++ b/src/main/java/org/openmuc/openiec61850/AcseListener.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Array.java b/src/main/java/org/openmuc/openiec61850/Array.java
index c49fa08..91ca864 100644
--- a/src/main/java/org/openmuc/openiec61850/Array.java
+++ b/src/main/java/org/openmuc/openiec61850/Array.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BasicDataAttribute.java b/src/main/java/org/openmuc/openiec61850/BasicDataAttribute.java
index cb909bd..a3671ae 100644
--- a/src/main/java/org/openmuc/openiec61850/BasicDataAttribute.java
+++ b/src/main/java/org/openmuc/openiec61850/BasicDataAttribute.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaBitString.java b/src/main/java/org/openmuc/openiec61850/BdaBitString.java
index 34217df..5bc31f2 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaBitString.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaBitString.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaBoolean.java b/src/main/java/org/openmuc/openiec61850/BdaBoolean.java
index 0f2189c..2b9015b 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaBoolean.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaBoolean.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaCheck.java b/src/main/java/org/openmuc/openiec61850/BdaCheck.java
index 79fe74b..580098a 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaCheck.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaCheck.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaDoubleBitPos.java b/src/main/java/org/openmuc/openiec61850/BdaDoubleBitPos.java
index 4ec11b6..1c614a8 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaDoubleBitPos.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaDoubleBitPos.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaEntryTime.java b/src/main/java/org/openmuc/openiec61850/BdaEntryTime.java
index 4fad5c1..dae605e 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaEntryTime.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaEntryTime.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaFloat32.java b/src/main/java/org/openmuc/openiec61850/BdaFloat32.java
index b96e146..1b57ea2 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaFloat32.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaFloat32.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaFloat64.java b/src/main/java/org/openmuc/openiec61850/BdaFloat64.java
index e5637b3..f050007 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaFloat64.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaFloat64.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt128.java b/src/main/java/org/openmuc/openiec61850/BdaInt128.java
index 3b59c0d..faed76d 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt128.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt128.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt16.java b/src/main/java/org/openmuc/openiec61850/BdaInt16.java
index c14d44b..2e0fd32 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt16.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt16.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt16U.java b/src/main/java/org/openmuc/openiec61850/BdaInt16U.java
index ac1bf22..77e616f 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt16U.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt16U.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt32.java b/src/main/java/org/openmuc/openiec61850/BdaInt32.java
index c9ebec7..e7b8ce4 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt32.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt32.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt32U.java b/src/main/java/org/openmuc/openiec61850/BdaInt32U.java
index 7f84330..30c1ea2 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt32U.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt32U.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt64.java b/src/main/java/org/openmuc/openiec61850/BdaInt64.java
index c8669f7..ead6eca 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt64.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt64.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt8.java b/src/main/java/org/openmuc/openiec61850/BdaInt8.java
index 44234fe..6f08b5d 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt8.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt8.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaInt8U.java b/src/main/java/org/openmuc/openiec61850/BdaInt8U.java
index e313de3..1913b92 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaInt8U.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaInt8U.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaOctetString.java b/src/main/java/org/openmuc/openiec61850/BdaOctetString.java
index bab086e..26ab5c6 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaOctetString.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaOctetString.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaOptFlds.java b/src/main/java/org/openmuc/openiec61850/BdaOptFlds.java
index e42ad8b..a381d06 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaOptFlds.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaOptFlds.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaQuality.java b/src/main/java/org/openmuc/openiec61850/BdaQuality.java
index 80a3a52..c06592e 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaQuality.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaQuality.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaReasonForInclusion.java b/src/main/java/org/openmuc/openiec61850/BdaReasonForInclusion.java
index ef0663b..a3bdaff 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaReasonForInclusion.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaReasonForInclusion.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaTapCommand.java b/src/main/java/org/openmuc/openiec61850/BdaTapCommand.java
index cc67b4a..6e49b4c 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaTapCommand.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaTapCommand.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaTimestamp.java b/src/main/java/org/openmuc/openiec61850/BdaTimestamp.java
index db6c7c0..51ba2f2 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaTimestamp.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaTimestamp.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaTriggerConditions.java b/src/main/java/org/openmuc/openiec61850/BdaTriggerConditions.java
index a2fad8d..7be7ec4 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaTriggerConditions.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaTriggerConditions.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaType.java b/src/main/java/org/openmuc/openiec61850/BdaType.java
index 78cbed2..befa2c9 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaType.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaUnicodeString.java b/src/main/java/org/openmuc/openiec61850/BdaUnicodeString.java
index 3ffbb4e..54f245c 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaUnicodeString.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaUnicodeString.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/BdaVisibleString.java b/src/main/java/org/openmuc/openiec61850/BdaVisibleString.java
index fa6752b..3d639d4 100644
--- a/src/main/java/org/openmuc/openiec61850/BdaVisibleString.java
+++ b/src/main/java/org/openmuc/openiec61850/BdaVisibleString.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Brcb.java b/src/main/java/org/openmuc/openiec61850/Brcb.java
index 7982110..f61ff95 100644
--- a/src/main/java/org/openmuc/openiec61850/Brcb.java
+++ b/src/main/java/org/openmuc/openiec61850/Brcb.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ClientAssociation.java b/src/main/java/org/openmuc/openiec61850/ClientAssociation.java
index e7e80e1..10cfb78 100644
--- a/src/main/java/org/openmuc/openiec61850/ClientAssociation.java
+++ b/src/main/java/org/openmuc/openiec61850/ClientAssociation.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ClientEventListener.java b/src/main/java/org/openmuc/openiec61850/ClientEventListener.java
index a8ae212..a0d55ba 100644
--- a/src/main/java/org/openmuc/openiec61850/ClientEventListener.java
+++ b/src/main/java/org/openmuc/openiec61850/ClientEventListener.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ClientSap.java b/src/main/java/org/openmuc/openiec61850/ClientSap.java
index 91d11bd..911d078 100644
--- a/src/main/java/org/openmuc/openiec61850/ClientSap.java
+++ b/src/main/java/org/openmuc/openiec61850/ClientSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ConstructedDataAttribute.java b/src/main/java/org/openmuc/openiec61850/ConstructedDataAttribute.java
index acd1d65..ddea548 100644
--- a/src/main/java/org/openmuc/openiec61850/ConstructedDataAttribute.java
+++ b/src/main/java/org/openmuc/openiec61850/ConstructedDataAttribute.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/DataDefinitionResParser.java b/src/main/java/org/openmuc/openiec61850/DataDefinitionResParser.java
index c4e81cd..496a21b 100644
--- a/src/main/java/org/openmuc/openiec61850/DataDefinitionResParser.java
+++ b/src/main/java/org/openmuc/openiec61850/DataDefinitionResParser.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/DataSet.java b/src/main/java/org/openmuc/openiec61850/DataSet.java
index adadba0..4393ecd 100644
--- a/src/main/java/org/openmuc/openiec61850/DataSet.java
+++ b/src/main/java/org/openmuc/openiec61850/DataSet.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Fc.java b/src/main/java/org/openmuc/openiec61850/Fc.java
index c8fad68..8520338 100644
--- a/src/main/java/org/openmuc/openiec61850/Fc.java
+++ b/src/main/java/org/openmuc/openiec61850/Fc.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/FcDataObject.java b/src/main/java/org/openmuc/openiec61850/FcDataObject.java
index b6503df..b527f72 100644
--- a/src/main/java/org/openmuc/openiec61850/FcDataObject.java
+++ b/src/main/java/org/openmuc/openiec61850/FcDataObject.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/FcModelNode.java b/src/main/java/org/openmuc/openiec61850/FcModelNode.java
index b7b81c6..39deb13 100644
--- a/src/main/java/org/openmuc/openiec61850/FcModelNode.java
+++ b/src/main/java/org/openmuc/openiec61850/FcModelNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/FileInformation.java b/src/main/java/org/openmuc/openiec61850/FileInformation.java
index f4ecefa..fee5daa 100644
--- a/src/main/java/org/openmuc/openiec61850/FileInformation.java
+++ b/src/main/java/org/openmuc/openiec61850/FileInformation.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850;
 
 import java.util.Calendar;
diff --git a/src/main/java/org/openmuc/openiec61850/GetFileListener.java b/src/main/java/org/openmuc/openiec61850/GetFileListener.java
index f155df7..cfbb2b5 100644
--- a/src/main/java/org/openmuc/openiec61850/GetFileListener.java
+++ b/src/main/java/org/openmuc/openiec61850/GetFileListener.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850;
 
 /**
diff --git a/src/main/java/org/openmuc/openiec61850/LogicalDevice.java b/src/main/java/org/openmuc/openiec61850/LogicalDevice.java
index c2fcfec..7c8c7b9 100644
--- a/src/main/java/org/openmuc/openiec61850/LogicalDevice.java
+++ b/src/main/java/org/openmuc/openiec61850/LogicalDevice.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/LogicalNode.java b/src/main/java/org/openmuc/openiec61850/LogicalNode.java
index 5f00394..67c708c 100644
--- a/src/main/java/org/openmuc/openiec61850/LogicalNode.java
+++ b/src/main/java/org/openmuc/openiec61850/LogicalNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ModelNode.java b/src/main/java/org/openmuc/openiec61850/ModelNode.java
index 1e9b405..4991597 100644
--- a/src/main/java/org/openmuc/openiec61850/ModelNode.java
+++ b/src/main/java/org/openmuc/openiec61850/ModelNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ObjectReference.java b/src/main/java/org/openmuc/openiec61850/ObjectReference.java
index 92d5ac1..3c1572e 100644
--- a/src/main/java/org/openmuc/openiec61850/ObjectReference.java
+++ b/src/main/java/org/openmuc/openiec61850/ObjectReference.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Rcb.java b/src/main/java/org/openmuc/openiec61850/Rcb.java
index 2032aab..1ce72fe 100644
--- a/src/main/java/org/openmuc/openiec61850/Rcb.java
+++ b/src/main/java/org/openmuc/openiec61850/Rcb.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Report.java b/src/main/java/org/openmuc/openiec61850/Report.java
index 9dc5023..46b378b 100644
--- a/src/main/java/org/openmuc/openiec61850/Report.java
+++ b/src/main/java/org/openmuc/openiec61850/Report.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ReportEntryData.java b/src/main/java/org/openmuc/openiec61850/ReportEntryData.java
index 5d42b8f..2854685 100644
--- a/src/main/java/org/openmuc/openiec61850/ReportEntryData.java
+++ b/src/main/java/org/openmuc/openiec61850/ReportEntryData.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/SclParseException.java b/src/main/java/org/openmuc/openiec61850/SclParseException.java
index e7f7cdf..f814f58 100644
--- a/src/main/java/org/openmuc/openiec61850/SclParseException.java
+++ b/src/main/java/org/openmuc/openiec61850/SclParseException.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/SclParser.java b/src/main/java/org/openmuc/openiec61850/SclParser.java
index fd4c804..09979e5 100644
--- a/src/main/java/org/openmuc/openiec61850/SclParser.java
+++ b/src/main/java/org/openmuc/openiec61850/SclParser.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServerAssociation.java b/src/main/java/org/openmuc/openiec61850/ServerAssociation.java
index da33a12..1cdd062 100644
--- a/src/main/java/org/openmuc/openiec61850/ServerAssociation.java
+++ b/src/main/java/org/openmuc/openiec61850/ServerAssociation.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServerEventListener.java b/src/main/java/org/openmuc/openiec61850/ServerEventListener.java
index d8ee9a1..cd23d1a 100644
--- a/src/main/java/org/openmuc/openiec61850/ServerEventListener.java
+++ b/src/main/java/org/openmuc/openiec61850/ServerEventListener.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServerModel.java b/src/main/java/org/openmuc/openiec61850/ServerModel.java
index d5fc419..e2f46c2 100644
--- a/src/main/java/org/openmuc/openiec61850/ServerModel.java
+++ b/src/main/java/org/openmuc/openiec61850/ServerModel.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServerSap.java b/src/main/java/org/openmuc/openiec61850/ServerSap.java
index 512c58f..da76fae 100644
--- a/src/main/java/org/openmuc/openiec61850/ServerSap.java
+++ b/src/main/java/org/openmuc/openiec61850/ServerSap.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServiceError.java b/src/main/java/org/openmuc/openiec61850/ServiceError.java
index af00e11..a6b19c8 100644
--- a/src/main/java/org/openmuc/openiec61850/ServiceError.java
+++ b/src/main/java/org/openmuc/openiec61850/ServiceError.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/ServiceSupport.java b/src/main/java/org/openmuc/openiec61850/ServiceSupport.java
index 5120cce..308b17e 100644
--- a/src/main/java/org/openmuc/openiec61850/ServiceSupport.java
+++ b/src/main/java/org/openmuc/openiec61850/ServiceSupport.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/Urcb.java b/src/main/java/org/openmuc/openiec61850/Urcb.java
index 6b20fd1..dce2800 100644
--- a/src/main/java/org/openmuc/openiec61850/Urcb.java
+++ b/src/main/java/org/openmuc/openiec61850/Urcb.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850;
 
diff --git a/src/main/java/org/openmuc/openiec61850/app/ConsoleClient.java b/src/main/java/org/openmuc/openiec61850/app/ConsoleClient.java
index 697aae4..077b784 100644
--- a/src/main/java/org/openmuc/openiec61850/app/ConsoleClient.java
+++ b/src/main/java/org/openmuc/openiec61850/app/ConsoleClient.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.app;
 
 import java.io.IOException;
@@ -33,11 +46,6 @@ import org.openmuc.openiec61850.internal.cli.FatalActionException;
 import org.openmuc.openiec61850.internal.cli.IntCliParameter;
 import org.openmuc.openiec61850.internal.cli.StringCliParameter;
 
-/**
- *
- * @author Stefan Feuerhahn
- *
- */
 public class ConsoleClient {
 
     private static final String PRINT_MODEL_KEY = "m";
diff --git a/src/main/java/org/openmuc/openiec61850/app/ConsoleServer.java b/src/main/java/org/openmuc/openiec61850/app/ConsoleServer.java
index c022f2b..1075150 100644
--- a/src/main/java/org/openmuc/openiec61850/app/ConsoleServer.java
+++ b/src/main/java/org/openmuc/openiec61850/app/ConsoleServer.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.app;
 
 import java.io.IOException;
@@ -34,11 +47,6 @@ import org.openmuc.openiec61850.internal.cli.CliParser;
 import org.openmuc.openiec61850.internal.cli.IntCliParameter;
 import org.openmuc.openiec61850.internal.cli.StringCliParameter;
 
-/**
- * 
- * @author Stefan Feuerhahn
- * 
- */
 public class ConsoleServer {
 
     private static final String WRITE_VALUE_KEY = "w";
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/BasicDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/BasicDataBind.java
index ef61561..42facc5 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/BasicDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/BasicDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/ClientGui.java b/src/main/java/org/openmuc/openiec61850/clientgui/ClientGui.java
index 397fd77..a329360 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/ClientGui.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/ClientGui.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeCellRenderer.java b/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeCellRenderer.java
index 2138759..e7c04bb 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeCellRenderer.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeCellRenderer.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeNode.java b/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeNode.java
index 377f93c..e256da3 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeNode.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/DataObjectTreeNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/DataSetTreeNode.java b/src/main/java/org/openmuc/openiec61850/clientgui/DataSetTreeNode.java
index b32bf6d..86f43ff 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/DataSetTreeNode.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/DataSetTreeNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/DataTreeNode.java b/src/main/java/org/openmuc/openiec61850/clientgui/DataTreeNode.java
index 9569b9f..24b5091 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/DataTreeNode.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/DataTreeNode.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/ServerModelParser.java b/src/main/java/org/openmuc/openiec61850/clientgui/ServerModelParser.java
index 786e5d2..c003e15 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/ServerModelParser.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/ServerModelParser.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/SettingsFrame.java b/src/main/java/org/openmuc/openiec61850/clientgui/SettingsFrame.java
index 2fbc187..5551320 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/SettingsFrame.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/SettingsFrame.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/BooleanDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/BooleanDataBind.java
index 4c4e6d7..c132aea 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/BooleanDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/BooleanDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/CheckDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/CheckDataBind.java
index 9f97587..37b041e 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/CheckDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/CheckDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/DoubleBitPosDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/DoubleBitPosDataBind.java
index c7bfe88..ba1088d 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/DoubleBitPosDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/DoubleBitPosDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/EntryTimeDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/EntryTimeDataBind.java
index e3dc9c8..26a1614 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/EntryTimeDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/EntryTimeDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float32DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float32DataBind.java
index 5227e2b..eeb644a 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float32DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float32DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float64DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float64DataBind.java
index a63269d..7472c31 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float64DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Float64DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16DataBind.java
index 8c866a0..079594d 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16UDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16UDataBind.java
index 3bac69f..38fb44d 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16UDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int16UDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32DataBind.java
index 1df9c66..6d42e0e 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32UDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32UDataBind.java
index a95303c..f4558a1 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32UDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int32UDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int64DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int64DataBind.java
index 8b5d9b1..43cb8ec 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int64DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int64DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8DataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8DataBind.java
index 3263b37..56c1039 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8DataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8DataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8UDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8UDataBind.java
index d91b712..5e4526a 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8UDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/Int8UDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/OctetStringDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/OctetStringDataBind.java
index 8a0bacb..1471cf0 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/OctetStringDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/OctetStringDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/OptfldsDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/OptfldsDataBind.java
index 0bfce37..f412dcc 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/OptfldsDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/OptfldsDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/QualityDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/QualityDataBind.java
index 220443e..3ecdadb 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/QualityDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/QualityDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java
index d4d7910..09d54df 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/ReasonForInclusionDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TapCommandDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TapCommandDataBind.java
index 44df588..4bc3128 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TapCommandDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TapCommandDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TextFieldDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TextFieldDataBind.java
index 734ea38..7006868 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TextFieldDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TextFieldDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TimeStampDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TimeStampDataBind.java
index 80cf302..6a6ad91 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TimeStampDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TimeStampDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TriggerConditionDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TriggerConditionDataBind.java
index 7ff996c..2aaa744 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/TriggerConditionDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/TriggerConditionDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/UnicodeStringDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/UnicodeStringDataBind.java
index fc25165..59dc9e8 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/UnicodeStringDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/UnicodeStringDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/databind/VisibleStringDataBind.java b/src/main/java/org/openmuc/openiec61850/clientgui/databind/VisibleStringDataBind.java
index 3e37163..b050e6f 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/databind/VisibleStringDataBind.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/databind/VisibleStringDataBind.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.databind;
 
diff --git a/src/main/java/org/openmuc/openiec61850/clientgui/util/Counter.java b/src/main/java/org/openmuc/openiec61850/clientgui/util/Counter.java
index cfb78ed..a92b8d4 100644
--- a/src/main/java/org/openmuc/openiec61850/clientgui/util/Counter.java
+++ b/src/main/java/org/openmuc/openiec61850/clientgui/util/Counter.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.clientgui.util;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractDataAttribute.java b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractDataAttribute.java
index 19123a0..0a43386 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractDataAttribute.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractDataAttribute.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractElement.java b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractElement.java
index 18f9c9e..bb24ae2 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractElement.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractElement.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractType.java b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractType.java
index b372291..d96e2ca 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractType.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/AbstractType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Bda.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Bda.java
index b3cb09d..9834cf5 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Bda.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Bda.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Da.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Da.java
index e8774af..51e9782 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Da.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Da.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/DaType.java b/src/main/java/org/openmuc/openiec61850/internal/scl/DaType.java
index a60ddf4..7f7e754 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/DaType.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/DaType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Do.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Do.java
index 8ade0ff..d432f6f 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Do.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Do.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/DoType.java b/src/main/java/org/openmuc/openiec61850/internal/scl/DoType.java
index 9f238e5..a227e7d 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/DoType.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/DoType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/EnumType.java b/src/main/java/org/openmuc/openiec61850/internal/scl/EnumType.java
index c134ff8..6e58491 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/EnumType.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/EnumType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/EnumVal.java b/src/main/java/org/openmuc/openiec61850/internal/scl/EnumVal.java
index 4442094..f48bb18 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/EnumVal.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/EnumVal.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/LnSubDef.java b/src/main/java/org/openmuc/openiec61850/internal/scl/LnSubDef.java
index 32f81db..7b4e2d8 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/LnSubDef.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/LnSubDef.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/LnType.java b/src/main/java/org/openmuc/openiec61850/internal/scl/LnType.java
index 19aa349..3661610 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/LnType.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/LnType.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Sdo.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Sdo.java
index c65e115..dc1cee9 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Sdo.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Sdo.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/TypeDefinitions.java b/src/main/java/org/openmuc/openiec61850/internal/scl/TypeDefinitions.java
index 0e4c2b3..3c83494 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/TypeDefinitions.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/TypeDefinitions.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Util.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Util.java
index cffece2..a79a199 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Util.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Util.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/main/java/org/openmuc/openiec61850/internal/scl/Value.java b/src/main/java/org/openmuc/openiec61850/internal/scl/Value.java
index bf316f9..6c3bf06 100644
--- a/src/main/java/org/openmuc/openiec61850/internal/scl/Value.java
+++ b/src/main/java/org/openmuc/openiec61850/internal/scl/Value.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.openiec61850.internal.scl;
 
diff --git a/src/test/java/org/openmuc/josistack/SiemensClientITest.java b/src/test/java/org/openmuc/josistack/SiemensClientITest.java
index 3c01cf0..9eb0a4f 100644
--- a/src/test/java/org/openmuc/josistack/SiemensClientITest.java
+++ b/src/test/java/org/openmuc/josistack/SiemensClientITest.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.josistack;
 
diff --git a/src/test/java/org/openmuc/jositransport/ClientServerITest.java b/src/test/java/org/openmuc/jositransport/ClientServerITest.java
index 2151f5d..b8d3a3f 100644
--- a/src/test/java/org/openmuc/jositransport/ClientServerITest.java
+++ b/src/test/java/org/openmuc/jositransport/ClientServerITest.java
@@ -1,18 +1,15 @@
 /*
- * Copyright 2011-17 Fraunhofer ISE, energy & meteo Systems GmbH and other contributors
+ * Copyright 2011 The OpenIEC61850 Authors
  *
- * 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
+ * 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.
- *
+ * 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.openmuc.jositransport;
 
diff --git a/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest.java b/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest.java
index 66c0f88..12413e0 100644
--- a/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest.java
+++ b/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.integrationtests;
 
 import java.io.IOException;
diff --git a/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest2.java b/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest2.java
index 7686f09..723782e 100644
--- a/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest2.java
+++ b/src/test/java/org/openmuc/openiec61850/integrationtests/ClientServerITest2.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.integrationtests;
 
 import java.io.IOException;
diff --git a/src/test/java/org/openmuc/openiec61850/integrationtests/ReportingTest.java b/src/test/java/org/openmuc/openiec61850/integrationtests/ReportingTest.java
index 5f9150c..f9e7157 100644
--- a/src/test/java/org/openmuc/openiec61850/integrationtests/ReportingTest.java
+++ b/src/test/java/org/openmuc/openiec61850/integrationtests/ReportingTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.integrationtests;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/openmuc/openiec61850/integrationtests/SclTests.java b/src/test/java/org/openmuc/openiec61850/integrationtests/SclTests.java
index 6fcb773..07d9fbf 100644
--- a/src/test/java/org/openmuc/openiec61850/integrationtests/SclTests.java
+++ b/src/test/java/org/openmuc/openiec61850/integrationtests/SclTests.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2011 The OpenIEC61850 Authors
+ *
+ * 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.openmuc.openiec61850.integrationtests;
 
 import org.junit.Test;