diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index 5c8dab98b1b6c2b1371ac4b47203c06473c5305a..38694e243451ca58c7aeee5dc6c71bb0a6d83aeb 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -1,5 +1,9 @@
 #!/usr/bin/perl
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
 ## 18/07/2014, Olivier Salaün
 ## Command-line client for the Test IdP Account Manager
 
@@ -335,4 +339,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index 8e3cbb81dbca386302cbfc05008f533446dd40d3..25c444080ff20609d325668bc807e28567fdd419 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 
-## Copyright (c) 2015 RENATER on behalf of the GÉANT project
-
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
 
 ## 15/09/2014, Olivier Salaün
 ## Web interface for the eduGAIN Access Check Account Manager
diff --git a/doc/edugain_test_idp_architecture.pdf b/doc/edugain_access_check_architecture.pdf
similarity index 100%
rename from doc/edugain_test_idp_architecture.pdf
rename to doc/edugain_access_check_architecture.pdf
diff --git a/lib/IdPAccountManager/AuthenticationToken.pm b/lib/IdPAccountManager/AuthenticationToken.pm
index 948af9e9445b434f9aa9634872c2750c9900d391..f64cbd533f8fc9a8ae8e4b2bc54dd2730a944538 100644
--- a/lib/IdPAccountManager/AuthenticationToken.pm
+++ b/lib/IdPAccountManager/AuthenticationToken.pm
@@ -1,5 +1,10 @@
 package IdPAccountManager::AuthenticationToken;
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
+
 use strict;
 
 use IdPAccountManager::Data::Authenticationtoken;
@@ -232,4 +237,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/SAMLMetadata.pm b/lib/IdPAccountManager/SAMLMetadata.pm
index 9901fdd534c1ab398a80a6417a8a71713256e7e3..64c48b71d94c70f135f4df4044710a3bd2bbc61b 100644
--- a/lib/IdPAccountManager/SAMLMetadata.pm
+++ b/lib/IdPAccountManager/SAMLMetadata.pm
@@ -1,5 +1,9 @@
 package IdPAccountManager::SAMLMetadata; 
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
 use strict;
 
 use IdPAccountManager::Tools;
@@ -380,4 +384,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/ServiceProvider.pm b/lib/IdPAccountManager/ServiceProvider.pm
index e6c28837bffeb2b70d0560ea2366971b065c39ca..6d07563214b7316869e3005ef559065362edf322 100644
--- a/lib/IdPAccountManager/ServiceProvider.pm
+++ b/lib/IdPAccountManager/ServiceProvider.pm
@@ -1,6 +1,10 @@
 package IdPAccountManager::ServiceProvider;
 use base 'IdPAccountManager::Data::Serviceprovider';
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
 use strict;
 
 use IdPAccountManager::Data::Serviceprovider;
@@ -97,4 +101,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/TestAccount.pm b/lib/IdPAccountManager/TestAccount.pm
index e325c51e3a14c6e84448d18d05b612ca7fac0dda..b87f5a087f51e62b6726f5d4aba7b120f025f4e0 100644
--- a/lib/IdPAccountManager/TestAccount.pm
+++ b/lib/IdPAccountManager/TestAccount.pm
@@ -1,5 +1,9 @@
 package IdPAccountManager::TestAccount;
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
 use strict;
 
 use IdPAccountManager::Data::Testaccount;
@@ -245,4 +249,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
diff --git a/lib/IdPAccountManager/TestAccount.pm.ORIG b/lib/IdPAccountManager/TestAccount.pm.ORIG
deleted file mode 100644
index de034a59597730cafbcb203b666fdf57dee72c78..0000000000000000000000000000000000000000
--- a/lib/IdPAccountManager/TestAccount.pm.ORIG
+++ /dev/null
@@ -1,36 +0,0 @@
-package IdPAccountManager::TestAccount;
-
-use Moose;
-use Moose::Util::TypeConstraints;
-
-subtype 'entityid',
-    as 'Str',
-    where { /^(urn:|http(s)?\:\/\/)/ },
-    message { "$_ is not a valide entityid"};
-
-has 'account_profile' => (is => 'ro',
-                          isa => 'Str',
-                          required => 1);
-has 'sp_entityid' => (is => 'rw',
-                      isa => 'entityid',
-                      required => 1,
-                      );
-
-#before 'new' => sub { print "about to call new\n"; };
-
-1; # Magic true value required at end of module
-__END__
-
-=head1 NAME
-
-IdPAccountManager::TestAccount - Manage test user accounts for the Test Identity Provider
-
-=head1 SYNOPSIS
-
-=head1 DESCRIPTION
-
-=head1 SUBROUTINES/METHODS
-
-=head1 AUTHOR
-
-Olivier Salaün (olivier.salaun@renater.fr)
diff --git a/lib/IdPAccountManager/Tools.pm b/lib/IdPAccountManager/Tools.pm
index 46f308e7f16d1743a4092155d398ea1a1a475875..a661d3a0bdfbecbfaca3c1805b4f31dcbd40d5a4 100644
--- a/lib/IdPAccountManager/Tools.pm
+++ b/lib/IdPAccountManager/Tools.pm
@@ -1,5 +1,9 @@
 package IdPAccountManager::Tools;
 
+## Copyright (c) GEANT
+## This software was developed by RENATER. The research leading to these results has received funding
+## from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).
+
 use Template;
 
 # load Template::Stash to make method tables visible
@@ -336,4 +340,6 @@ Olivier Salaün (olivier.salaun@renater.fr)
 
 =head1 LICENSE
 
-Copyright (c) 2015 RENATER on behalf of the GÉANT project
+Copyright (c) GEANT
+This software was developed by RENATER. The research leading to these results has received funding
+from the European Community¹s Seventh Framework Programme (FP7/2007-2013) under grant agreement nº 238875 (GÉANT).