diff --git a/docs/clmc-information-model.md b/docs/clmc-information-model.md
index c338f8eaf5336100c0378dca96abc575bbe8f112..18f772e8c7d5b1baf580cea3cf96c8636771b905 100644
--- a/docs/clmc-information-model.md
+++ b/docs/clmc-information-model.md
@@ -254,13 +254,13 @@ The measurement model considers three monitoring views on an endpoint with field
 
 All of the measurements on a endpoint share a common context that includes tag values:
 
-* sfc – an orchestration template
-* sfc_i – an instance of the orchestration template
-* sf – a SF type
-* sf_i – an instance of the SF type
-* ipendpoint – an authoritive copy of the SF instance either VM or container
-* server – a physical or virtual server for hosting VM or container instances
-* location – the location of the server
+* sfc – an orchestration template (a.k.a. Service Function Chain)
+* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* sfp – the package a service function is using (a.k.a. Service Function Package)
+* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* location – the location of the server - physical machine that hosts the cluster VM
 
 By including this context with service, network and host measurements it is possible to support range of temporal queries associated with SFC’s. By adopting the same convention for identifiers it is possible to combine measurements across service, network and host to create new series that allows exploration of different aspects of the VM instance, including cross-layer queries.
 
@@ -368,13 +368,13 @@ ipendpoint measurements measure the configuration, usage and performance of VM/C
 
 Common tags
 
-* location – a physical or virtual server for hosting nodes instances
-* server – the location of the server
-* sfc – an orchestration template
-* sfc_i – an instance of the orchestration template
-* sf – a SF package identifier indicating the type and version of SF
-* sf_i – an instance of the SF type
-* ipendpoint – an authoritive copy of the SF instance either a container or VM
+* sfc – an orchestration template (a.k.a. Service Function Chain)
+* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* sfp – the package a service function is using (a.k.a. Service Function Package)
+* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* location – the location of the server - physical machine that hosts the cluster VM
 
 **endpoint_config**
 
diff --git a/docs/monitoring.md b/docs/monitoring.md
index f1104ea6601edc279ba7a8d6d3c83cbe6ae1003a..75b65627f99fa9777b8aa4e8906643648eae9832 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -184,13 +184,13 @@ The measurement model considers three monitoring views on a surrogate with field
 
 All of the measurements on a surrogate share a common context that includes tag values:
 
-* sfc – an orchestration template
-* sfc_i – an instance of the orchestration template
-* sf – a SF type
-* sf_i – an instance of the SF type
-* surrogate – an authoritive copy of the SF instance either VM or container
-* server – a physical or virtual server for hosting VM or container instances
-* location – the location of the server
+* sfc – an orchestration template (a.k.a. Service Function Chain)
+* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* sfp – the package a service function is using (a.k.a. Service Function Package)
+* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* location – the location of the server - physical machine that hosts the cluster VM
 
 By including this context with service, network and host measurements it is possible to support range of temporal queries associated with SFC’s. By adopting the same convention for identifiers it is possible to combine measurements across service, network and host to create new series that allows exploration of different aspects of the VM instance, including cross-layer queries.
 
@@ -426,7 +426,7 @@ The following queries illustrate how to calculate _mean time between failures_ (
 _Q. What is the Mean Time Between Failures (MTBF) of endpoint 'adaptive_streaming_I1_apache1'?_
 
 ```
-select mean(connected_mst) as "apache1_MTBF(s)" from "endpoint_config" where connected_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
+select mean(connected_mst) as "apache1_MTBF(s)" from "endpoint_config" where connected_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
 ```
 
 ```
@@ -439,12 +439,12 @@ time apache1_MTBF(s)
 _Q. What is the Mean Down Time (MDT) of endpoint 'adaptive_streaming_I1_apache1'?_
 
 ```
-select mean(unplaced_mst) as "unplaced_mdt" into "endpoint_config_mdt" from "endpoint_config" where unplaced_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
-select mean(placing_mst) as "placing_mdt" into "endpoint_config_mdt" from "endpoint_config" where placing_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
-select mean(placed_mst) as "placed_mdt" into "endpoint_config_mdt" from "endpoint_config" where placed_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
-select mean(booting_mst) as "booting_mdt" into "endpoint_config_mdt" from "endpoint_config" where booting_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
-select mean(booted_mst) as "booted_mdt" into "endpoint_config_mdt" from "endpoint_config" where booted_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
-select mean(connecting_mst) as "connecting_mdt" into "endpoint_config_mdt" from "endpoint_config" where connecting_mst <> 0 and ipendpoint = 'adaptive_streaming_I1_apache1'
+select mean(unplaced_mst) as "unplaced_mdt" into "endpoint_config_mdt" from "endpoint_config" where unplaced_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(placing_mst) as "placing_mdt" into "endpoint_config_mdt" from "endpoint_config" where placing_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(placed_mst) as "placed_mdt" into "endpoint_config_mdt" from "endpoint_config" where placed_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(booting_mst) as "booting_mdt" into "endpoint_config_mdt" from "endpoint_config" where booting_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(booted_mst) as "booted_mdt" into "endpoint_config_mdt" from "endpoint_config" where booted_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(connecting_mst) as "connecting_mdt" into "endpoint_config_mdt" from "endpoint_config" where connecting_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
 select (unplaced_mdt + placing_mdt + placed_mdt + booting_mdt + booted_mdt + connecting_mdt) as "MDT(s)" from "endpoint_config_mdt"
 ```
 
@@ -536,13 +536,13 @@ ipendpoint measurements measure the configuration, usage and performance of VM/C
 
 Common tags
 
-* location – a physical or virtual server for hosting nodes instances
-* server – the location of the server
-* sfc – an orchestration template
-* sfc_i – an instance of the orchestration template
-* sf – a SF package identifier indicating the type and version of SF
-* sf_i – an instance of the SF type
-* ipendpoint – an authoritive copy of the SF instance either a container or VM
+* sfc – an orchestration template (a.k.a. Service Function Chain)
+* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* sfp – the package a service function is using (a.k.a. Service Function Package)
+* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* location – the location of the server - physical machine that hosts the cluster VM
 
 #### ipendpoint Measurements