diff --git a/clmctest/monitoring/LineProtocolGenerator.py b/clmctest/monitoring/LineProtocolGenerator.py
index a420b6b9c2ef499679d15269d05b976e5463d300..fb54cb252004a2b14ae6ea26520af8765e92aed8 100644
--- a/clmctest/monitoring/LineProtocolGenerator.py
+++ b/clmctest/monitoring/LineProtocolGenerator.py
@@ -94,9 +94,8 @@ def _getNSTime(time):
 
     return timestamp
 
-def generate_mc_serviceConfig( mcLabel, sStop, asStop, sStart, asStart, time ):
-    result = [{ "measurement" : "mediaComponentConfig",
-                "tags"        : { "mediaComp" : mcLabel },
+def generate_mc_serviceConfig( mcMeasurement, sStop, asStop, sStart, asStart, time ):
+    result = [{ "measurement" : mcMeasurement,
                 "fields"      :
                 { "serviceStopped" : sStop,
                   "avgServiceStopped" : asStop,
diff --git a/clmctest/monitoring/StreamingSim.py b/clmctest/monitoring/StreamingSim.py
index afc1f24e084bd4cff1f13de3514c5fa87b263cc5..7d9fe16a81092916b632118b054e233459755981 100644
--- a/clmctest/monitoring/StreamingSim.py
+++ b/clmctest/monitoring/StreamingSim.py
@@ -277,7 +277,7 @@ def reportMC_ServiceState(streaming_sim_config):
     epURL = streaming_sim_config['hosts'][1]['ip_address']
     idbc = InfluxDBClient( host=epURL, port=8186, database=INFLUX_DB_NAME, timeout=10 )
 
-    idbc.write_points( lp.generate_mc_serviceConfig( "apache", 1500, 750, 8500, 4250, 0) )
+    idbc.write_points( lp.generate_mc_serviceConfig("apache",1500, 750, 8500, 4250, 0) )
 
     # IPEndpoint 2 scenario
     # 10 second period: Stopped --> started --> stopped --> started
@@ -287,7 +287,7 @@ def reportMC_ServiceState(streaming_sim_config):
     epURL = streaming_sim_config['hosts'][2]['ip_address']
     idbc = InfluxDBClient( host=epURL, port=8186, database=INFLUX_DB_NAME, timeout=10 )
 
-    idbc.write_points( lp.generate_mc_serviceConfig( "apache", 250, 250, 9500, 4750, 0) )
+    idbc.write_points( lp.generate_mc_serviceConfig("apache",250, 250, 9500, 4750, 0) )
 
 @pytest.fixture(scope='module')
 def reportMC_ConfigFileState(streaming_sim_config):