diff --git a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticator.java b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticator.java
index 09a8858..9dd52a9 100644
--- a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticator.java
+++ b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticator.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorFactory.java b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorFactory.java
index 038fd4e..b4226c2 100644
--- a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorFactory.java
+++ b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorFactory.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProvider.java b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProvider.java
index 2deeb8a..05ed3b3 100644
--- a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProvider.java
+++ b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProvider.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderFactory.java b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderFactory.java
index 582e2fb..2090646 100644
--- a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderFactory.java
+++ b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderFactory.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/User.java b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/User.java
index d1bd167..c986192 100644
--- a/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/User.java
+++ b/src/main/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/User.java
@@ -1,17 +1,19 @@
-/* Copyright 2017 Danish Maritime Authority.
-*
-*  Licensed under the Apache License, Version 2.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.
-*/
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
+ *
+ *  Licensed under the Apache License, Version 2.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 net.maritimeconnectivity.identityregistry.keycloak.spi.eventprovider;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java
index fad86f3..2802fea 100644
--- a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java
+++ b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/authenticators/certificate/CertificateAuthenticatorTest.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -14,7 +16,6 @@
  */
 package net.maritimeconnectivity.identityregistry.keycloak.spi.authenticators.certificate;
 
-import jakarta.ws.rs.core.HttpHeaders;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.keycloak.authentication.AuthenticationFlowContext;
@@ -25,6 +26,7 @@
 import org.keycloak.models.UserModel;
 import org.keycloak.models.UserProvider;
 
+import jakarta.ws.rs.core.HttpHeaders;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
diff --git a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderTest.java b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderTest.java
index 67fb069..17ffd7b 100644
--- a/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderTest.java
+++ b/src/test/java/net/maritimeconnectivity/identityregistry/keycloak/spi/eventprovider/MCPEventListenerProviderTest.java
@@ -1,4 +1,6 @@
-/* Copyright 2017 Danish Maritime Authority.
+/*
+ * Copyright 2017 Danish Maritime Authority.
+ * Copyright 2020 Maritime Connectivity Platform Consortium
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -116,7 +118,7 @@ void onEventSkipIdp() {
         given(this.mockedEvent.getDetails()).willReturn(details);
 
         // Put "certificates" in the list of identity_providers that should be skipped.
-        String[] noSyncIdps = new String[]{ "certificates" };
+        String[] noSyncIdps = new String[]{"certificates"};
 
         mcpEventListenerProvider = new MCPEventListenerProvider(null, null, "src/test/resources/keystore.jks", "changeit", null, null, noSyncIdps);
         mcpEventListenerProvider.onEvent(this.mockedEvent);
@@ -152,7 +154,7 @@ void onEvent() {
         given(this.mockedUserModel.getAttributes()).willReturn(attrs);
 
         // Put "certificates" in the list of identity_providers that should be skipped.
-        String[] noSyncIdps = new String[]{ "certificates" };
+        String[] noSyncIdps = new String[]{"certificates"};
 
         // Create a spy version of the event listener
         mcpEventListenerProvider = spy(new MCPEventListenerProvider(mockedKeycloakSession, "", "src/test/resources/keystore.jks", "changeit", null, null, noSyncIdps));