diff --git a/docs/AlertsSpecification.md b/docs/AlertsSpecification.md
index e97729aadb7549346a5d51474d0bf2e8b7066695..5201432f1ba42f1322c39dc90f5cfbbcea8f06c6 100644
--- a/docs/AlertsSpecification.md
+++ b/docs/AlertsSpecification.md
@@ -54,8 +54,7 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
 
 topology_template:
 
@@ -114,6 +113,7 @@ topology_template:
             condition:
               threshold: 100  # requests have increased by at least 100
               granularity: 120
+              aggregation_method: mean
               resource_type:
                 flame_sfp: storage
                 flame_sf: storage-users
@@ -132,6 +132,7 @@ topology_template:
             condition:
               threshold: -100  # requests have decreased by at least 100
               granularity: 120
+              aggregation_method: mean
               resource_type:
                 flame_sfp: storage
                 flame_sf: storage-users
@@ -163,13 +164,12 @@ topology_template:
 
 ##### Metadata
 
-The ***metadata*** section specifies the service function chain ID and the service function chain instance ID, for which this 
+The ***metadata*** section specifies the service function chain ID, for which this 
 alerts specification relates to. The format is the following:
 
 ```yaml
 metadata:
-    sfc: <sfc_id>
-    sfci: <sfc_i_id>
+    servicefunctionchain: <sfc_id>
 ```
 
 ##### Policies
@@ -224,7 +224,7 @@ the format is still the same for consistency. Therefore, using `<measurement>.*`
 
 * **threshold** -
     * for **threshold** event type, this is the critical value the queried metric is compared to.
-    * for **relative** event type, this is the critical value the difference (between the current metric value and the past metric value) is compared to.
+    * for **relative** event type, this is the critical value the difference (between the current aggregated metric value and the past aggregated metric value) is compared to.
     * for **deadman** event type, this is the critical value the number of measurement points (received in InfluxDB) is compared to.
 
 * **granularity** - period in seconds
@@ -233,10 +233,10 @@ the format is still the same for consistency. Therefore, using `<measurement>.*`
     * for **deadman** event type, this value specifies how long the span in time (in which the number of measurement points are checked) is 
 
 * **aggregation_method** - the function to use when querying InfluxDB, e.g. median, mean, etc. This value is only used when
-the event_type is set to **threshold**.
+the event_type is set to **threshold** or **relative**.
 
 * **resource_type** - provides context for the given event - key-value pairs for the global tags of the CLMC Information Model.
-This includes any of the following: `"flame_sfp", "flame_sf", "flame_sfe", "flame_server", "flame_location"`. 
+This includes any of the following: `"flame_sfp", "flame_sf", "flame_server", "flame_location"`. 
 Keep in mind that **flame_sfc** and **flame_sfci** are also part of the CLMC Information Model. However, filtering on 
 these tags is automatically generated and added to all InfluxDB queries by using the metadata values from the 
 alerts specification. Therefore, including **flame_sfc** and **flame_sfci** in the **resource_type** is considered INVALID.  
@@ -294,7 +294,7 @@ result of the comparison operation is true, an alert is triggered. For example:
     "neq" : "not equal"
     ```
 
-* **relative** - A relative event type is an alert in which Kapacitor computes the difference between the current value of a metric and the value
+* **relative** - A relative event type is an alert in which Kapacitor computes the difference between the current aggregated value of a metric and the aggregated value
 reported a given period of time ago. The difference between the current and the past value is then compared against a given
 threshold. If the result of the comparison operation is true, an alert is triggered. For example:
 
@@ -308,6 +308,7 @@ threshold. If the result of the comparison operation is true, an alert is trigge
         condition:
           threshold: -100
           granularity: 120
+          aggregation_method: mean
           resource_type:
             flame_sfp: storage
             flame_sf: storage-users
@@ -318,8 +319,8 @@ threshold. If the result of the comparison operation is true, an alert is trigge
             - flame_sfemc
     ```
     
-    This trigger specification will create an alert task in Kapacitor, which compares every **requests** value reported in 
-    measurement **storage** with the value received **120** seconds ago. If the difference between the current and the past
+    This trigger specification will create an alert task in Kapacitor, which compares the mean **requests** value reported in measurement **storage** 
+    with the mean value received **120** seconds ago. If the difference between the current and the past
     value is less than or equal to (comparison operator is **lte**) **-100**, an alert is triggered. Simply explained, an alert
     is triggered if the **requests** current value has decreased by at least 100 relative to the value reported 120 seconds ago.
     The queried value is contextualised for service function **storage-users** (using service function package **storage**) 
@@ -329,6 +330,7 @@ threshold. If the result of the comparison operation is true, an alert is trigge
     
     * **aggregation_method** is not required here - the alert task compares the actual value that's being reported (stream mode)
     * if **aggregation_method** is provided, it will be ignored
+    * if X is the current timestamp, the current aggregated value refers to the period {X - granularity; X} while the past aggregated value refers to the period {X - 2*granularity; X - granularity}
 
 * **deadman** - A deadman event type is an alert in which Kapacitor computes the number of reported points in a measurement
 for a given period of time. This number is then compared to a given threshold value. If less number of points have been 
@@ -352,7 +354,7 @@ For example:
 
     This trigger specification will create an alert task in Kapacitor, which monitors the number of points reported in
     measurement **storage** and having tag **sfp** set as **storage**. This value is computed every 60 seconds.
-    If the number of reported points is less than **0** (no points have been reported for the last 60 seconds), an alert
+    If the number of reported points is less than or equal to **0** (no points have been reported for the last 60 seconds), an alert
     will be triggered. Triggered alerts will be sent through an HTTP POST message to the URLs listed in the **implementation** section.
     
     *Notes*:
diff --git a/docs/clmc-service.md b/docs/clmc-service.md
index c75df3c2471b180ed3b078fd9f78deb47b0052ff..01e5baee9904d7a8c949eb4513e03ab9d596b1fc 100644
--- a/docs/clmc-service.md
+++ b/docs/clmc-service.md
@@ -110,12 +110,12 @@ with **/clmc-service** so that the nginx reverse proxy server (listening on port
         The alert specification document is then parsed with the openstack TOSCA parser (https://github.com/openstack/tosca-parser/tree/master/toscaparser)
         and validated against the CLMC alerts specification schema (again check [documentation](AlertsSpecification.md) for more info on this). The TOSCA resource
         specification document is used only for consistency verification between the two documents - ensuring that they refer
-        to the same service function chain and service function chain instance, as well as making sure that there is at least one
+        to the same service function chain, as well as making sure that there is at least one
         trigger alert in the alerts specification that relates to a state change policy in the resources specification.
         
     * Example for sending a request with curl:
     
-        `curl -F "alert-spec=@alert-specification.yaml" -F "resource-spec=@resource-specification.yaml" http://loclahost:9080/alerts`
+        `curl -F "alert-spec=@alert-specification.yaml" -F "resource-spec=@resource-specification.yaml" http://localhost:9080/alerts`
         
         where **alert-specification.yaml** is the path to the alerts specification file and **resource-specification.yaml** is the
         path to the resource specification file.
diff --git a/scripts/clmc-service/nginx.conf b/scripts/clmc-service/nginx.conf
index 813ac0c7228b3874fc7775a2b8b0992d729da4dc..2c4029e3c12c29d669e6561475b424e8e7dd4806 100644
--- a/scripts/clmc-service/nginx.conf
+++ b/scripts/clmc-service/nginx.conf
@@ -26,7 +26,7 @@ http {
         location /kapacitor {
             proxy_pass http://127.0.0.1:9092; # N.B. No URI in the URL, passes the whole location preserving the prefix
             proxy_redirect off;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
@@ -34,7 +34,7 @@ http {
         location /clmc-service/ {
             proxy_pass http://127.0.0.1:9080/;
             proxy_redirect off;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
@@ -42,7 +42,7 @@ http {
         location /influxdb/ {
             proxy_pass http://127.0.0.1:8086/;
             proxy_redirect off;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
@@ -50,7 +50,7 @@ http {
         location /neo4j/ {
             proxy_pass http://127.0.0.1:7474/;
             proxy_redirect off;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
@@ -58,7 +58,7 @@ http {
         location /chronograf {
             proxy_pass http://127.0.0.1:8888; # No trailing slash - chronograf is configured to include '/chronograf' prefix in its routes
             proxy_redirect off;
-            proxy_set_header Host $host;
+            proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Host $server_name;
diff --git a/src/service/clmcservice/__init__.py b/src/service/clmcservice/__init__.py
index 70c6e76cad9a94cfca999f2b6f54ab717627c2b8..3d56991b194b5c23f742f7205d35fa003fa60489 100644
--- a/src/service/clmcservice/__init__.py
+++ b/src/service/clmcservice/__init__.py
@@ -60,6 +60,8 @@ def main(global_config, **settings):
 
     config = Configurator(settings=settings)
 
+    config.add_tween('clmcservice.tweens.accept_header_tween_factory')
+
     # add routes of the WHOAMI API
     config.add_route('whoami_endpoints', '/whoami/endpoints')
     config.add_route('whoami_endpoints_instance', 'whoami/endpoints/instance')
diff --git a/src/service/clmcservice/alertsapi/alerts_specification_schema.py b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
index ed2a5e749335db2d90a3da104512b3e6ff344a4f..3db515f5e7ce8be5119edba41664f83829ee706f 100644
--- a/src/service/clmcservice/alertsapi/alerts_specification_schema.py
+++ b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
@@ -65,17 +65,20 @@ URL_REGEX = re.compile(
     re.IGNORECASE)
 
 # Global tags allowed to be used for filtering in the trigger condition
-CLMC_INFORMATION_MODEL_GLOBAL_TAGS = {"flame_sfp", "flame_sf", "flame_sfe", "flame_server", "flame_location"}
-# NOTICE that "flame_sfc", "flame_sfci" are not allowed, eventhough they are part of the CLMC Information Model
+CLMC_INFORMATION_MODEL_GLOBAL_TAGS = {"flame_sfp", "flame_sf", "flame_server", "flame_location"}
+# NOTICE that "flame_sfc", "flame_sfci" are not allowed, even though they are part of the CLMC Information Model
 # This is because those two tags are automatically added to the InfluxDB queries - the required values are retrieved from the alert spec. metadata
+# "flame_sfe" cannot be used as well, because the value of this tag is only known at runtime.
 
 ALERTS_SPECIFICATION_SCHEMA = Schema({
     "tosca_definitions_version": And(str, lambda v: v == "tosca_simple_profile_for_nfv_1_0_0"),
     Optional("description"): str,
     "imports": And([lambda s: s.endswith("flame_clmc_alerts_definitions.yaml")], lambda l: len(l) == 1),
     "metadata": {
-        "sfc": str,
-        "sfci": str
+        "servicefunctionchain": str
+        # TODO next release - uncomment
+        # "sfc": str,
+        # "sfci": str
     },
     "topology_template": {
         "policies": [
diff --git a/src/service/clmcservice/alertsapi/tests.py b/src/service/clmcservice/alertsapi/tests.py
index 535db2350d8d3e19f038d275170a512f91c213b5..dd22396a0668642d2fc2b28c7712a20aa933e1e6 100644
--- a/src/service/clmcservice/alertsapi/tests.py
+++ b/src/service/clmcservice/alertsapi/tests.py
@@ -276,7 +276,9 @@ def extract_alert_spec_data(alert_spec):
     yaml_alert_spec = load(alert_spec)
     adjust_tosca_definitions_import(yaml_alert_spec)
     tosca_tpl = ToscaTemplate(yaml_dict_tpl=yaml_alert_spec)
-    sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+    # TODO next release - uncomment
+    # sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+    sfc, sfc_instance = tosca_tpl.tpl["metadata"]["servicefunctionchain"], "{0}_1".format(tosca_tpl.tpl["metadata"]["servicefunctionchain"])
 
     alert_ids = []  # saves all alert IDs in a list
     topic_handlers = {}  # saves all topics in a dictionary, each topic is linked to a list of handler pairs (a handler pair consists of handler id and handler url)
diff --git a/src/service/clmcservice/alertsapi/utilities.py b/src/service/clmcservice/alertsapi/utilities.py
index 53a144beb4797736746651526c2eafcf667c0d41..d0fb954436b8594fdc147b08a8e30a704d3bc01d 100644
--- a/src/service/clmcservice/alertsapi/utilities.py
+++ b/src/service/clmcservice/alertsapi/utilities.py
@@ -70,7 +70,10 @@ def get_resource_spec_policy_triggers(resource_spec_reference):
     resource_spec = load(resource_spec_reference.file)
 
     policy_trigger_ids = {}
-    sfc, sfc_i = resource_spec["metadata"]["sfc"], resource_spec["metadata"]["sfci"]
+    # TODO next release - uncomment
+    # sfc, sfc_i = resource_spec["metadata"]["sfc"], resource_spec["metadata"]["sfci"]
+    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/clmcservice/alertsapi/views.py b/src/service/clmcservice/alertsapi/views.py
index 72681ac34eb3e398971cbf3fddb41140c14b81ad..8e481a92d6b59c84929a15ba14596cd10e45eaba 100644
--- a/src/service/clmcservice/alertsapi/views.py
+++ b/src/service/clmcservice/alertsapi/views.py
@@ -142,7 +142,10 @@ class AlertsConfigurationAPI(object):
             raise HTTPBadRequest("Request alert specification file could not be validated as a CLMC TOSCA alerts specification document.")
 
         alert_spec_policy_triggers = get_alert_spec_policy_triggers(tosca_tpl)
-        sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+        # TODO next release - uncomment
+        # sfc, sfc_instance = tosca_tpl.tpl["metadata"]["sfc"], tosca_tpl.tpl["metadata"]["sfci"]
+        sfc = tosca_tpl.tpl["metadata"]["servicefunctionchain"]
+        sfc_instance = "{0}_1".format(sfc)
 
         # do validation between the two TOSCA documents
         self._compare_alert_and_resource_spec(sfc, sfc_instance, alert_spec_policy_triggers, resource_spec_sfc, resource_spec_sfc_i, resource_spec_policy_triggers)
diff --git a/src/service/clmcservice/tweens.py b/src/service/clmcservice/tweens.py
new file mode 100644
index 0000000000000000000000000000000000000000..a0f9eba9b5a7b4ef5298d32a089c410bb1d31c21
--- /dev/null
+++ b/src/service/clmcservice/tweens.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python3
+"""
+// © University of Southampton IT Innovation Centre, 2018
+//
+// Copyright in this software belongs to University of Southampton
+// IT Innovation Centre of Gamma House, Enterprise Road,
+// Chilworth Science Park, Southampton, SO16 7NS, UK.
+//
+// This software may not be used, sold, licensed, transferred, copied
+// or reproduced in whole or in part in any manner or form or in or
+// on any media by any person other than in accordance with the terms
+// of the Licence Agreement supplied with the software, or otherwise
+// without the prior written consent of the copyright owners.
+//
+// This software is distributed WITHOUT ANY WARRANTY, without even the
+// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE, except where stated in the Licence Agreement supplied with
+// the software.
+//
+//      Created By :            Nikolay Stanchev
+//      Created Date :          02-11-2018
+//      Created for Project :   FLAME
+"""
+
+
+def accept_header_tween_factory(handler, registry):
+    """
+    Since clmc-service is currently based on JSON only, make sure an application/json header is passed with the request
+    """
+
+    def accept_header_tween(request):
+        request.accept = 'application/json'
+        response = handler(request)
+        return response
+
+    return accept_header_tween
diff --git a/src/service/resources/TICKscript/deadman-template.tick b/src/service/resources/TICKscript/deadman-template.tick
index 730a4610b0d8bdf97164db121ed67fa7a3e2c95e..ae6d6859ebf144fc88ea970cbd3d1be9f885db45 100644
--- a/src/service/resources/TICKscript/deadman-template.tick
+++ b/src/service/resources/TICKscript/deadman-template.tick
@@ -34,4 +34,5 @@ stream
         .details('db=' + db + ',sfc=' + sfc + ',sfci=' + sfci + ',policy=' + policy)
         .message(messageValue)
         .topic(topicID)
-        .noRecoveries()
\ No newline at end of file
+        .noRecoveries()
+        .stateChangesOnly()
\ No newline at end of file
diff --git a/src/service/resources/TICKscript/relative-template.tick b/src/service/resources/TICKscript/relative-template.tick
index 669954bfd91b8ee6aad243a1fba01e9a54ab4bb9..1b27df7935ba4beef35190389e3d7fcb6d521c55 100644
--- a/src/service/resources/TICKscript/relative-template.tick
+++ b/src/service/resources/TICKscript/relative-template.tick
@@ -52,4 +52,5 @@ past
         .crit(comparisonLambda)
         .message(messageValue)
         .topic(topicID)
-        .noRecoveries()
\ No newline at end of file
+        .noRecoveries()
+        .stateChangesOnly()
\ No newline at end of file
diff --git a/src/service/resources/TICKscript/threshold-batch-template.tick b/src/service/resources/TICKscript/threshold-batch-template.tick
index f5f7a64b91006de1420b2a65232bc2ba55d8e44c..ed7b60357b82e2ae5064e894dfcac1b55eb8dc3d 100644
--- a/src/service/resources/TICKscript/threshold-batch-template.tick
+++ b/src/service/resources/TICKscript/threshold-batch-template.tick
@@ -36,4 +36,5 @@ batch
         .crit(comparisonLambda)
         .message(messageValue)
         .topic(topicID)
-        .noRecoveries()
\ No newline at end of file
+        .noRecoveries()
+        .stateChangesOnly()
\ No newline at end of file
diff --git a/src/service/resources/TICKscript/threshold-stream-template.tick b/src/service/resources/TICKscript/threshold-stream-template.tick
index 9eb886589943d4da76a1ea8699f1efe7afb365a6..68b50f353cd69fce20db3cf6ed7e7b04712bacc1 100644
--- a/src/service/resources/TICKscript/threshold-stream-template.tick
+++ b/src/service/resources/TICKscript/threshold-stream-template.tick
@@ -34,3 +34,4 @@ stream
         .message(messageValue)
         .topic(topicID)
         .noRecoveries()
+        .stateChangesOnly()
\ No newline at end of file
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
index 7812392af8dc3e50301843c84c38adf4e67cc9e4..03515cfdd0052e5ae42d6c69e61b28423fc7447d 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
index c2a855080832457c3f8a6f83975696542ea1b08f..f17a69769262a100995d3b5ff00f58054217f5b7 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc_ID: companyA-VR # correct format is sfc, not sfc_ID
-  sfci_ID: companyA-VR-premium # correct format is sfci, not sfci_ID
+  sfc_ID: companyA-VR # correct format is servicefunctionchain, not sfc_ID
+#  sfci_ID: companyA-VR-premium # correct format is sfci, not sfci_ID
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml
index d9110e5a69aa61f631d5b836774257ce299ee92d..f18b60b6aef9f53d8afb0ef5ff4d251ba2425279 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-11.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml
index 818823f8139ca1b8493a26e3d7fa1bcdb8be890d..8e78967d3555cf84996d473e689f45b98869dd05 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-12.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
index da58e71b7c08918707ac362dc4328d306fd74115..b0fe2f0e3f49f2bafd92d578322f076488eae328 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
index 8a89ae9f89af2abbf6f5b380066a1041d863f9f1..8b9aac9bfd2e4019f5d23fd04ab511b45ffe20b2 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
index 6a2884270313c3d2a3b5e4ba520a237947f7c666..afc91e9ceb9900d22c32c563fd932cfb4e0c6e2e 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
index b558ac97aff5b0e44c31f811f9fd8161e1d4e43d..bab46dac841d5b5072bbe8137f3449113514f126 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
index 7a7688658d90ef1dfc036410b752366976e488de..51ddff4a6eaeffee3458362e75e49c7d5883af06 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
index 312b5e4e1b27f8cde5c346173fd2d29e2d3819aa..e411c31f34c08b50f10e44aaf0a0998b4841bf1b 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
index de10ba0aeba3acd63743dfe669c8838aa6698e25..ab7db8a692215e6e8e9abff5085b75d682d754b4 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
index c3b3a227f9825f29f570a44a2ad84959b4cbd716..6db6518e46b29b9f53d1f09f8f6ce5a43669d9be 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
index a3ea67cafc811d0e313e866e9ddfc62b8e792030..da3f8d78fa16efa0a4a77d9c213bfad372ddf09a 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
index 266fa3152806f66f52101e3230d7605e33a11772..11bcdb2b1413d414ba0cf7e9125453625442e217 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
index 3993c088f0a2fbe6fc9f7e388563d9a3fd072478..25b250c18798f193425960ecc2897649b4343383 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
index 83195048c010fb0b4f9f7ce9e5a06002e69f36ca..d88fb000f852eacbf27f1bdb195c80d635edce0e 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
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 abb5ed1af95604c29c2443622ffa5a09a00b1848..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR-ERROR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR-ERROR
+#  sfci: companyA-VR-premium
 
 # 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-2.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-2.yaml
index 93b04a935175eace39fb59358aa90be12a2b1e92..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
@@ -2,8 +2,9 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium-ERROR
+#  sfc: companyA-VR
+#  sfci: companyA-VR-premium-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 cd5fea81620ebe515ab2bd0bb2ff70ca0ef4be51..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # 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-4.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-4.yaml
index deabe9040b5619d9e0b95c4a70fbbcefb92b46e2..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # 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-5.yaml b/src/service/resources/tosca/test-data/resource-spec/resources_invalid_test_config-5.yaml
index 20c1e78bf6027213a6caf1823a97aa307f79746d..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
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 a17b840e608e6a4af4654ae464d9dc516452b7f4..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
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 f2530f59e6e03ee793977ff63bb89266586de5ac..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
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 4ca88b33a0fd4186b85e2668e66accb8787d6d2b..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
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 496e972b73e5fad39016c118e1824cacbac33399..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
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 0466063c748d5a5f8a470a2cf253cfb9c5c31460..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,8 +2,8 @@ tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0
 
 metadata:
   template_name: Flame Test Tosca resource specification
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Import own definitions of nodes, capabilities and policy syntax.
 imports:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
index a5e9ed304db8f77be067a18b0cb4561b85dd8ce7..96ac8e0c6aeb9747d0a20d610dad4bed2699e78a 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
@@ -1,8 +1,8 @@
 # Fails since it doesn't specify tosca version, imports and topology_template root node is missing.
 
 metadata:
-    sfc: companyA-VR
-    sfci: companyA-VR-premium
+    servicefunctionchain: companyA-VR
+#    sfci: companyA-VR-premium
 triggers:
     high_latency:
       description: This event triggers when the mean network latency in a given location exceeds a given threshold (in ms).
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
index ad61f4b578a0343a1b8e3597ee258ec7d16e7027..80dcc2cfaff06850fb80ca8afea3bb7503186c5d 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
@@ -5,8 +5,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
index 326d6b59833f805a506a1125efae9cf9824ab428..8536373fab16f915f192fc5e6874ddd32a65b584 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 # missing policies section
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
index f1056c6cfd66a62627a0a5c55c1c5a5858e0d537..0c5293aff401e626e99f99973393e11e4442c4e1 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 # Wrong section name, must be topology_template, not alerts
 alerts:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
index 5df5321036a8239fc3b746fa491d621e268d7a13..ec4238022ff60c0a6da4c15563af2463d964d6ed 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
index 07f1cb69fe23aacec07a2fddcc31c3a657624a82..d92076a1f731689b08d9bc082860ccc01bb575b4 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VirtualReality
-  sfci: premium
+  servicefunctionchain: companyA-VirtualReality
+#  sfci: premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml
index 13f05f89427fcfba330254fc87198fba8eaeedf7..b11a1d1d5fec39536b24566b5d217df5e127a824 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-3.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
index db5a6d2dd3c3d6851e0437d19432dcae2be79038..9e4d7a50627874966f6756d84b179f16d7b9ff51 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: companyA-VR
-  sfci: companyA-VR-premium
+  servicefunctionchain: companyA-VR
+#  sfci: companyA-VR-premium
 
 topology_template:
 
diff --git a/src/test/clmctest/alerts/alerts_test_config.yaml b/src/test/clmctest/alerts/alerts_test_config.yaml
index 6c422e7e6f78f8db8f3a9b89942d2c7dfba03074..4d5bca9c7387996bace7a0d96f5124bcf0485c64 100644
--- a/src/test/clmctest/alerts/alerts_test_config.yaml
+++ b/src/test/clmctest/alerts/alerts_test_config.yaml
@@ -6,8 +6,8 @@ imports:
 - flame_clmc_alerts_definitions.yaml
 
 metadata:
-  sfc: MS_Template_1
-  sfci: MS_I1
+  servicefunctionchain: MS_Template_1
+#  sfci: MS_I1
 
 topology_template:
 
@@ -54,6 +54,7 @@ topology_template:
             condition:
               threshold: 1
               granularity: 10
+              aggregation_method: mean
               resource_type:
                 flame_sfp: nginx
                 flame_sf: adaptive_streaming_nginx_I1
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
 
 
diff --git a/src/test/clmctest/rspec.json b/src/test/clmctest/rspec.json
index 5cc7a75aa3cda35da6270fe2198d3f0e31c5ff80..310cdfbcbe0986feaa4bf1da33e1f5cae8ed4ebd 100644
--- a/src/test/clmctest/rspec.json
+++ b/src/test/clmctest/rspec.json
@@ -11,7 +11,7 @@
     "ip_address": "172.40.231.150",
     "location": "DC1",
     "sfc_id": "MS_Template_1",
-    "sfc_instance_id": "MS_I1",
+    "sfc_instance_id": "MS_Template_1_1",
     "sf_package_id": "apache",
     "sf_id": "adaptive_streaming_I1",
     "sf_endpoint_id": "adaptive_streaming_I1_apache1",
@@ -22,7 +22,7 @@
     "ip_address": "172.40.231.151",
     "location": "DC1",
     "sfc_id": "MS_Template_1",
-    "sfc_instance_id": "MS_I1",
+    "sfc_instance_id": "MS_Template_1_1",
     "sf_package_id": "nginx",
     "sf_id": "adaptive_streaming_nginx_I1",
     "sf_endpoint_id": "adaptive_streaming_nginx_I1_apache1",
@@ -34,7 +34,7 @@
     "ip_address": "172.40.231.152",
     "location": "DC1",
     "sfc_id": "MS_Template_1",
-    "sfc_instance_id": "MS_I1",
+    "sfc_instance_id": "MS_Template_1_1",
     "sf_package_id": "mongo",
     "sf_id": "metadata_database_I1",
     "sf_endpoint_id": "metadata_database_I1_apache1",
@@ -46,7 +46,7 @@
     "ip_address": "172.40.231.154",
     "location": "DC1",
     "sfc_id": "MS_Template_1",
-    "sfc_instance_id": "MS_I1",
+    "sfc_instance_id": "MS_Template_1_1",
     "sf_package_id": "host",
     "sf_id": "adaptive_streaming_I1",
     "sf_endpoint_id": "adaptive_streaming_I1_apache1",
@@ -57,7 +57,7 @@
     "ip_address": "172.40.231.155",
     "location": "DC1",
     "sfc_id": "MS_Template_1",
-    "sfc_instance_id": "MS_I1",
+    "sfc_instance_id": "MS_Template_1_1",
     "sf_package_id": "minio",
     "sf_id": "adaptive_streaming_I1",
     "sf_endpoint_id": "adaptive_streaming_I1_minio",
@@ -68,7 +68,7 @@
     "ip_address": "172.40.231.170",
     "location": "nova",
     "sfc_id": "media_service_A",
-    "sfc_instance_id": "StackID",
+    "sfc_instance_id": "media_service_A_1",
     "sf_package_id": "ipendpoint",
     "sf_id": "ms-A.ict-flame.eu",
     "sf_endpoint_id": "endpoint1.ms-A.ict-flame.eu",
@@ -79,7 +79,7 @@
     "ip_address": "172.40.231.171",
     "location": "nova",
     "sfc_id": "media_service_A",
-    "sfc_instance_id": "StackID",
+    "sfc_instance_id": "media_service_A_1",
     "sf_package_id": "ipendpoint",
     "sf_id": "ms-A.ict-flame.eu",
     "sf_endpoint_id": "endpoint2.ms-A.ict-flame.eu",