Changing function names of liprivilege-control API

    [Issue#] SSDWSSP-309
    [Feature/Bug] N/A
    [Problem] N/A
    [Cause] Changing liprivilege API naming sheme
    [Solution] Tests for new functions
    [Verification] build, run, libprivilege tests should pass

Change-Id: Ib96b98546d9b68f03d4022415130c112e8129aeb

diff --git a/tests/libprivilege-control-tests/test_cases.cpp b/tests/libprivilege-control-tests/test_cases.cpp
index ed9c29a..7982568 100644 (file)
--- a/tests/libprivilege-control-tests/test_cases.cpp
+++ b/tests/libprivilege-control-tests/test_cases.cpp
@@ -781,8 +781,8 @@ RUNNER_TEST(privilege_control02_app_label_dir)
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
 
-    result = app_setup_path(APPID_DIR, TEST_APP_DIR, APP_PATH_PRIVATE);
-    RUNNER_ASSERT_MSG(result == 0, "app_setup_path() failed");
+    result = perm_app_setup_path(APPID_DIR, TEST_APP_DIR, APP_PATH_PRIVATE);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_setup_path() failed");
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for app dir");
@@ -795,8 +795,8 @@ RUNNER_TEST(privilege_control03_app_label_shared_dir)
 {
     int result;
 
-    result = app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APP_ID);
-    RUNNER_ASSERT_MSG(result != 0, "app_setup_path(APP_ID, APP_ID) didn't fail");
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APP_ID);
+    RUNNER_ASSERT_MSG(result != 0, "perm_app_setup_path(APP_ID, APP_ID) didn't fail");
 
     result = nftw(TEST_APP_DIR, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_APP_DIR);
@@ -804,8 +804,8 @@ RUNNER_TEST(privilege_control03_app_label_shared_dir)
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
 
-    result = app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APPID_SHARED_DIR);
-    RUNNER_ASSERT_MSG(result == 0, "app_setup_path() failed");
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APPID_SHARED_DIR);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_setup_path() failed");
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_shared_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for shared app dir");
@@ -851,27 +851,27 @@ RUNNER_CHILD_TEST(privilege_control06_revoke_permissions)
     int fd;
 
     // Revoke permissions
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    result = app_revoke_permissions(WGT_APP_ID);
+    result = perm_app_revoke_permissions(WGT_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(WGT_PARTNER_APP_ID);
+    result = perm_app_revoke_permissions(WGT_PARTNER_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(WGT_PLATFORM_APP_ID);
+    result = perm_app_revoke_permissions(WGT_PLATFORM_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    result = app_revoke_permissions(OSP_APP_ID);
+    result = perm_app_revoke_permissions(OSP_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(OSP_PARTNER_APP_ID);
+    result = perm_app_revoke_permissions(OSP_PARTNER_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(OSP_PLATFORM_APP_ID);
+    result = perm_app_revoke_permissions(OSP_PLATFORM_APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
@@ -1019,9 +1019,9 @@ RUNNER_TEST(privilege_control05_add_shared_dir_readers)
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in smack_accesses_new. Error: " << result);
 
     for (i = 0; i < 3; i++) {
-        (void)app_uninstall(app_labels[i]);
-        result = app_install(app_labels[i]);
-        RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in app_install.");
+        (void)perm_app_uninstall(app_labels[i]);
+        result = perm_app_install(app_labels[i]);
+        RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_install.");
 
         RUNNER_ASSERT(0 <= asprintf(&path, SMACK_RULES_DIR "/%s", app_labels[i]));
         fd = open(path, O_WRONLY, 0644);
@@ -1148,14 +1148,14 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege)
     smack_lsetlabel(APP_SET_PRIV_PATH, APP_ID "_symlink", SMACK_LABEL_EXEC);
 
     /**
-     * TODO This test should also verify set_app_privilege behavior for OSP and
+     * TODO This test should also verify perm_app_set_privilege behavior for OSP and
      * WRT apps. To do that we'll have to install real apps on device as a
      * precondition.
      */
 
     // Set APP privileges
-    result = set_app_privilege(APP_ID, NULL, APP_SET_PRIV_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(APP_ID, NULL, APP_SET_PRIV_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1185,15 +1185,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_wgt)
 {
     int result;
 
-    result = app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS_WGT, 1);
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS_WGT, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_wgt);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(WGT_APP_ID, "wgt", WGT_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(WGT_APP_ID, "wgt", WGT_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1214,15 +1214,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_wgt_partner)
 {
     int result;
 
-    result = app_enable_permissions(WGT_PARTNER_APP_ID, APP_TYPE_WGT_PARTNER, PRIVS_WGT, 1);
+    result = perm_app_enable_permissions(WGT_PARTNER_APP_ID, APP_TYPE_WGT_PARTNER, PRIVS_WGT, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_wgt_partner);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(WGT_PARTNER_APP_ID, "wgt_partner", WGT_PARTNER_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(WGT_PARTNER_APP_ID, "wgt_partner", WGT_PARTNER_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1242,15 +1242,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_wgt_platform)
 {
     int result;
 
-    result = app_enable_permissions(WGT_PLATFORM_APP_ID, APP_TYPE_WGT_PLATFORM, PRIVS_WGT, 1);
+    result = perm_app_enable_permissions(WGT_PLATFORM_APP_ID, APP_TYPE_WGT_PLATFORM, PRIVS_WGT, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_wgt_platform);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(WGT_PLATFORM_APP_ID, "wgt_platform", WGT_PLATFORM_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(WGT_PLATFORM_APP_ID, "wgt_platform", WGT_PLATFORM_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1270,15 +1270,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_osp)
 {
     int result;
 
-    result = app_enable_permissions(OSP_APP_ID, APP_TYPE_OSP, PRIVS_OSP, 1);
+    result = perm_app_enable_permissions(OSP_APP_ID, APP_TYPE_OSP, PRIVS_OSP, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_osp);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(OSP_APP_ID, NULL, OSP_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(OSP_APP_ID, NULL, OSP_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1298,15 +1298,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_osp_partner)
 {
     int result;
 
-    result = app_enable_permissions(OSP_PARTNER_APP_ID, APP_TYPE_OSP_PARTNER, PRIVS_OSP, 1);
+    result = perm_app_enable_permissions(OSP_PARTNER_APP_ID, APP_TYPE_OSP_PARTNER, PRIVS_OSP, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_osp_partner);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(OSP_PARTNER_APP_ID, NULL, OSP_PARTNER_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(OSP_PARTNER_APP_ID, NULL, OSP_PARTNER_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1326,15 +1326,15 @@ RUNNER_CHILD_TEST(privilege_control05_set_app_privilege_osp_platform)
 {
     int result;
 
-    result = app_enable_permissions(OSP_PLATFORM_APP_ID, APP_TYPE_OSP_PLATFORM, PRIVS_OSP, 1);
+    result = perm_app_enable_permissions(OSP_PLATFORM_APP_ID, APP_TYPE_OSP_PLATFORM, PRIVS_OSP, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
     result = test_have_all_accesses(rules_osp_platform);
     RUNNER_ASSERT_MSG(result == 1, "Permissions not added.");
 
-    result = set_app_privilege(OSP_PLATFORM_APP_ID, NULL, OSP_PLATFORM_APP_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_set_privilege(OSP_PLATFORM_APP_ID, NULL, OSP_PLATFORM_APP_PATH);
+    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in perm_app_set_privilege. Error: " << result);
 
     // Check if SMACK label really set
     char *label;
@@ -1418,41 +1418,41 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 
 
     // argument validation
-    result = add_api_feature(APP_TYPE_OSP, NULL, NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, NULL, NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
 
-    result = add_api_feature(APP_TYPE_OSP,"", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP,"", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
 
 
     // already existing features
-    result = add_api_feature(APP_TYPE_OSP,"http://tizen.org/privilege/messaging.read", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP,"http://tizen.org/privilege/messaging.read", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
 
-    result = add_api_feature(APP_TYPE_WGT,"http://tizen.org/privilege/messaging.sms", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_WGT,"http://tizen.org/privilege/messaging.sms", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
 
-    result = add_api_feature(APP_TYPE_OTHER,"http://tizen.org/privilege/messaging", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OTHER,"http://tizen.org/privilege/messaging", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
-    result = add_api_feature(APP_TYPE_OTHER,"http://tizen.org/messaging", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OTHER,"http://tizen.org/messaging", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
-    result = add_api_feature(APP_TYPE_OTHER,"http://messaging", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OTHER,"http://messaging", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
-    result = add_api_feature(APP_TYPE_OTHER,"messaging.read", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OTHER,"messaging.read", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
 
     // empty features
-    result = add_api_feature(APP_TYPE_OSP,"blahblah", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP,"blahblah", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
-    result = add_api_feature(APP_TYPE_WGT,"blahblah", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_WGT,"blahblah", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
-    result = add_api_feature(APP_TYPE_OTHER,"blahblah", NULL, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OTHER,"blahblah", NULL, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
 
 
@@ -1468,18 +1468,18 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 
 
     // empty rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, { NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, { NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == 0);
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { " \t\n", "\t \n", "\n\t  ", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { " \t\n", "\t \n", "\n\t  ", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == 0);
@@ -1487,44 +1487,44 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 
 
     // malformed rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed malformed", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed malformed", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "-malformed malformed rwxat", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "-malformed malformed rwxat", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "~/\"\\ malformed rwxat", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "~/\"\\ malformed rwxat", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "subject object rwxat something else", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "subject object rwxat something else", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
     result = file_exists(OSP_BLAHBLAH);
     RUNNER_ASSERT(result == -1);
 
 
     // correct rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed malformed maaaaaalformed", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "malformed malformed maaaaaalformed", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "malformed malformed r--a- -----" });
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "subject object foo", NULL }, NULL, 0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) { "subject object foo", NULL }, NULL, 0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "subject object ----- -----" });
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
             "subject    object\t rwxat",
             " \t \n",
             "subject2\tobject2 txarw",
@@ -1535,7 +1535,7 @@ RUNNER_TEST(privilege_control11_add_api_feature)
     osp_blahblah_check(__LINE__, { "subject object rwxat -----", "subject2 object2 rwxat -----"});
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
             "Sub::jE,ct object a-RwX",
             NULL
         }, NULL, 0);
@@ -1544,7 +1544,7 @@ RUNNER_TEST(privilege_control11_add_api_feature)
     remove_smack_files();
 
     // TODO For now identical/complementary rules are not merged.
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {
             "subject object rwxat",
             " \t \n",
             "subject object txarw",
@@ -1557,7 +1557,7 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 
 
     // empty group ids
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},0);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},0);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "a a ---a- -----"});
     result = file_exists(OSP_BLAHBLAH_DAC);
@@ -1566,20 +1566,20 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 
 
     // valid group ids
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},3);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},3);
     printf("%d \n", result);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "a a ---a- -----"});
     osp_blahblah_dac_check(__LINE__, {0,1,2});
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},1);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {0,1,2},1);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "a a ---a- -----"});
     osp_blahblah_dac_check(__LINE__, {0});
     remove_smack_files();
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {1,1,1},3);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE, (const char*[]) {"a a a",NULL},(const gid_t[]) {1,1,1},3);
     RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
     osp_blahblah_check(__LINE__, { "a a ---a- -----"});
     osp_blahblah_dac_check(__LINE__, {1,1,1});
@@ -1587,7 +1587,7 @@ RUNNER_TEST(privilege_control11_add_api_feature)
 }
 
 /*
- * Check app_install function
+ * Check perm_app_install function
  */
 RUNNER_TEST(privilege_control01_app_install)
 {
@@ -1596,10 +1596,10 @@ RUNNER_TEST(privilege_control01_app_install)
 
     unlink(SMACK_RULES_DIR APP_ID);
 
-    app_uninstall(APP_ID);
+    perm_app_uninstall(APP_ID);
 
-    result = app_install(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // checking if file really exists
     fd = open(SMACK_RULES_DIR APP_ID, O_RDONLY);
@@ -1607,24 +1607,24 @@ RUNNER_TEST(privilege_control01_app_install)
     close(fd);
 
     // try install second time app with the same ID - it should pass.
-    result = app_install(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 }
 
 /*
- * Check app_install function
+ * Check perm_app_install function
  */
 RUNNER_TEST(privilege_control07_app_uninstall)
 {
     int result;
     int fd = -1;
 
-    result = app_uninstall(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_uninstall returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_uninstall(APP_ID);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
 
     // checking if file really exists
     fd = open(SMACK_RULES_DIR APP_ID, O_RDONLY);
-    RUNNER_ASSERT_MSG(fd == -1, "SMACK file NOT deleted after app_uninstall");
+    RUNNER_ASSERT_MSG(fd == -1, "SMACK file NOT deleted after perm_app_uninstall");
     close(fd);
 }
 
@@ -1661,11 +1661,11 @@ RUNNER_TEST(privilege_control10_app_register_av)
     cleaning_smack_database_files();
 
     // Adding two apps before antivir
-    result = app_install(APP_TEST_APP_1);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_TEST_APP_1);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
-    result = app_install(APP_TEST_APP_2);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_TEST_APP_2);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // Adding antivir
     result = app_register_av(APP_TEST_AV_1);
@@ -1676,13 +1676,13 @@ RUNNER_TEST(privilege_control10_app_register_av)
     checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_2, "app_register_av(APP_TEST_AV_1)");
 
     // Adding third app
-    result = app_install(APP_TEST_APP_3);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_TEST_APP_3);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // Checking app accesses
-    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_1, "app_install(APP_TEST_APP_3)");
-    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_2, "app_install(APP_TEST_APP_3)");
-    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_3, "app_install(APP_TEST_APP_3)");
+    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_1, "perm_app_install(APP_TEST_APP_3)");
+    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_2, "perm_app_install(APP_TEST_APP_3)");
+    checkOnlyAvAccess(APP_TEST_AV_1, APP_TEST_APP_3, "perm_app_install(APP_TEST_APP_3)");
 
     // Adding second antivir
     result = app_register_av(APP_TEST_AV_2);
@@ -1717,11 +1717,11 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  * Test - Enabling all permissions with persistant mode enabled
  */
 
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
@@ -1744,7 +1744,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
         fclose(pFile);
 
     // Clean up
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
@@ -1752,7 +1752,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  * Test - Enabling all permissions with persistant mode disabled
  */
 
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 0);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 0);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
@@ -1775,7 +1775,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
         fclose(pFile);
 
     // Clean up
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
@@ -1783,7 +1783,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  * Test - Enabling all permissions in two complementary files
  */
 
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_R_AND_NO_R, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_R_AND_NO_R, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << result);
 
@@ -1806,7 +1806,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
         fclose(pFile);
 
     // Clean up
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
@@ -1815,7 +1815,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  */
 
     // Enable permission for rules 2 no r
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions without r. Result: " << result);
 
@@ -1838,7 +1838,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
         fclose(pFile);
 
     // Enable permission for rules 2
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app all permissions. Result: " << result);
 
@@ -1847,7 +1847,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
     RUNNER_ASSERT_MSG(result == 1, "Permissions all not added.");
 
     // Clean up
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
@@ -1856,7 +1856,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  */
 
     // Enable permission for rules 2 no r
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions without r. Result: " << result);
 
@@ -1879,7 +1879,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
         fclose(pFile);
 
     // Enable permission for rules 2
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_R, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_R, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error enabling app permissions with only r. Result: " << result);
 
@@ -1888,13 +1888,13 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
     RUNNER_ASSERT_MSG(result == 1, "Permissions with only r not added.");
 
     // Clean up
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 }
 
 /*
- * Until app_disable_permissions is not fixed this test should remain
+ * Until perm_app_disable_permissions is not fixed this test should remain
  * commented
  */
 /**
@@ -1909,12 +1909,12 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
 /*    int result;
 
     // Prepare permissions that we want to disable
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error enabling app permissions. Result: " << result);
 
     // Disable permissions
-    result = app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
+    result = perm_app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "Error disabling app permissions. Result: " << result);
 
@@ -1927,17 +1927,17 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  */
 /*
     // Prepare permissions that will not be disabled
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app first permissions. Result: " << result);
 
     // Prepare permissions that we want to disable
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app second permissions. Result: " << result);
 
     // Disable second permissions
-    result = app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
+    result = perm_app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "Error disabling app second permissions. Result: " << result);
 
@@ -1950,7 +1950,7 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
     RUNNER_ASSERT_MSG(result==1, "Some of second permissions disabled.");
 
     // Disable first permissions
-    result = app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS);
+    result = perm_app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "Error disabling app first permissions. Result: " << result);
 
@@ -1963,12 +1963,12 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
  */
 /*
     // Prepare permissions
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app permissions. Result: " << result);
 
     // Disable same permissions without r
-    result = app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R);
+    result = perm_app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "Error disabling app no r permissions. Result: " << result);
 
@@ -1980,12 +1980,12 @@ RUNNER_TEST(privilege_control11_app_enable_permissions)
     RUNNER_ASSERT_MSG(result!=1, "Not all no r permissions disabled.");
 
     // Prepare permissions
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2_NO_R, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             " Error adding app no r permissions. Result: " << result);
 
     // Disable all permissions
-    result = app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
+    result = perm_app_disable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
             "Error disabling app permissions. Result: " << result);
 }
@@ -2004,12 +2004,12 @@ RUNNER_TEST(privilege_control13_app_reset_permissions)
  */
 
     // Prepare permissions to reset
-    result = app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_OTHER, PRIVS2, 1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error adding app permissions. Result: " << result);
 
     // Reset permissions
-    result = app_reset_permissions(APP_ID);
+    result = perm_app_reset_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error reseting app permissions. Result: " << result);
 
@@ -2018,7 +2018,7 @@ RUNNER_TEST(privilege_control13_app_reset_permissions)
     RUNNER_ASSERT_MSG(result == 1, "Not all permissions added.");
 
     // Disable permissions
-    result = app_revoke_permissions(APP_ID);
+    result = perm_app_revoke_permissions(APP_ID);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error disabling app permissions. Result: " << result);
 }
@@ -2035,26 +2035,26 @@ RUNNER_TEST(privilege_control14_app_add_friend)
  * Test - making friends with no permissions on each other
  */
 
-    result = app_revoke_permissions(APP_FRIEND_1);
+    result = perm_app_revoke_permissions(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(APP_FRIEND_2);
+    result = perm_app_revoke_permissions(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    app_uninstall(APP_FRIEND_1);
-    app_uninstall(APP_FRIEND_2);
+    perm_app_uninstall(APP_FRIEND_1);
+    perm_app_uninstall(APP_FRIEND_2);
 
     // Installing friends to be
-    result = app_install(APP_FRIEND_1);
+    result = perm_app_install(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error installing first app. Result: " << result);
-    result = app_install(APP_FRIEND_2);
+    result = perm_app_install(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error installing second app. Result: " << result);
 
     // Making friends
-    result = app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
+    result = perm_app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error making friends. Errno: " << result);
 
@@ -2067,45 +2067,45 @@ RUNNER_TEST(privilege_control14_app_add_friend)
         " Error second one sided friednship failed. Result: " << result);
 
     // Clean up
-    result = app_revoke_permissions(APP_FRIEND_1);
+    result = perm_app_revoke_permissions(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(APP_FRIEND_2);
+    result = perm_app_revoke_permissions(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    app_uninstall(APP_FRIEND_1);
-    app_uninstall(APP_FRIEND_2);
+    perm_app_uninstall(APP_FRIEND_1);
+    perm_app_uninstall(APP_FRIEND_2);
 
 /**
  * Test - making friends with nonexisting friend
  */
 
     // Installing one friend
-    result = app_install(APP_FRIEND_1);
+    result = perm_app_install(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error installing first app. Errno: " << result);
 
     // Adding imaginairy friend as second
-    result = app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
+    result = perm_app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error making friends (first) with imaginairy friend failed. Result: "
         << result);
     // Adding imaginairy friend as first
-    result = app_add_friend(APP_FRIEND_2, APP_FRIEND_1);
+    result = perm_app_add_friend(APP_FRIEND_2, APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error making friends (second) with imaginairy friend failed. Result: "
         << result);
     // Clean up
-    result = app_revoke_permissions(APP_FRIEND_1);
+    result = perm_app_revoke_permissions(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(APP_FRIEND_2);
+    result = perm_app_revoke_permissions(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    app_uninstall(APP_FRIEND_1);
-    app_uninstall(APP_FRIEND_2);
+    perm_app_uninstall(APP_FRIEND_1);
+    perm_app_uninstall(APP_FRIEND_2);
 
 /**
  * Test - making friends with some permissions already added
@@ -2119,10 +2119,10 @@ RUNNER_TEST(privilege_control14_app_add_friend)
     { "r", "w", "x", "rw", "rx", "wx", "rwx", "rwxat" };
 
     // Installing friends to be
-    result = app_install(APP_FRIEND_1);
+    result = perm_app_install(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error installing first app. Result: " << result);
-    result = app_install(APP_FRIEND_2);
+    result = perm_app_install(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         " Error installing second app. Result: " << result);
 
@@ -2149,7 +2149,7 @@ RUNNER_TEST(privilege_control14_app_add_friend)
                 "Error in smack_accesses_apply. Result: " << result);
 
             // Adding friends
-            result = app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
+            result = perm_app_add_friend(APP_FRIEND_1, APP_FRIEND_2);
             RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
                 " Error making friends. Result: " << result);
 
@@ -2175,15 +2175,15 @@ RUNNER_TEST(privilege_control14_app_add_friend)
     }
 
     // Clean up
-    result = app_revoke_permissions(APP_FRIEND_1);
+    result = perm_app_revoke_permissions(APP_FRIEND_1);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
-    result = app_revoke_permissions(APP_FRIEND_2);
+    result = perm_app_revoke_permissions(APP_FRIEND_2);
     RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
         "Error revoking app permissions. Result: " << result);
 
-    app_uninstall(APP_FRIEND_1);
-    app_uninstall(APP_FRIEND_2);
+    perm_app_uninstall(APP_FRIEND_1);
+    perm_app_uninstall(APP_FRIEND_2);
 }
 
 static void smack_set_random_label_based_on_pid_on_self(void)
@@ -2295,10 +2295,10 @@ RUNNER_TEST(privilege_control15_app_id_from_socket)
                 RUNNER_ASSERT_MSG(0, "read failed: " << strerror(errno));
             }
             smack_label1[result] = '\0';
-            smack_label2 = app_id_from_socket(sock);
+            smack_label2 = perm_app_id_from_socket(sock);
             if (smack_label2 == NULL) {
                 close(sock);
-                RUNNER_ASSERT_MSG(0, "app_id_from_socket failed");
+                RUNNER_ASSERT_MSG(0, "perm_app_id_from_socket failed");
             }
             result = strcmp(smack_label1, smack_label2);
             if (result != 0) {
@@ -2334,13 +2334,13 @@ RUNNER_TEST(privilege_control16_app_setup_path){
 
     char *label = NULL;
 
-    RUNNER_ASSERT(PC_OPERATION_SUCCESS == app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label1));
+    RUNNER_ASSERT(PC_OPERATION_SUCCESS == perm_app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label1));
     RUNNER_ASSERT(0 == smack_lgetlabel(path3, &label, SMACK_LABEL_ACCESS));
     labelPtr.reset(label);
     label = NULL;
     RUNNER_ASSERT(0 == strcmp(labelPtr.get(), label1));
 
-    RUNNER_ASSERT(PC_OPERATION_SUCCESS == app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label2));
+    RUNNER_ASSERT(PC_OPERATION_SUCCESS == perm_app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label2));
     RUNNER_ASSERT(0 == smack_lgetlabel(path4, &label, SMACK_LABEL_EXEC));
     labelPtr.reset(label);
     label = NULL;
@@ -2370,26 +2370,26 @@ RUNNER_TEST(privilege_control17_appsettings_privilege)
     //prepare test
 
 
-    (void)app_uninstall(APP_TEST);
-    (void)app_uninstall(APP_1);
-    (void)app_uninstall(APP_2);
+    (void)perm_app_uninstall(APP_TEST);
+    (void)perm_app_uninstall(APP_1);
+    (void)perm_app_uninstall(APP_2);
 
     //install some app 1
-    ret = app_install(APP_1);
-    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in app_install." << ret);
+    ret = perm_app_install(APP_1);
+    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_install." << ret);
 
     mkdir(APP_1_DIR, S_IRWXU | S_IRGRP | S_IXGRP);
 
     //register settings folder for app 1
-    ret = app_setup_path(APP_1, APP_1_DIR, APP_PATH_SETTINGS_RW );
-    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in app_setup_path: " << ret);
+    ret = perm_app_setup_path(APP_1, APP_1_DIR, APP_PATH_SETTINGS_RW );
+    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_setup_path: " << ret);
 
     //install "app_test" and give it appsettings privilege
-    ret = app_install(APP_TEST);
-    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in app_install.");
+    ret = perm_app_install(APP_TEST);
+    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_install.");
 
 
-    ret = app_enable_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING, true);
+    ret = perm_app_enable_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING, true);
 
     RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS,
         " Error enabling app permissions. Result: " << ret);
@@ -2407,13 +2407,13 @@ RUNNER_TEST(privilege_control17_appsettings_privilege)
 
 
     //intstall another app: "app_2"
-    ret = app_install(APP_2);
-    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in app_install.");
+    ret = perm_app_install(APP_2);
+    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_install.");
 
     mkdir(APP_2_DIR, S_IRWXU | S_IRGRP | S_IXGRP);
     //register settings folder for that "app_2"
-    ret = app_setup_path(APP_2, APP_2_DIR, APP_PATH_SETTINGS_RW );
-    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in app_setup_path: " << ret);
+    ret = perm_app_setup_path(APP_2, APP_2_DIR, APP_PATH_SETTINGS_RW );
+    RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_setup_path: " << ret);
 
     //check if "app_test" has an RX access to the app "app_2"
     ret = smack_have_access(APP_TEST, APP_2, "rx");
@@ -2430,9 +2430,9 @@ RUNNER_TEST(privilege_control17_appsettings_privilege)
     rmdir(APP_1_DIR);
     rmdir(APP_2_DIR);
 
-    (void)app_uninstall(APP_TEST);
-    (void)app_uninstall(APP_1);
-    (void)app_uninstall(APP_2);
+    (void)perm_app_uninstall(APP_TEST);
+    (void)perm_app_uninstall(APP_1);
+    (void)perm_app_uninstall(APP_2);
 }
 
 RUNNER_TEST(privilege_control18_app_setup_path_public)
@@ -2448,8 +2448,8 @@ RUNNER_TEST(privilege_control18_app_setup_path_public)
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
 
-    result = app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_PUBLIC_RO);
-    RUNNER_ASSERT_MSG(result == 0, "app_setup_path() failed");
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_PUBLIC_RO);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_setup_path() failed");
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_public_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for shared app dir");
@@ -2473,8 +2473,8 @@ RUNNER_TEST(privilege_control19_app_setup_path_settings)
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
 
-    result = app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_SETTINGS_RW);
-    RUNNER_ASSERT_MSG(result == 0, "app_setup_path() failed");
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_SETTINGS_RW);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_setup_path() failed");
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_settings_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for shared app dir");
@@ -2506,12 +2506,12 @@ RUNNER_TEST(privilege_control20_early_rules)
 
     unlink(SMACK_RULES_DIR APP_ID);
 
-    app_uninstall(APP_ID);
+    perm_app_uninstall(APP_ID);
 
-    result = app_install(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
-    result = app_install(APP_TEST_APP_1);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(APP_TEST_APP_1);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
     // checking if file really exists
     fd = open(SMACK_RULES_DIR APP_ID, O_RDONLY);
@@ -2519,9 +2519,9 @@ RUNNER_TEST(privilege_control20_early_rules)
     RUNNER_ASSERT_MSG(fd >= 0, "File open failed: " << SMACK_RULES_DIR << APP_ID << " : " << fd << ". Errno: " << strerror(errno));
     fd = -1;
 
-    result = app_enable_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm, 1);
+    result = perm_app_enable_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm, 1);
     RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
-    result = app_enable_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm, 1);
+    result = perm_app_enable_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm, 1);
     RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
 
     file = fopen(SMACK_STARTUP_RULES_FILE, "r");
@@ -2549,8 +2549,8 @@ RUNNER_TEST(privilege_control20_early_rules)
 
     // Checking if "early rule" for APP_ID was really removed
     // We also should make sure that "early rules" for other apps wasn't removed
-    result = app_uninstall(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_uninstall returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_uninstall(APP_ID);
+    RUNNER_ASSERT_MSG(result == 0, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
     pass_1 = 1;
     pass_2 = 0;
 
@@ -2578,8 +2578,8 @@ RUNNER_TEST(privilege_control20_early_rules)
     RUNNER_ASSERT_MSG(pass_2 == 1, "Rule " << EARLY_RULE_SUBJECT << " " << APP_TEST_APP_1 << " " << EARLY_RULE_RIGHTS << " not found");
 
     // Removing and checking "early rule" for APP_TEST_APP_1
-       result = app_uninstall(APP_TEST_APP_1);
-       RUNNER_ASSERT_MSG(result == 0, "app_uninstall returned " << result << ". Errno: " << strerror(errno));
+       result = perm_app_uninstall(APP_TEST_APP_1);
+       RUNNER_ASSERT_MSG(result == 0, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
        pass_1 = 1;
        pass_2 = 1;