diff --git a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
index b74d3fd..7f42414 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/ecmap/EventuallyConsistentMapImpl.java
@@ -52,8 +52,8 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
+import static org.onlab.util.Tools.groupedThreads;
 import static org.onlab.util.Tools.minPriority;
-import static org.onlab.util.Tools.namedThreads;
 
 /**
  * Distributed Map implementation which uses optimistic replication and gossip
@@ -142,12 +142,12 @@
         items = new ConcurrentHashMap<>();
         removedItems = new ConcurrentHashMap<>();
 
-        executor = Executors
-                .newCachedThreadPool(namedThreads("onos-ecm-" + mapName + "-fg-%d"));
+        executor = Executors //FIXME
+                .newFixedThreadPool(4, groupedThreads("onos/ecm", mapName + "-fg-%d"));
 
         backgroundExecutor =
                 newSingleThreadScheduledExecutor(minPriority(
-                        namedThreads("onos-ecm-" + mapName + "-bg-%d")));
+                        groupedThreads("onos/ecm", mapName + "-bg-%d")));
 
         // start anti-entropy thread
         backgroundExecutor.scheduleAtFixedRate(new SendAdvertisementTask(),