diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenDefinitionSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenDefinitionSpec.groovy
similarity index 92%
rename from fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenDefinitionSpec.groovy
rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenDefinitionSpec.groovy
index 60eb4c0908..bf36ac749a 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenDefinitionSpec.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenDefinitionSpec.groovy
@@ -25,10 +25,10 @@ import spock.lang.Shared
 import spock.lang.Stepwise
 
 @Prefix("ssc.token-definitions") @FcliSession(SSC) @Stepwise
-class SSCTokenDefinitionSpec extends FcliBaseSpec {
+class SSCAccessControlTokenDefinitionSpec extends FcliBaseSpec {
     
     def "list"() {
-        def args = "ssc token list-definitions"
+        def args = "ssc ac list-token-definitions"
         when:
             def result = Fcli.run(args)
         then:
diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenSpec.groovy
similarity index 81%
rename from fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenSpec.groovy
rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenSpec.groovy
index 98c0a5610b..821e1efcc1 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCTokenSpec.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlTokenSpec.groovy
@@ -26,13 +26,13 @@ import spock.lang.Stepwise
 
 @Prefix("ssc.token") @FcliSession(SSC) @Stepwise
 @Requires({System.getProperty('ft.ssc.user') && System.getProperty('ft.ssc.password')})
-class SSCTokenSpec extends FcliBaseSpec {
+class SSCAccessControlTokenSpec extends FcliBaseSpec {
     String user = System.getProperty('ft.ssc.user');
     String pass = System.getProperty('ft.ssc.password');
     
     
     def "create"() {
-        def args = "ssc token create CIToken --expire-in='5m' --user=$user --password=$pass --store token"
+        def args = "ssc ac create-token CIToken --expire-in='5m' --user=$user --password=$pass --store token"
         when:
             def result = Fcli.run(args)
         then:
@@ -44,7 +44,7 @@ class SSCTokenSpec extends FcliBaseSpec {
     }
     
     def "verifyCreated"() {
-        def args = "ssc token list -q id==#var('token').id --user=$user --password=$pass"
+        def args = "ssc ac list-tokens -q id==#var('token').id --user=$user --password=$pass"
         when:
             def result = Fcli.run(args)
         then:
@@ -56,7 +56,7 @@ class SSCTokenSpec extends FcliBaseSpec {
     }
 
     def "update"() {
-        def args = "ssc token update --description=updatedDescription --user=$user --password=$pass ::token::id -o table=id,description"
+        def args = "ssc ac update-token --description=updatedDescription --user=$user --password=$pass ::token::id -o table=id,description"
         when:
             def result = Fcli.run(args)
         then:
@@ -68,7 +68,7 @@ class SSCTokenSpec extends FcliBaseSpec {
     }
     
     def "verifyUpdated"() {
-        def args = "ssc token list -q id==#var('token').id --user=$user --password=$pass -o table=id,description"
+        def args = "ssc ac list-tokens -q id==#var('token').id --user=$user --password=$pass -o table=id,description"
         when:
             def result = Fcli.run(args)
         then:
@@ -80,7 +80,7 @@ class SSCTokenSpec extends FcliBaseSpec {
     }
     
     def "revoke"() {
-        def args = "ssc token revoke ::token::restToken --user=$user --password=$pass"
+        def args = "ssc ac revoke-token ::token::restToken --user=$user --password=$pass"
         when:
             def result = Fcli.run(args)
         then:
@@ -92,7 +92,7 @@ class SSCTokenSpec extends FcliBaseSpec {
     }
     
     def "verifyRevoked"() {
-        def args = "ssc token list -q id==#var('token').id --user=$user --password=$pass"
+        def args = "ssc ac list-tokens -q id==#var('token').id --user=$user --password=$pass"
         when:
             def result = Fcli.run(args)
         then:
diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCUserSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlUserSpec.groovy
similarity index 85%
rename from fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCUserSpec.groovy
rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlUserSpec.groovy
index 3564fb19b7..0a3458d16e 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCUserSpec.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/SSCAccessControlUserSpec.groovy
@@ -26,7 +26,7 @@ import spock.lang.Shared
 import spock.lang.Stepwise
 
 @Prefix("ssc.user") @FcliSession(SSC) @Stepwise
-class SSCUserSpec extends FcliBaseSpec {
+class SSCAccessControlUserSpec extends FcliBaseSpec {
     @Shared private final String random = System.currentTimeMillis()
     @Shared private final String userName = "fclitemporarytestuser"+random
     
@@ -35,7 +35,7 @@ class SSCUserSpec extends FcliBaseSpec {
     @Shared private String mailval = "email: \"$random@mail.mail\""
     
     def "list"() {
-        def args = "ssc user list --store users"
+        def args = "ssc ac list-users --store users"
         when:
             def result = Fcli.run(args)
         then:
@@ -47,7 +47,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "create"() {
-        def args = "ssc user create --username $userName --password P@ssW._ord123 --pne --suspend --rpc --firstname fName --lastname lName --email $random@mail.mail --roles viewonly --store user"
+        def args = "ssc ac create-user --username $userName --password P@ssW._ord123 --pne --suspend --rpc --firstname fName --lastname lName --email $random@mail.mail --roles viewonly --store user"
         when:
             def result = Fcli.run(args)
         then:
@@ -62,7 +62,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "get.byId"() {
-        def args = "ssc user get ::user::id"
+        def args = "ssc ac get-user ::user::id"
         when:
             def result = Fcli.run(args)
         then:
@@ -73,7 +73,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "get.byName"() {
-        def args = "ssc user get ::user::userName"
+        def args = "ssc ac get-user ::user::userName"
         when:
             def result = Fcli.run(args)
         then:
@@ -84,7 +84,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "get.byMail"() {
-        def args = "ssc user get ::user::email"
+        def args = "ssc ac get-user ::user::email"
         when:
             def result = Fcli.run(args)
         then:
@@ -95,7 +95,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "delete"() {
-        def args = "ssc user delete ::user::id"
+        def args = "ssc ac delete-user ::user::id"
         when:
             def result = Fcli.run(args)
         then:
@@ -106,7 +106,7 @@ class SSCUserSpec extends FcliBaseSpec {
     }
     
     def "verifyDeleted"() {
-        def args = "ssc user list --store users"
+        def args = "ssc ac list-users --store users"
         when:
             def result = Fcli.run(args)
         then: