diff --git a/src/service/clmcservice/alertsapi/utilities.py b/src/service/clmcservice/alertsapi/utilities.py
index 3ec7a248e446d42efd48c1f1720884016d10a3a3..d0fb954436b8594fdc147b08a8e30a704d3bc01d 100644
--- a/src/service/clmcservice/alertsapi/utilities.py
+++ b/src/service/clmcservice/alertsapi/utilities.py
@@ -72,7 +72,8 @@ def get_resource_spec_policy_triggers(resource_spec_reference):
     policy_trigger_ids = {}
     # TODO next release - uncomment
     # sfc, sfc_i = resource_spec["metadata"]["sfc"], resource_spec["metadata"]["sfci"]
-    sfc, sfc_i = resource_spec["metadata"]["sfc"], "{0}_1".format(resource_spec["metadata"]["sfc"])
+    sfc = resource_spec["metadata"]["servicefunctionchain"]
+    sfc_i = "{0}_1".format(sfc)
 
     policies = resource_spec["topology_template"]["policies"]
     for policy in policies:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
index 6b86a032b13ba1054d30072901192a8d1dd2c8d8..30c6880a1cbf31fe3c6b1187413c6ae99e770a51 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-1.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR-ERROR
+  servicefunctionchain: companyA-VR-ERROR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
index 69996667aa2832144ebdda099f84563eb8862a1e..714cca026f9903ed1a1b6128bdcd287d8b4c3c53 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
@@ -4,7 +4,7 @@ metadata:
   template_name: Flame Test Tosca resource specification
 #  sfc: companyA-VR
 #  sfci: companyA-VR-premium-ERROR
-  sfc: companyA-VR-ERROR
+  servicefunctionchain: companyA-VR-ERROR
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
index 29b96ed22056a83c086f41f7b6ccb79559e1c561..b594fbf820a658e1f23fed32db63a551f965a723 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-3.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
index b57c83d524a3e391a66c1b27406c78bc57d5a4da..bdf4ab52458569b53deb1cfdccad3ed0adb4e59c 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
index 7584f49633b951f80e2786e4fb74484bcbb081cd..74f1c4d092d3b5a465bf71e015bb7c21bdf9b10a 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
index cbaa52c244a711f19faae6c94df48cab5f0ec92e..57ee02492f388e0745bdc4073b8b5375b60fb76d 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-1.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
index 6ad505f41cdba4d53afc8b6256fda7b24d591c76..7f021eb55606dc38b14e9d50b1701441efec018a 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-2.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
index 99fb147f966000f9fc682e5d5ef488e302d9f212..0dbe5655f584a198acff797faf542c1b9e37d7d5 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-3.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
index dbcc8cbc9fd542ca3099ae3673bed0337bddea6b..6c44aff0c9ef3637ec26d39bb76a4dab7f434e25 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-4.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
index e1ab90ef5f45e494c19866acff0ae1e35e67b80f..73c659281bea976ef506acdd5184195430f25d5a 100644
--- a/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/resource-spec/resources_valid_test_config-5.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
+  servicefunctionchain: companyA-VR
 #  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
diff --git a/src/test/clmctest/alerts/resources_test_config.yaml b/src/test/clmctest/alerts/resources_test_config.yaml
index 161ab8bebff06877fd0c8a9dc186589df0f35fae..9bd17df6fb473fcea31b132aeae249168e997d58 100644
--- a/src/test/clmctest/alerts/resources_test_config.yaml
+++ b/src/test/clmctest/alerts/resources_test_config.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame CLMC Alerts Integration Test
-  sfc: MS_Template_1
+  servicefunctionchain: MS_Template_1
   sfci: MS_I1