diff --git a/bin/access-check-manager.pl.in b/bin/access-check-manager.pl.in
index 7266172660920a76304c1430af879da328027b68..c56f9dfad4bd887d86b16d431fb01a3927919aa0 100755
--- a/bin/access-check-manager.pl.in
+++ b/bin/access-check-manager.pl.in
@@ -15,7 +15,7 @@ use Pod::Usage;
 
 use AccountManager::Account;
 use AccountManager::Metadata;
-use AccountManager::ServiceProvider;
+use AccountManager::Entity;
 use AccountManager::Token;
 use AccountManager::Tools;
 
@@ -195,7 +195,7 @@ sub add_service {
     ) unless $options{contacts};
 
     ## Check if entry already exists in DB first
-    my $provider = AccountManager::ServiceProvider->new(
+    my $provider = AccountManager::Entity->new(
         db       => $db,
         entityid => $options{sp_entityid}
     );
@@ -206,7 +206,7 @@ sub add_service {
         $provider->contacts($options{contacts});
         $provider->displayname($options{displayname}) if $options{displayname};
     } else {
-        $provider = AccountManager::ServiceProvider->new(
+        $provider = AccountManager::Entity->new(
             db          => $db,
             entityid    => $options{sp_entityid},
             contacts    => $options{contacts},
@@ -223,7 +223,7 @@ sub add_service {
 sub list_services {
     my %args;
 
-    my $providers = AccountManager::ServiceProvider->get_service_providers(db => $db, %args);
+    my $providers = AccountManager::Entity->get_entities(db => $db, %args);
 
     if (! @$providers) {
         printf "No service provider in DB\n";