diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index 504cd1261f1006e8444ab3dfb4c8538b63e264a3..4c8f4e066c094271472a2e79f61300f86fb05754 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -343,42 +343,42 @@ __END__
 
 =head1 NAME
 
-account-manager-client.pl - Command line client to the Test IdP Account manager
+account-manager.pl - Command line client to the Test IdP Account manager
 
 =head1 SYNOPSIS
 
-B<account-manager-client.pl> B<add_account>
+B<account-manager.pl> B<add_account>
 S<B<--profile> I<string>>
 S<B<--sp_entityid> I<string>>
 
-B<account-manager-client.pl> B<list_accounts>
+B<account-manager.pl> B<list_accounts>
 S<[B<--profile> I<string>]>
 S<[B<--sp_entityid> I<string>]>
 [B<--filter_expired>]
 [B<--delete>]
 
-B<account-manager-client.pl> B<parse_metadata>
+B<account-manager.pl> B<parse_metadata>
 S<[B<--sp_entityid> I<string>]>
 
-B<account-manager-client.pl> B<add_service>
+B<account-manager.pl> B<add_service>
 S<B<--sp_entityid> I<string>>
 S<B<--contact> I<string>>
 S<[B<--displayname> I<string>]>
 
-B<account-manager-client.pl> B<list_services>
+B<account-manager.pl> B<list_services>
 [B<--delete>]
 
-B<account-manager-client.pl> B<list_tokens>
+B<account-manager.pl> B<list_tokens>
 S<B<--sp_entityid> I<string>>
 S<[B<--token> I<string>]>
 [B<--filter_expired>]
 [B<--delete>]
 
-B<account-manager-client.pl> B<get_token>
+B<account-manager.pl> B<get_token>
 S<B<--sp_entityid> I<string>>
 S<[B<--token> I<string>]>
 
-B<account-manager-client.pl> B<add_token>
+B<account-manager.pl> B<add_token>
 S<B<--sp_entityid> I<string>>
 S<B<--email_address> I<string>>
 
@@ -390,60 +390,60 @@ functions.
 
 =head1 EXAMPLES
 
-    $> account-manager-client.pl add_account \
+    $> account-manager.pl add_account \
     --sp_entityid https://test.federation.renater.fr/test/ressource \
     --profile student1
 
 Adds a new test account.
 
-    $> account-manager-client.pl list_accounts \
+    $> account-manager.pl list_accounts \
     --sp_entityid https://test.federation.renater.fr/test/ressource \
     --profile student1
 
 List all test accounts. Criterias can be added to filter test accounts.
 
-    $> account-manager-client.pl list_accounts --filter_expired
+    $> account-manager.pl list_accounts --filter_expired
 
 List all expired test accounts.
 
-    $> account-manager-client.pl list_accounts --filter_expired \
+    $> account-manager.pl list_accounts --filter_expired \
     --delete
 
 Remove all expired test accounts from DB.
 
-    $> account-manager-client.pl parse_metadata
+    $> account-manager.pl parse_metadata
 
 Parses the SAML metadata file, as defined by the
 C<federation_metadata_file> configuration parameter.
 
-    $> account-manager-client.pl list_tokens \
+    $> account-manager.pl list_tokens \
     --sp_entityid https://test.federation.renater.fr/test/ressource \
     --token dhj67sjJ
 
 List all authentication tokens. Criterias can be added to filter tokens.
 
-    $> account-manager-client.pl list_tokens \
+    $> account-manager.pl list_tokens \
     --filter_expired
 
 List all expired authentication tokens.
 
-    $> account-manager-client.pl list_tokens \
+    $> account-manager.pl list_tokens \
     --filter_expired --delete
 
 Remove all expired authentication tokens from DB.
 
-    $> account-manager-client.pl get_token \
+    $> account-manager.pl get_token \
     --token dhj67sjJ
 
 Get informations on a token.
 
-    $> account-manager-client.pl add_token \
+    $> account-manager.pl add_token \
     --email_address john@my.fqdn \
     --sp_entityid https://test.federation.renater.fr/test/ressource
 
 Adds a new test account.
 
-    $> account-manager-client.pl add_service \
+    $> account-manager.pl add_service \
     --sp_entityid https://test.federation.renater.fr/test/ressource \
     --displayname 'Test SP' --contacts email1@dom,email2@dom