48 files changed, 48 insertions, 48 deletions
diff --git a/src/main/java/org/gnunet/util/ATSInformation.java b/src/main/java/org/gnunet/util/ATSInformation.java
index b93931b..fd0d477 100644
--- a/src/main/java/org/gnunet/util/ATSInformation.java
+++ b/src/main/java/org/gnunet/util/ATSInformation.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/AbsoluteTime.java b/src/main/java/org/gnunet/util/AbsoluteTime.java
index b6ab811..bc4e2f4 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTime.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTime.java
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
     GNUnet is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java b/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
index 54fb95f..9b27449 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTimeMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/BigIntegers.java b/src/main/java/org/gnunet/util/BigIntegers.java
index f3f9fa7..ae78e49 100644
--- a/src/main/java/org/gnunet/util/BigIntegers.java
+++ b/src/main/java/org/gnunet/util/BigIntegers.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2014 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Cancelable.java b/src/main/java/org/gnunet/util/Cancelable.java
index 173f4c0..16e1d06 100644
--- a/src/main/java/org/gnunet/util/Cancelable.java
+++ b/src/main/java/org/gnunet/util/Cancelable.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/CancellationToken.java b/src/main/java/org/gnunet/util/CancellationToken.java
index 079d9ca..b0ffa5c 100644
--- a/src/main/java/org/gnunet/util/CancellationToken.java
+++ b/src/main/java/org/gnunet/util/CancellationToken.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Client.java b/src/main/java/org/gnunet/util/Client.java
index 5ca60ce..6da6859 100644
--- a/src/main/java/org/gnunet/util/Client.java
+++ b/src/main/java/org/gnunet/util/Client.java
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
     GNUnet is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Configuration.java b/src/main/java/org/gnunet/util/Configuration.java
index 269d4a6..af98201 100644
--- a/src/main/java/org/gnunet/util/Configuration.java
+++ b/src/main/java/org/gnunet/util/Configuration.java
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
     GNUnet is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Connection.java b/src/main/java/org/gnunet/util/Connection.java
index 3f87180..77b8e08 100644
--- a/src/main/java/org/gnunet/util/Connection.java
+++ b/src/main/java/org/gnunet/util/Connection.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Continuation.java b/src/main/java/org/gnunet/util/Continuation.java
index e1027c0..7e184e8 100644
--- a/src/main/java/org/gnunet/util/Continuation.java
+++ b/src/main/java/org/gnunet/util/Continuation.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/GnunetMessage.java b/src/main/java/org/gnunet/util/GnunetMessage.java
index 89c7a80..35667f0 100644
--- a/src/main/java/org/gnunet/util/GnunetMessage.java
+++ b/src/main/java/org/gnunet/util/GnunetMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/HashCode.java b/src/main/java/org/gnunet/util/HashCode.java
index a93a867..9575f5c 100644
--- a/src/main/java/org/gnunet/util/HashCode.java
+++ b/src/main/java/org/gnunet/util/HashCode.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Helper.java b/src/main/java/org/gnunet/util/Helper.java
index 1462cf2..2876e81 100644
--- a/src/main/java/org/gnunet/util/Helper.java
+++ b/src/main/java/org/gnunet/util/Helper.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/MessageReceiver.java b/src/main/java/org/gnunet/util/MessageReceiver.java
index 548695f..a7aaa4e 100644
--- a/src/main/java/org/gnunet/util/MessageReceiver.java
+++ b/src/main/java/org/gnunet/util/MessageReceiver.java
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
     GNUnet is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
index 9beb632..ad6c96b 100644
--- a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
+++ b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/MessageTransmitter.java b/src/main/java/org/gnunet/util/MessageTransmitter.java
index 2b63c8c..afb28f4 100644
--- a/src/main/java/org/gnunet/util/MessageTransmitter.java
+++ b/src/main/java/org/gnunet/util/MessageTransmitter.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/MstCalllback.java b/src/main/java/org/gnunet/util/MstCalllback.java
index 33abd40..84af6e6 100644
--- a/src/main/java/org/gnunet/util/MstCalllback.java
+++ b/src/main/java/org/gnunet/util/MstCalllback.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/PeerIdentity.java b/src/main/java/org/gnunet/util/PeerIdentity.java
index 60197f2..f9dfb4e 100644
--- a/src/main/java/org/gnunet/util/PeerIdentity.java
+++ b/src/main/java/org/gnunet/util/PeerIdentity.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Program.java b/src/main/java/org/gnunet/util/Program.java
index 31b4924..34ee01e 100644
--- a/src/main/java/org/gnunet/util/Program.java
+++ b/src/main/java/org/gnunet/util/Program.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java
index 188d9ac..423a397 100644
--- a/src/main/java/org/gnunet/util/RelativeTime.java
+++ b/src/main/java/org/gnunet/util/RelativeTime.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/RelativeTimeMessage.java b/src/main/java/org/gnunet/util/RelativeTimeMessage.java
index ac4e66c..0c0b138 100644
--- a/src/main/java/org/gnunet/util/RelativeTimeMessage.java
+++ b/src/main/java/org/gnunet/util/RelativeTimeMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Resolver.java b/src/main/java/org/gnunet/util/Resolver.java
index f6c2e00..8cefa8e 100644
--- a/src/main/java/org/gnunet/util/Resolver.java
+++ b/src/main/java/org/gnunet/util/Resolver.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
index 1de7ac0..aa441be 100644
--- a/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
+++ b/src/main/java/org/gnunet/util/RunaboutMessageReceiver.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/RunaboutUtil.java b/src/main/java/org/gnunet/util/RunaboutUtil.java
index a82dc0a..199168b 100644
--- a/src/main/java/org/gnunet/util/RunaboutUtil.java
+++ b/src/main/java/org/gnunet/util/RunaboutUtil.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Scheduler.java b/src/main/java/org/gnunet/util/Scheduler.java
index ef801dd..11d682c 100644
--- a/src/main/java/org/gnunet/util/Scheduler.java
+++ b/src/main/java/org/gnunet/util/Scheduler.java
@@ -1,6 +1,6 @@
 /*
     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
     GNUnet is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Server.java b/src/main/java/org/gnunet/util/Server.java
index ccf977e..4cf8dd2 100644
--- a/src/main/java/org/gnunet/util/Server.java
+++ b/src/main/java/org/gnunet/util/Server.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Service.java b/src/main/java/org/gnunet/util/Service.java
index d815818..b1fdc94 100644
--- a/src/main/java/org/gnunet/util/Service.java
+++ b/src/main/java/org/gnunet/util/Service.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/Strings.java b/src/main/java/org/gnunet/util/Strings.java
index 1efaecf..b97eb0d 100644
--- a/src/main/java/org/gnunet/util/Strings.java
+++ b/src/main/java/org/gnunet/util/Strings.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/TestMessage.java b/src/main/java/org/gnunet/util/TestMessage.java
index b08a706..a9e9dfb 100644
--- a/src/main/java/org/gnunet/util/TestMessage.java
+++ b/src/main/java/org/gnunet/util/TestMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/UnknownMessageBody.java b/src/main/java/org/gnunet/util/UnknownMessageBody.java
index b978ec6..e0bba75 100644
--- a/src/main/java/org/gnunet/util/UnknownMessageBody.java
+++ b/src/main/java/org/gnunet/util/UnknownMessageBody.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/DsaPrng.java b/src/main/java/org/gnunet/util/crypto/DsaPrng.java
index c63375d..ddc7963 100644
--- a/src/main/java/org/gnunet/util/crypto/DsaPrng.java
+++ b/src/main/java/org/gnunet/util/crypto/DsaPrng.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
index 3b68425..815e24c 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdhePrivateKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java b/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
index 844bddf..db41e61 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdhePublicKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
index 46476d4..1e5e3e7 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPrivateKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java b/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
index 9142164..cee23d3 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaPublicKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
index 28dfb3e..e4cf940 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignature.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
index 499658a..bcca46d 100644
--- a/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
+++ b/src/main/java/org/gnunet/util/crypto/EcdsaSignedMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/Ed25519.java b/src/main/java/org/gnunet/util/crypto/Ed25519.java
index e335c99..686cb43 100644
--- a/src/main/java/org/gnunet/util/crypto/Ed25519.java
+++ b/src/main/java/org/gnunet/util/crypto/Ed25519.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
index 921d625..1a5e33a 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPrivateKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java b/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
index aa43a0b..fe03743 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaPublicKey.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignature.java b/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
index c9be7e5..5a31d94 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignature.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
index 04a2965..21f1b78 100644
--- a/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
+++ b/src/main/java/org/gnunet/util/crypto/EddsaSignedMessage.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
-  (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+  Copyright (C) 2012, 2013 Christian Grothoff (and other contributing authors)
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/crypto/package-info.java b/src/main/java/org/gnunet/util/crypto/package-info.java
index 8262249..4d2b082 100644
--- a/src/main/java/org/gnunet/util/crypto/package-info.java
+++ b/src/main/java/org/gnunet/util/crypto/package-info.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2014 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/getopt/Argument.java b/src/main/java/org/gnunet/util/getopt/Argument.java
index 34159d0..7183862 100644
--- a/src/main/java/org/gnunet/util/getopt/Argument.java
+++ b/src/main/java/org/gnunet/util/getopt/Argument.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/getopt/ArgumentAction.java b/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
index 077e71c..ffefdf2 100644
--- a/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
+++ b/src/main/java/org/gnunet/util/getopt/ArgumentAction.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/getopt/Parser.java b/src/main/java/org/gnunet/util/getopt/Parser.java
index cd1603a..ba47a9f 100644
--- a/src/main/java/org/gnunet/util/getopt/Parser.java
+++ b/src/main/java/org/gnunet/util/getopt/Parser.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/getopt/package-info.java b/src/main/java/org/gnunet/util/getopt/package-info.java
index 0e3bdf5..14a77ce 100644
--- a/src/main/java/org/gnunet/util/getopt/package-info.java
+++ b/src/main/java/org/gnunet/util/getopt/package-info.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published
diff --git a/src/main/java/org/gnunet/util/package-info.java b/src/main/java/org/gnunet/util/package-info.java
index df61afd..002b1f5 100644
--- a/src/main/java/org/gnunet/util/package-info.java
+++ b/src/main/java/org/gnunet/util/package-info.java
@@ -1,6 +1,6 @@
 /*
 This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 Christian Grothoff (and other contributing authors)
 GNUnet is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published