diff --git a/platform/src/policy.cpp b/platform/src/policy.cpp
index 2298241..eb66fcc 100644
--- a/platform/src/policy.cpp
+++ b/platform/src/policy.cpp
@@ -15,8 +15,8 @@
 #include "utarray.h"
 
 #define TABLE_NAME_SC "SERVICE_CHAINING_RULE"
-#define TABLE_NAME_SFF "SERVICE_FUNCTION_FORWARDER_PROFILE"
-#define TABLE_NAME_SF "SERVICE_FUNCTION_PROFILE"
+#define TABLE_NAME_SFF "SERVICE_FUNCTION_FORWARDER"
+#define TABLE_NAME_SF "SERVICE_FUNCTION"
 
 /******************************************************************************
  * Struct policy_enforcer
diff --git a/platform/test/test_resource/sce.json b/platform/test/test_resource/sce.json
index 2bff1b4..ce85f75 100644
--- a/platform/test/test_resource/sce.json
+++ b/platform/test/test_resource/sce.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -157,7 +157,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/resource/sce.json b/resource/sce.json
index 25bb6c1..179227a 100644
--- a/resource/sce.json
+++ b/resource/sce.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -155,7 +155,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/resource/table_info.conf b/resource/table_info.conf
index d5d0275..bce9ca6 100644
--- a/resource/table_info.conf
+++ b/resource/table_info.conf
@@ -10,7 +10,7 @@
     },
     {
         "table_id":1,
-        "table_name":"SERVICE_FUNCTION_FORWARDER_PROFILE",
+        "table_name":"SERVICE_FUNCTION_FORWARDER",
         "table_type":"plugin",
         "custom":{
             "key_type":"pointer",
@@ -19,7 +19,7 @@
     },
     {
         "table_id":2,
-        "table_name":"SERVICE_FUNCTION_PROFILE",
+        "table_name":"SERVICE_FUNCTION",
         "table_type":"plugin",
         "custom":{
             "key_type":"pointer",
diff --git a/test/test_data/resource/data_pkt_mirr_block.json b/test/test_data/resource/data_pkt_mirr_block.json
index 9d223bd..1289abe 100644
--- a/test/test_data/resource/data_pkt_mirr_block.json
+++ b/test/test_data/resource/data_pkt_mirr_block.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/data_pkt_mirr_bypass.json b/test/test_data/resource/data_pkt_mirr_bypass.json
index cc85fdd..10b7b1f 100644
--- a/test/test_data/resource/data_pkt_mirr_bypass.json
+++ b/test/test_data/resource/data_pkt_mirr_bypass.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/data_pkt_mirr_forward.json b/test/test_data/resource/data_pkt_mirr_forward.json
index 6ce2e09..1506ea4 100644
--- a/test/test_data/resource/data_pkt_mirr_forward.json
+++ b/test/test_data/resource/data_pkt_mirr_forward.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/data_pkt_stee_block.json b/test/test_data/resource/data_pkt_stee_block.json
index d724a90..5e971aa 100644
--- a/test/test_data/resource/data_pkt_stee_block.json
+++ b/test/test_data/resource/data_pkt_stee_block.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/data_pkt_stee_bypass.json b/test/test_data/resource/data_pkt_stee_bypass.json
index 7ba38c8..b30ab24 100644
--- a/test/test_data/resource/data_pkt_stee_bypass.json
+++ b/test/test_data/resource/data_pkt_stee_bypass.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/data_pkt_stee_forward.json b/test/test_data/resource/data_pkt_stee_forward.json
index a390b17..60d0194 100644
--- a/test/test_data/resource/data_pkt_stee_forward.json
+++ b/test/test_data/resource/data_pkt_stee_forward.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/mix_pkt_stee_forward.json b/test/test_data/resource/mix_pkt_stee_forward.json
index aae96fd..fdf45e7 100644
--- a/test/test_data/resource/mix_pkt_stee_forward.json
+++ b/test/test_data/resource/mix_pkt_stee_forward.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -40,7 +40,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",
diff --git a/test/test_data/resource/sce0.json b/test/test_data/resource/sce0.json
index a390b17..60d0194 100644
--- a/test/test_data/resource/sce0.json
+++ b/test/test_data/resource/sce0.json
@@ -1,7 +1,7 @@
 {
     "plugin_table": [
         {
-            "table_name": "SERVICE_FUNCTION_PROFILE",
+            "table_name": "SERVICE_FUNCTION",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-3333-000000000001",
@@ -23,7 +23,7 @@
             ]
         },
         {
-            "table_name": "SERVICE_FUNCTION_FORWARDER_PROFILE",
+            "table_name": "SERVICE_FUNCTION_FORWARDER",
             "table_content": [
                 {
                     "uuid": "00000000-0000-0000-2222-000000000001",