diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 8e9eb07ae..f0d64672d 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,2 +1,3 @@
+- [cygnus-arcgis] Get service and subservice using enableNameMappings flag config
 - [cygnus-arcgis] Insert null attribute as is in feature table (#2376)
 - [cygnus-arcgis] force null geometry when invalid geo:json format or type is found instead of Point(0,0) (#2379)
diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
index c1b754b3a..7a6800883 100644
--- a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
+++ b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIArcgisFeatureTableSink.java
@@ -482,21 +482,9 @@ public void aggregate(NGSIEvent event) throws CygnusRuntimeError {
 
                 LOGGER.debug("[NGSIArcgisAggregator] aggregate - Selected context ->" + contextElement);
 
-                // get the getRecvTimeTs headers
-                Map<String, String> headers = event.getHeaders();
-
-                for (Entry<String, String> entry : headers.entrySet()) {
-                    LOGGER.debug("Header entry key --> " + entry.getKey().toString() + ", value --> "
-                            + entry.getValue().toString());
-                    if (entry.getKey() != null
-                            && NGSIConstants.FLUME_HEADER_MAPPED_SERVICE.equals(entry.getKey().toString())) {
-                        service = entry.getValue().toString();
-                    } else if (entry.getKey() != null
-                            && NGSIConstants.FLUME_HEADER_MAPPED_SERVICE_PATH.equals(entry.getKey().toString())) {
-                        subService = entry.getValue().toString();
-                    }
-                } // for
-                
+                service = event.getServiceForNaming(enableNameMappings);
+                subService = event.getServicePathForNaming(enableNameMappings);
+
                 // Compose full url
                 featureTableUrl = argisServiceUrl + "/" + service + "/" + subService;
                 featureTableUrl = featureTableUrl.replaceAll("([^:])\\/\\/", "$1/");