sp_entityid -> entityid

t/cli.t

@@ -113,7 +113,7 @@ EOF
     # creation success
     ($out, $err, $rc) = run_executable(
         'access-check-manager.pl',
-        "--config $config_file add_account --profile foo --sp_entityid bar"
+        "--config $config_file add_account --profile foo --entityid bar"
     );
     ok($rc == 0, 'add account with mandatory option exit status');
     like($out, qr/Account created/, 'add account with mandatory option stdin output');
@@ -148,14 +148,14 @@ EOF
     is($out, '', 'add service without mandatory option stdin output');
     like(
         $err,
-        qr/missing sp_entityid option, aborting/,
+        qr/missing entityid option, aborting/,
         'add service without mandatory option stderr output'
     );
 
     # creation success
     ($out, $err, $rc) = run_executable(
         'access-check-manager.pl',
-        "--config $config_file add_service --sp_entityid bar --contacts joe,bob"
+        "--config $config_file add_service --entityid bar --contacts joe,bob"
     );
     ok($rc == 0, 'add service with mandatory option exit status');
     like($out, qr/Service Provider created/, 'add service with mandatory option stdin output');
@@ -197,7 +197,7 @@ EOF
     # creation success
     ($out, $err, $rc) = run_executable(
         'access-check-manager.pl',
-        "--config $config_file add_token --sp_entityid bar --email_address joe"
+        "--config $config_file add_token --entityid bar --email_address joe"
     );
     ok($rc == 0, 'add token with mandatory option exit status');
     like($out, qr/Authentication token created/, 'add token with mandatory option stdin output');
@@ -209,7 +209,7 @@ EOF
         "--config $config_file list_tokens"
     );
     ok($rc == 0, 'list tokens exit status');
-    like($out, qr/Token ID=\d+; token=\w+; email_address=joe; sp_entityid=bar/, 'list tokens stdin output');
+    like($out, qr/Token ID=\d+; token=\w+; email_address=joe; entityid=bar/, 'list tokens stdin output');
     is($err, '', 'list tokens stderr output');
 }