diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc
index c531fda..3e35308 100644
Binary files a/CredWrite/CredWrite.rc and b/CredWrite/CredWrite.rc differ
diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index 0f5b021..2af8c0d 100644
--- a/CredWrite/Main.cpp
+++ b/CredWrite/Main.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/CredWrite/PCH.cpp b/CredWrite/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/CredWrite/PCH.cpp
+++ b/CredWrite/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/CredWrite/PCH.h b/CredWrite/PCH.h
index a5e8b01..d9151ec 100644
--- a/CredWrite/PCH.h
+++ b/CredWrite/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/EAPMethods/EAPMethod.def b/EAPMethods/EAPMethod.def
index 7d259eb..0838d3f 100644
Binary files a/EAPMethods/EAPMethod.def and b/EAPMethods/EAPMethod.def differ
diff --git a/EAPMethods/EAPMethod_UI.def b/EAPMethods/EAPMethod_UI.def
index eef9b7a..8a57d73 100644
Binary files a/EAPMethods/EAPMethod_UI.def and b/EAPMethods/EAPMethod_UI.def differ
diff --git a/EAPMethods/MSIBuild.EAP-TTLS/Makefile b/EAPMethods/MSIBuild.EAP-TTLS/Makefile
index 1d97009..badcb87 100644
Binary files a/EAPMethods/MSIBuild.EAP-TTLS/Makefile and b/EAPMethods/MSIBuild.EAP-TTLS/Makefile differ
diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile
index dea7d2e..4576ba0 100644
Binary files a/EAPMethods/MSIBuild/Makefile and b/EAPMethods/MSIBuild/Makefile differ
diff --git a/EAPMethods/MSIBuild/MakefileEAPMethod.mak b/EAPMethods/MSIBuild/MakefileEAPMethod.mak
index e504232..6c27cce 100644
Binary files a/EAPMethods/MSIBuild/MakefileEAPMethod.mak and b/EAPMethods/MSIBuild/MakefileEAPMethod.mak differ
diff --git a/EAPMethods/Main.cpp b/EAPMethods/Main.cpp
index ee0280b..9425540 100644
--- a/EAPMethods/Main.cpp
+++ b/EAPMethods/Main.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EAPMethods/Main_UI.cpp b/EAPMethods/Main_UI.cpp
index 6bc52de..615dc66 100644
--- a/EAPMethods/Main_UI.cpp
+++ b/EAPMethods/Main_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH_UI.h"
diff --git a/EAPMethods/PCH.cpp b/EAPMethods/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/EAPMethods/PCH.cpp
+++ b/EAPMethods/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EAPMethods/PCH.h b/EAPMethods/PCH.h
index 08b82fd..0483509 100644
--- a/EAPMethods/PCH.h
+++ b/EAPMethods/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/EAPMethods/PCH_UI.cpp b/EAPMethods/PCH_UI.cpp
index 6a7af72..f1596a8 100644
--- a/EAPMethods/PCH_UI.cpp
+++ b/EAPMethods/PCH_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH_UI.h"
diff --git a/EAPMethods/PCH_UI.h b/EAPMethods/PCH_UI.h
index e179c00..16902bb 100644
--- a/EAPMethods/PCH_UI.h
+++ b/EAPMethods/PCH_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/EAPMethods/Register.cpp b/EAPMethods/Register.cpp
index e24f7de..2daa7e5 100644
--- a/EAPMethods/Register.cpp
+++ b/EAPMethods/Register.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2020-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EAPMethods/Register_UI.cpp b/EAPMethods/Register_UI.cpp
index 31b661c..c2d67a4 100644
--- a/EAPMethods/Register_UI.cpp
+++ b/EAPMethods/Register_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2020-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH_UI.h"
diff --git a/EAPMethods/res/EAPMethod.rc b/EAPMethods/res/EAPMethod.rc
index b465a07..260deee 100644
Binary files a/EAPMethods/res/EAPMethod.rc and b/EAPMethods/res/EAPMethod.rc differ
diff --git a/EAPMethods/res/EAPMethod_UI.rc b/EAPMethods/res/EAPMethod_UI.rc
index 34585aa..02ab8c8 100644
Binary files a/EAPMethods/res/EAPMethod_UI.rc and b/EAPMethods/res/EAPMethod_UI.rc differ
diff --git a/EventMonitor/App.cpp b/EventMonitor/App.cpp
index 3d61705..e1869fc 100644
--- a/EventMonitor/App.cpp
+++ b/EventMonitor/App.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EventMonitor/App.h b/EventMonitor/App.h
index 10c7926..72faccf 100644
--- a/EventMonitor/App.h
+++ b/EventMonitor/App.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 ///
diff --git a/EventMonitor/ETWLog.cpp b/EventMonitor/ETWLog.cpp
index 654d4b8..2afee6d 100644
--- a/EventMonitor/ETWLog.cpp
+++ b/EventMonitor/ETWLog.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EventMonitor/ETWLog.h b/EventMonitor/ETWLog.h
index 795872b..b28ace3 100644
--- a/EventMonitor/ETWLog.h
+++ b/EventMonitor/ETWLog.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <wx/event.h>
diff --git a/EventMonitor/EventMonitor.rc b/EventMonitor/EventMonitor.rc
index 76f0337..125f409 100644
Binary files a/EventMonitor/EventMonitor.rc and b/EventMonitor/EventMonitor.rc differ
diff --git a/EventMonitor/Frame.cpp b/EventMonitor/Frame.cpp
index 36a58c4..9e00f74 100644
--- a/EventMonitor/Frame.cpp
+++ b/EventMonitor/Frame.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EventMonitor/Frame.h b/EventMonitor/Frame.h
index f4333f5..0618586 100644
--- a/EventMonitor/Frame.h
+++ b/EventMonitor/Frame.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxEventMonitorFrame;
diff --git a/EventMonitor/LogPanel.cpp b/EventMonitor/LogPanel.cpp
index cf604b8..a68fe10 100644
--- a/EventMonitor/LogPanel.cpp
+++ b/EventMonitor/LogPanel.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EventMonitor/LogPanel.h b/EventMonitor/LogPanel.h
index 70c2f12..0df86f8 100644
--- a/EventMonitor/LogPanel.h
+++ b/EventMonitor/LogPanel.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxEventMonitorLogPanel;
diff --git a/EventMonitor/MSIBuild/Makefile b/EventMonitor/MSIBuild/Makefile
index 9695ef1..5794c14 100644
Binary files a/EventMonitor/MSIBuild/Makefile and b/EventMonitor/MSIBuild/Makefile differ
diff --git a/EventMonitor/PCH.cpp b/EventMonitor/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/EventMonitor/PCH.cpp
+++ b/EventMonitor/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/EventMonitor/PCH.h b/EventMonitor/PCH.h
index 1ee0922..880eb6c 100644
--- a/EventMonitor/PCH.h
+++ b/EventMonitor/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/MSI/Base/Main/Makefile b/MSI/Base/Main/Makefile
index 73a93c2..24bc5cd 100644
Binary files a/MSI/Base/Main/Makefile and b/MSI/Base/Main/Makefile differ
diff --git a/MSI/Base/Makefile b/MSI/Base/Makefile
index ec703d1..147e638 100644
Binary files a/MSI/Base/Makefile and b/MSI/Base/Makefile differ
diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index a53c4e2..ac5ec66 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit a53c4e2b8786023fd3afdb89932d84129521710d
+Subproject commit ac5ec66f3e50804a5c0d88e562fef6377891bb79
diff --git a/Makefile b/Makefile
index 920aef3..842f79b 100644
Binary files a/Makefile and b/Makefile differ
diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak
index 7c5586b..2d8990d 100644
Binary files a/MakefileEAPMethod.mak and b/MakefileEAPMethod.mak differ
diff --git a/MakefileLang.mak b/MakefileLang.mak
index b91ae7b..0be7b92 100644
Binary files a/MakefileLang.mak and b/MakefileLang.mak differ
diff --git a/MakefileLangPlatCfg.mak b/MakefileLangPlatCfg.mak
index 02bf59c..a5b9d28 100644
Binary files a/MakefileLangPlatCfg.mak and b/MakefileLangPlatCfg.mak differ
diff --git a/MakefilePlat.mak b/MakefilePlat.mak
index f188ed0..64aafc0 100644
Binary files a/MakefilePlat.mak and b/MakefilePlat.mak differ
diff --git a/MakefilePlatCfg.mak b/MakefilePlatCfg.mak
index 283d944..dd35f37 100644
Binary files a/MakefilePlatCfg.mak and b/MakefilePlatCfg.mak differ
diff --git a/MsiUseFeature/Main.cpp b/MsiUseFeature/Main.cpp
index d8111ac..badb3c6 100644
--- a/MsiUseFeature/Main.cpp
+++ b/MsiUseFeature/Main.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/MsiUseFeature/MsiUseFeature.rc b/MsiUseFeature/MsiUseFeature.rc
index 9eceea5..6dd5df4 100644
Binary files a/MsiUseFeature/MsiUseFeature.rc and b/MsiUseFeature/MsiUseFeature.rc differ
diff --git a/MsiUseFeature/PCH.cpp b/MsiUseFeature/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/MsiUseFeature/PCH.cpp
+++ b/MsiUseFeature/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/MsiUseFeature/PCH.h b/MsiUseFeature/PCH.h
index 2404504..9b1fa38 100644
--- a/MsiUseFeature/PCH.h
+++ b/MsiUseFeature/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/WLANManager/MSIBuild/Makefile b/WLANManager/MSIBuild/Makefile
index 3705cec..ba29a51 100644
Binary files a/WLANManager/MSIBuild/Makefile and b/WLANManager/MSIBuild/Makefile differ
diff --git a/WLANManager/Main.cpp b/WLANManager/Main.cpp
index b6a2473..ff9690e 100644
--- a/WLANManager/Main.cpp
+++ b/WLANManager/Main.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/WLANManager/PCH.cpp b/WLANManager/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/WLANManager/PCH.cpp
+++ b/WLANManager/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/WLANManager/PCH.h b/WLANManager/PCH.h
index 690371e..4379e27 100644
--- a/WLANManager/PCH.h
+++ b/WLANManager/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/WLANManager/WLANManager.rc b/WLANManager/WLANManager.rc
index 76e6884..7772ec1 100644
Binary files a/WLANManager/WLANManager.rc and b/WLANManager/WLANManager.rc differ
diff --git a/bin/MkLnk.wsf b/bin/MkLnk.wsf
index 4bc3956..21c247b 100644
--- a/bin/MkLnk.wsf
+++ b/bin/MkLnk.wsf
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2015 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of MkLnk.
-
-    MkLnk is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    MkLnk is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with MkLnk. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2015 Amebis
+    Copyright © 2016 GÉANT
 -->
 <package>
 	<job id="MkLnk">
diff --git a/include/ARM64.props b/include/ARM64.props
index 3e6d834..1ea3ad9 100644
--- a/include/ARM64.props
+++ b/include/ARM64.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/Common.props b/include/Common.props
index d04dba8..21a55be 100644
--- a/include/Common.props
+++ b/include/Common.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="ExtensionSettings">
diff --git a/include/Debug.props b/include/Debug.props
index 4cbad1a..b84eebf 100644
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak
index cf0bd7e..0c33ca2 100644
Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ
diff --git a/include/Release.props b/include/Release.props
index fc81aa0..083420c 100644
--- a/include/Release.props
+++ b/include/Release.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
diff --git a/include/Version.h b/include/Version.h
index 5a3333a..49ef738 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 /*
diff --git a/include/Win32.props b/include/Win32.props
index 6ca6a95..a18d3a8 100644
--- a/include/Win32.props
+++ b/include/Win32.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/x64.props b/include/x64.props
index 975f144..ec380c2 100644
--- a/include/x64.props
+++ b/include/x64.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2016-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
diff --git a/include/xgettext.props b/include/xgettext.props
index 865d38c..a3bb59f 100644
--- a/include/xgettext.props
+++ b/include/xgettext.props
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(POCompileBeforeTargets)' == '' and '$(POCompileAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
diff --git a/include/xgettext.targets b/include/xgettext.targets
index 9aaac0c..68555bc 100644
--- a/include/xgettext.targets
+++ b/include/xgettext.targets
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
diff --git a/include/xgettext.xml b/include/xgettext.xml
index 0be906c..8c2c3b8 100644
--- a/include/xgettext.xml
+++ b/include/xgettext.xml
@@ -1,22 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 1991-2020 Amebis
+    Copyright © 2016 GÉANT
 -->
 <ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
   <Rule Name="POCompile" PageTemplate="tool" DisplayName="PO Compiler" SwitchPrefix="--" Order="200">
diff --git a/lib/EAPBase/include/Config.h b/lib/EAPBase/include/Config.h
index 3982313..b2c60fb 100644
--- a/lib/EAPBase/include/Config.h
+++ b/lib/EAPBase/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "EAP.h"
diff --git a/lib/EAPBase/include/Credentials.h b/lib/EAPBase/include/Credentials.h
index 07d58d0..8b927d3 100644
--- a/lib/EAPBase/include/Credentials.h
+++ b/lib/EAPBase/include/Credentials.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/EAPBase/include/EAP.h b/lib/EAPBase/include/EAP.h
index 1596075..3ed730a 100644
--- a/lib/EAPBase/include/EAP.h
+++ b/lib/EAPBase/include/EAP.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 ///
diff --git a/lib/EAPBase/include/EAPXML.h b/lib/EAPBase/include/EAPXML.h
index 19132bc..c54a5c0 100644
--- a/lib/EAPBase/include/EAPXML.h
+++ b/lib/EAPBase/include/EAPXML.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <WinStd/COM.h>
diff --git a/lib/EAPBase/include/Method.h b/lib/EAPBase/include/Method.h
index 56698b0..b04b999 100644
--- a/lib/EAPBase/include/Method.h
+++ b/lib/EAPBase/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/EAPBase/include/Module.h b/lib/EAPBase/include/Module.h
index 80f5fa8..efe27da 100644
--- a/lib/EAPBase/include/Module.h
+++ b/lib/EAPBase/include/Module.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/EAPBase/include/UIContext.h b/lib/EAPBase/include/UIContext.h
index d876361..7f5e429 100644
--- a/lib/EAPBase/include/UIContext.h
+++ b/lib/EAPBase/include/UIContext.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016-2017 GÉANT
 */
 
 namespace eap
diff --git a/lib/EAPBase/src/Config.cpp b/lib/EAPBase/src/Config.cpp
index 45b8d66..d7647af 100644
--- a/lib/EAPBase/src/Config.cpp
+++ b/lib/EAPBase/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp
index 090527b..69b3fcf 100644
--- a/lib/EAPBase/src/Credentials.cpp
+++ b/lib/EAPBase/src/Credentials.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/EAP.cpp b/lib/EAPBase/src/EAP.cpp
index 7f1e063..d9f0259 100644
--- a/lib/EAPBase/src/EAP.cpp
+++ b/lib/EAPBase/src/EAP.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/Method.cpp b/lib/EAPBase/src/Method.cpp
index f8209cd..a8a2978 100644
--- a/lib/EAPBase/src/Method.cpp
+++ b/lib/EAPBase/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp
index 4bc7ece..c2494cb 100644
--- a/lib/EAPBase/src/Module.cpp
+++ b/lib/EAPBase/src/Module.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/PCH.cpp b/lib/EAPBase/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/EAPBase/src/PCH.cpp
+++ b/lib/EAPBase/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase/src/PCH.h b/lib/EAPBase/src/PCH.h
index 99e2842..7f552b8 100644
--- a/lib/EAPBase/src/PCH.h
+++ b/lib/EAPBase/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/EAPBase/src/UIContext.cpp b/lib/EAPBase/src/UIContext.cpp
index 7a787c1..8644979 100644
--- a/lib/EAPBase/src/UIContext.cpp
+++ b/lib/EAPBase/src/UIContext.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h
index 75f8a45..375436e 100644
--- a/lib/EAPBase_UI/include/EAP_UI.h
+++ b/lib/EAPBase_UI/include/EAP_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <wx/hyperlink.h>
diff --git a/lib/EAPBase_UI/include/Module.h b/lib/EAPBase_UI/include/Module.h
index d264056..074b9d2 100644
--- a/lib/EAPBase_UI/include/Module.h
+++ b/lib/EAPBase_UI/include/Module.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/EAPBase_UI/include/wxEAP_UIBase.h b/lib/EAPBase_UI/include/wxEAP_UIBase.h
index 39bd557..900d3eb 100644
--- a/lib/EAPBase_UI/include/wxEAP_UIBase.h
+++ b/lib/EAPBase_UI/include/wxEAP_UIBase.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxEAPCredentialsPanelBase;
diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp
index 8413315..fca9c5e 100644
--- a/lib/EAPBase_UI/src/EAP_UI.cpp
+++ b/lib/EAPBase_UI/src/EAP_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase_UI/src/Module.cpp b/lib/EAPBase_UI/src/Module.cpp
index b5ea6b4..0dedada 100644
--- a/lib/EAPBase_UI/src/Module.cpp
+++ b/lib/EAPBase_UI/src/Module.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase_UI/src/PCH.cpp b/lib/EAPBase_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/EAPBase_UI/src/PCH.cpp
+++ b/lib/EAPBase_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EAPBase_UI/src/PCH.h b/lib/EAPBase_UI/src/PCH.h
index 0d2ced9..2b48ea7 100644
--- a/lib/EAPBase_UI/src/PCH.h
+++ b/lib/EAPBase_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/EapHost/include/Config.h b/lib/EapHost/include/Config.h
index 6fea6a1..5dfcbfd 100644
--- a/lib/EapHost/include/Config.h
+++ b/lib/EapHost/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/EapHost/include/Credentials.h b/lib/EapHost/include/Credentials.h
index ecbc28c..ec1b9c7 100644
--- a/lib/EapHost/include/Credentials.h
+++ b/lib/EapHost/include/Credentials.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/EapHost/include/Method.h b/lib/EapHost/include/Method.h
index b1b0cbc..6e540a2 100644
--- a/lib/EapHost/include/Method.h
+++ b/lib/EapHost/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/EapHost/src/Config.cpp b/lib/EapHost/src/Config.cpp
index c910a2a..82a15b5 100644
--- a/lib/EapHost/src/Config.cpp
+++ b/lib/EapHost/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost/src/Credentials.cpp b/lib/EapHost/src/Credentials.cpp
index 1a5dfd3..ce8751a 100644
--- a/lib/EapHost/src/Credentials.cpp
+++ b/lib/EapHost/src/Credentials.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost/src/EapHost.cpp b/lib/EapHost/src/EapHost.cpp
index a741dc5..ba481f7 100644
--- a/lib/EapHost/src/EapHost.cpp
+++ b/lib/EapHost/src/EapHost.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost/src/Method.cpp b/lib/EapHost/src/Method.cpp
index 2505b7b..4952f7f 100644
--- a/lib/EapHost/src/Method.cpp
+++ b/lib/EapHost/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost/src/PCH.cpp b/lib/EapHost/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/EapHost/src/PCH.cpp
+++ b/lib/EapHost/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost/src/PCH.h b/lib/EapHost/src/PCH.h
index 012050f..df33c80 100644
--- a/lib/EapHost/src/PCH.h
+++ b/lib/EapHost/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/EapHost_UI/include/EapHost_UI.h b/lib/EapHost_UI/include/EapHost_UI.h
index c620de1..425c7b8 100644
--- a/lib/EapHost_UI/include/EapHost_UI.h
+++ b/lib/EapHost_UI/include/EapHost_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "../../EAPBase_UI/include/EAP_UI.h"
diff --git a/lib/EapHost_UI/src/EapHost_UI.cpp b/lib/EapHost_UI/src/EapHost_UI.cpp
index d2832c6..fdd7b33 100644
--- a/lib/EapHost_UI/src/EapHost_UI.cpp
+++ b/lib/EapHost_UI/src/EapHost_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost_UI/src/PCH.cpp b/lib/EapHost_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/EapHost_UI/src/PCH.cpp
+++ b/lib/EapHost_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/EapHost_UI/src/PCH.h b/lib/EapHost_UI/src/PCH.h
index 1548d46..f8a92e0 100644
--- a/lib/EapHost_UI/src/PCH.h
+++ b/lib/EapHost_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/Events/MSIBuild/Makefile b/lib/Events/MSIBuild/Makefile
index 1c7779c..81dada9 100644
Binary files a/lib/Events/MSIBuild/Makefile and b/lib/Events/MSIBuild/Makefile differ
diff --git a/lib/Events/res/Events.rc b/lib/Events/res/Events.rc
index d399e6a..e5559b2 100644
Binary files a/lib/Events/res/Events.rc and b/lib/Events/res/Events.rc differ
diff --git a/lib/Events/src/Events.def b/lib/Events/src/Events.def
index 340550b..f52669a 100644
Binary files a/lib/Events/src/Events.def and b/lib/Events/src/Events.def differ
diff --git a/lib/Events/src/PCH.cpp b/lib/Events/src/PCH.cpp
index 4eb3828..ce084a8 100644
--- a/lib/Events/src/PCH.cpp
+++ b/lib/Events/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2020-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/Events/src/PCH.h b/lib/Events/src/PCH.h
index 79068ef..9c0a047 100644
--- a/lib/Events/src/PCH.h
+++ b/lib/Events/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2020-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/Events/src/Register.cpp b/lib/Events/src/Register.cpp
index ea326e1..bb45bd7 100644
--- a/lib/Events/src/Register.cpp
+++ b/lib/Events/src/Register.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2020-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2020-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC/include/Config.h b/lib/GTC/include/Config.h
index 206cd52..ff21557 100644
--- a/lib/GTC/include/Config.h
+++ b/lib/GTC/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/GTC/include/Method.h b/lib/GTC/include/Method.h
index 5b96337..40f6e87 100644
--- a/lib/GTC/include/Method.h
+++ b/lib/GTC/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/GTC/src/Config.cpp b/lib/GTC/src/Config.cpp
index 4844f55..57767a4 100644
--- a/lib/GTC/src/Config.cpp
+++ b/lib/GTC/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC/src/Method.cpp b/lib/GTC/src/Method.cpp
index 2aa045f..741659d 100644
--- a/lib/GTC/src/Method.cpp
+++ b/lib/GTC/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC/src/PCH.cpp b/lib/GTC/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/GTC/src/PCH.cpp
+++ b/lib/GTC/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC/src/PCH.h b/lib/GTC/src/PCH.h
index d3f93c7..56780a6 100644
--- a/lib/GTC/src/PCH.h
+++ b/lib/GTC/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/GTC_UI/include/GTC_UI.h b/lib/GTC_UI/include/GTC_UI.h
index fc65cf6..bbee1f1 100644
--- a/lib/GTC_UI/include/GTC_UI.h
+++ b/lib/GTC_UI/include/GTC_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "../../EAPBase_UI/include/EAP_UI.h"
diff --git a/lib/GTC_UI/src/GTC_UI.cpp b/lib/GTC_UI/src/GTC_UI.cpp
index d8236b6..26a6c30 100644
--- a/lib/GTC_UI/src/GTC_UI.cpp
+++ b/lib/GTC_UI/src/GTC_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC_UI/src/PCH.cpp b/lib/GTC_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/GTC_UI/src/PCH.cpp
+++ b/lib/GTC_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/GTC_UI/src/PCH.h b/lib/GTC_UI/src/PCH.h
index af5bb89..614ee9b 100644
--- a/lib/GTC_UI/src/PCH.h
+++ b/lib/GTC_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/MSCHAPv2/include/Config.h b/lib/MSCHAPv2/include/Config.h
index 12e4e6b..23b51b4 100644
--- a/lib/MSCHAPv2/include/Config.h
+++ b/lib/MSCHAPv2/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/MSCHAPv2/include/MSCHAPv2.h b/lib/MSCHAPv2/include/MSCHAPv2.h
index 337672f..e0331f7 100644
--- a/lib/MSCHAPv2/include/MSCHAPv2.h
+++ b/lib/MSCHAPv2/include/MSCHAPv2.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <WinStd/Crypt.h>
diff --git a/lib/MSCHAPv2/include/Method.h b/lib/MSCHAPv2/include/Method.h
index 7f477ed..c6ce34c 100644
--- a/lib/MSCHAPv2/include/Method.h
+++ b/lib/MSCHAPv2/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/MSCHAPv2/src/Config.cpp b/lib/MSCHAPv2/src/Config.cpp
index 7d9449b..e58e6df 100644
--- a/lib/MSCHAPv2/src/Config.cpp
+++ b/lib/MSCHAPv2/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2/src/MSCHAPv2.cpp b/lib/MSCHAPv2/src/MSCHAPv2.cpp
index cabd711..a5aafef 100644
--- a/lib/MSCHAPv2/src/MSCHAPv2.cpp
+++ b/lib/MSCHAPv2/src/MSCHAPv2.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp
index c820658..cee4026 100644
--- a/lib/MSCHAPv2/src/Method.cpp
+++ b/lib/MSCHAPv2/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2/src/PCH.cpp b/lib/MSCHAPv2/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/MSCHAPv2/src/PCH.cpp
+++ b/lib/MSCHAPv2/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2/src/PCH.h b/lib/MSCHAPv2/src/PCH.h
index 1c0315a..4007bfd 100644
--- a/lib/MSCHAPv2/src/PCH.h
+++ b/lib/MSCHAPv2/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h b/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
index c06fa2e..6f60ec3 100644
--- a/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
+++ b/lib/MSCHAPv2_UI/include/MSCHAPv2_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "../../EAPBase_UI/include/EAP_UI.h"
diff --git a/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp b/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp
index f484db8..775cd3b 100644
--- a/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp
+++ b/lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2_UI/src/PCH.cpp b/lib/MSCHAPv2_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/MSCHAPv2_UI/src/PCH.cpp
+++ b/lib/MSCHAPv2_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/MSCHAPv2_UI/src/PCH.h b/lib/MSCHAPv2_UI/src/PCH.h
index 1686018..affcc74 100644
--- a/lib/MSCHAPv2_UI/src/PCH.h
+++ b/lib/MSCHAPv2_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/PAP/include/Config.h b/lib/PAP/include/Config.h
index 18b5676..a0934a6 100644
--- a/lib/PAP/include/Config.h
+++ b/lib/PAP/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/PAP/include/Method.h b/lib/PAP/include/Method.h
index aab0fb6..84342e7 100644
--- a/lib/PAP/include/Method.h
+++ b/lib/PAP/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/PAP/src/Config.cpp b/lib/PAP/src/Config.cpp
index 636e52f..d9f2744 100644
--- a/lib/PAP/src/Config.cpp
+++ b/lib/PAP/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp
index 1597ff2..ec5f45a 100644
--- a/lib/PAP/src/Method.cpp
+++ b/lib/PAP/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/PAP/src/PCH.cpp b/lib/PAP/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/PAP/src/PCH.cpp
+++ b/lib/PAP/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/PAP/src/PCH.h b/lib/PAP/src/PCH.h
index 3651125..9b9ea17 100644
--- a/lib/PAP/src/PCH.h
+++ b/lib/PAP/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/PAP_UI/include/PAP_UI.h b/lib/PAP_UI/include/PAP_UI.h
index 90ff70d..2280455 100644
--- a/lib/PAP_UI/include/PAP_UI.h
+++ b/lib/PAP_UI/include/PAP_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "../../EAPBase_UI/include/EAP_UI.h"
diff --git a/lib/PAP_UI/src/PAP_UI.cpp b/lib/PAP_UI/src/PAP_UI.cpp
index b7eea70..8fccab5 100644
--- a/lib/PAP_UI/src/PAP_UI.cpp
+++ b/lib/PAP_UI/src/PAP_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/PAP_UI/src/PCH.cpp b/lib/PAP_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/PAP_UI/src/PCH.cpp
+++ b/lib/PAP_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/PAP_UI/src/PCH.h b/lib/PAP_UI/src/PCH.h
index 8776361..27892fe 100644
--- a/lib/PAP_UI/src/PCH.h
+++ b/lib/PAP_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/TLS/include/Config.h b/lib/TLS/include/Config.h
index e4d134b..6dff1dc 100644
--- a/lib/TLS/include/Config.h
+++ b/lib/TLS/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <WinStd/Common.h>
diff --git a/lib/TLS/include/Credentials.h b/lib/TLS/include/Credentials.h
index d671060..ab70e78 100644
--- a/lib/TLS/include/Credentials.h
+++ b/lib/TLS/include/Credentials.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/TLS/include/Method.h b/lib/TLS/include/Method.h
index 83f884e..f9bdeaa 100644
--- a/lib/TLS/include/Method.h
+++ b/lib/TLS/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TLS/include/Module.h b/lib/TLS/include/Module.h
index cd2c167..4eaec08 100644
--- a/lib/TLS/include/Module.h
+++ b/lib/TLS/include/Module.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TLS/src/Config.cpp b/lib/TLS/src/Config.cpp
index d325f92..0037497 100644
--- a/lib/TLS/src/Config.cpp
+++ b/lib/TLS/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp
index fc16a52..5b22060 100644
--- a/lib/TLS/src/Credentials.cpp
+++ b/lib/TLS/src/Credentials.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp
index 2ecbf3e..1e4f462 100644
--- a/lib/TLS/src/Method.cpp
+++ b/lib/TLS/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS/src/Module.cpp b/lib/TLS/src/Module.cpp
index 75bbab2..7474f9b 100644
--- a/lib/TLS/src/Module.cpp
+++ b/lib/TLS/src/Module.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS/src/PCH.cpp b/lib/TLS/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/TLS/src/PCH.cpp
+++ b/lib/TLS/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS/src/PCH.h b/lib/TLS/src/PCH.h
index 2eb9b11..fe92dd5 100644
--- a/lib/TLS/src/PCH.h
+++ b/lib/TLS/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h
index 731e264..3c75c25 100644
--- a/lib/TLS_UI/include/TLS_UI.h
+++ b/lib/TLS_UI/include/TLS_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "../../EAPBase_UI/include/EAP_UI.h"
diff --git a/lib/TLS_UI/src/PCH.cpp b/lib/TLS_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/TLS_UI/src/PCH.cpp
+++ b/lib/TLS_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TLS_UI/src/PCH.h b/lib/TLS_UI/src/PCH.h
index 6bbb55b..fb8fb80 100644
--- a/lib/TLS_UI/src/PCH.h
+++ b/lib/TLS_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp
index a0392cb..c5a5b93 100644
--- a/lib/TLS_UI/src/TLS_UI.cpp
+++ b/lib/TLS_UI/src/TLS_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/include/Config.h b/lib/TTLS/include/Config.h
index 718b293..7b8ec3e 100644
--- a/lib/TTLS/include/Config.h
+++ b/lib/TTLS/include/Config.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include <sal.h>
diff --git a/lib/TTLS/include/Credentials.h b/lib/TTLS/include/Credentials.h
index dd27087..209e460 100644
--- a/lib/TTLS/include/Credentials.h
+++ b/lib/TTLS/include/Credentials.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TTLS/include/Method.h b/lib/TTLS/include/Method.h
index 0c9ed7c..daee801 100644
--- a/lib/TTLS/include/Method.h
+++ b/lib/TTLS/include/Method.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TTLS/include/Module.h b/lib/TTLS/include/Module.h
index 2be6921..79d4ac3 100644
--- a/lib/TTLS/include/Module.h
+++ b/lib/TTLS/include/Module.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TTLS/include/TTLS.h b/lib/TTLS/include/TTLS.h
index ac4056b..1d60daa 100644
--- a/lib/TTLS/include/TTLS.h
+++ b/lib/TTLS/include/TTLS.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016-2017 GÉANT
 */
 
 /// \addtogroup EAPBaseMethod
diff --git a/lib/TTLS/src/Config.cpp b/lib/TTLS/src/Config.cpp
index 26d1c61..c1730a3 100644
--- a/lib/TTLS/src/Config.cpp
+++ b/lib/TTLS/src/Config.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/src/Credentials.cpp b/lib/TTLS/src/Credentials.cpp
index 4f45f84..4a0c27a 100644
--- a/lib/TTLS/src/Credentials.cpp
+++ b/lib/TTLS/src/Credentials.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/src/Method.cpp b/lib/TTLS/src/Method.cpp
index 9338b0b..fa84c17 100644
--- a/lib/TTLS/src/Method.cpp
+++ b/lib/TTLS/src/Method.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp
index eb41a56..91bf16c 100644
--- a/lib/TTLS/src/Module.cpp
+++ b/lib/TTLS/src/Module.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/src/PCH.cpp b/lib/TTLS/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/TTLS/src/PCH.cpp
+++ b/lib/TTLS/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS/src/PCH.h b/lib/TTLS/src/PCH.h
index fc03064..b2ea9e9 100644
--- a/lib/TTLS/src/PCH.h
+++ b/lib/TTLS/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/TTLS_UI/include/Module.h b/lib/TTLS_UI/include/Module.h
index 7f99bcc..e9b5454 100644
--- a/lib/TTLS_UI/include/Module.h
+++ b/lib/TTLS_UI/include/Module.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 namespace eap
diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h
index a466ff9..afec1fd 100644
--- a/lib/TTLS_UI/include/TTLS_UI.h
+++ b/lib/TTLS_UI/include/TTLS_UI.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 class wxTLSTunnelConfigWindow;
diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp
index c71af50..81b1567 100644
--- a/lib/TTLS_UI/src/Module.cpp
+++ b/lib/TTLS_UI/src/Module.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS_UI/src/PCH.cpp b/lib/TTLS_UI/src/PCH.cpp
index f4d85d0..dedf3fa 100644
--- a/lib/TTLS_UI/src/PCH.cpp
+++ b/lib/TTLS_UI/src/PCH.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/TTLS_UI/src/PCH.h b/lib/TTLS_UI/src/PCH.h
index 6151e37..a1a6ec9 100644
--- a/lib/TTLS_UI/src/PCH.h
+++ b/lib/TTLS_UI/src/PCH.h
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #pragma once
diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp
index 3f612ad..efe22c8 100644
--- a/lib/TTLS_UI/src/TTLS_UI.cpp
+++ b/lib/TTLS_UI/src/TTLS_UI.cpp
@@ -1,21 +1,7 @@
 /*
-    Copyright 2015-2020 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2015-2020 Amebis
+    Copyright © 2016 GÉANT
 */
 
 #include "PCH.h"
diff --git a/lib/WinStd b/lib/WinStd
index 7188af8..eb73ce9 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 7188af8e7172ca64789b57bf69a9511219f2762b
+Subproject commit eb73ce92edc1254be2c458bf86d056946fd5dbc0
diff --git a/lib/wxExtend b/lib/wxExtend
index 22acac4..3c2e59b 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit 22acac44f1010ff2d27eb50e7b94a537ae06cb61
+Subproject commit 3c2e59b56c7555f3436798f84afd7ad46aae42be