diff --git a/bin/account-manager.pl.in b/bin/account-manager.pl.in
index b50d708a961e329bd54bdec169c3569435a43b98..d8fc56ad5a22fd99f6e6e6bff6d5b71cbf681484 100755
--- a/bin/account-manager.pl.in
+++ b/bin/account-manager.pl.in
@@ -60,14 +60,14 @@ AccountManager::DB->register_db(
 my $db = AccountManager::DB->new();
 
 for ($action) {
-    when ('add_account')    { add_account()           }
-    when ('list_accounts')  { list_accounts()         }
-    when ('add_provider')   { add_provider()       }
-    when ('list_providers') { list_providers()     }
-    when ('add_token')      { add_token()   }
-    when ('get_token')      { get_token()   }
-    when ('list_tokens')    { list_tokens() }
-    when ('parse_metadata') { parse_metadata()  }
+    when ('add_account')    { add_account()    }
+    when ('list_accounts')  { list_accounts()  }
+    when ('add_services')   { add_service()    }
+    when ('list_services')  { list_services()  }
+    when ('add_token')      { add_token()      }
+    when ('get_token')      { get_token()      }
+    when ('list_tokens')    { list_tokens()    }
+    when ('parse_metadata') { parse_metadata() }
     default {
         pod2usage(
             -message => "invalid action '$action', aborting\n",
@@ -357,12 +357,12 @@ S<[B<--sp_entityid> I<string>]>
 B<account-manager-client.pl> B<parse_metadata>
 S<[B<--sp_entityid> I<string>]>
 
-B<account-manager-client.pl> B<add_provider>
+B<account-manager-client.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_providers>
+B<account-manager-client.pl> B<list_services>
 [B<--delete>]
 
 B<account-manager-client.pl> B<list_tokens>
@@ -440,8 +440,8 @@ Get informations on a token.
 
 Adds a new test account.
 
-    $> account-manager-client.pl add_provider \
+    $> account-manager-client.pl add_service \
     --sp_entityid https://test.federation.renater.fr/test/ressource \
     --displayname 'Test SP' --contacts email1@dom,email2@dom
 
-Adds a new Service provider
+Adds a new service provider