diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java
index bef05772daea..919365d26d18 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheComponent.java
@@ -24,6 +24,7 @@
 
 import java.util.stream.Stream;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.msc.service.ServiceName;
@@ -32,7 +33,7 @@
  * Enumerates the configurable cache components
  * @author Paul Ferraro
  */
-public enum CacheComponent implements ComponentServiceNameFactory {
+public enum CacheComponent implements ResourceServiceNameFactory {
 
     MODULE("module"),
     EVICTION(EvictionResourceDefinition.PATH),
diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java
index aa331becc990..7221292ac034 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerComponent.java
@@ -22,6 +22,7 @@
 
 package org.jboss.as.clustering.infinispan.subsystem;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.as.controller.PathElement;
 import org.jboss.msc.service.ServiceName;
@@ -29,7 +30,7 @@
 /**
  * @author Paul Ferraro
  */
-public enum CacheContainerComponent implements ComponentServiceNameFactory {
+public enum CacheContainerComponent implements ResourceServiceNameFactory {
 
     MODULE("module"),
     SITE("site"),
diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java
index 6a8e6c21f6d1..3cc499b86d44 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentBuilder.java
@@ -22,6 +22,7 @@
 
 package org.jboss.as.clustering.infinispan.subsystem;
 
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 import org.jboss.as.controller.PathAddress;
 import org.jboss.msc.service.ServiceBuilder;
 import org.jboss.msc.service.ServiceController;
@@ -39,7 +40,7 @@ public abstract class ComponentBuilder<C> implements Builder<C>, Value<C> {
 
     private final ServiceName name;
 
-    ComponentBuilder(ComponentServiceNameFactory factory, PathAddress parentAddress) {
+    ComponentBuilder(ResourceServiceNameFactory factory, PathAddress parentAddress) {
         this.name = factory.getServiceName(parentAddress);
     }
 
diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentServiceNameFactory.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentServiceNameFactory.java
deleted file mode 100644
index c37c722b7f53..000000000000
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ComponentServiceNameFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2016, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.as.clustering.infinispan.subsystem;
-
-import org.jboss.as.controller.PathAddress;
-import org.jboss.msc.service.ServiceName;
-
-/**
- * @author Paul Ferraro
- */
-public interface ComponentServiceNameFactory {
-    ServiceName getServiceName(PathAddress parentAddress);
-}
diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java
index b94b7ff67a82..258a92a6bb7d 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ScheduledThreadPoolDefinition.java
@@ -23,11 +23,12 @@
 package org.jboss.as.clustering.infinispan.subsystem;
 
 import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 
 /**
  * @author Paul Ferraro
  */
-public interface ScheduledThreadPoolDefinition extends ComponentServiceNameFactory {
+public interface ScheduledThreadPoolDefinition extends ResourceServiceNameFactory {
 
     Attribute getMaxThreads();
 
diff --git a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java
index 12c459542d22..2f332dccc7d2 100644
--- a/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java
+++ b/clustering/infinispan/extension/src/main/java/org/jboss/as/clustering/infinispan/subsystem/ThreadPoolDefinition.java
@@ -23,11 +23,12 @@
 package org.jboss.as.clustering.infinispan.subsystem;
 
 import org.jboss.as.clustering.controller.Attribute;
+import org.jboss.as.clustering.controller.ResourceServiceNameFactory;
 
 /**
  * @author Paul Ferraro
  */
-public interface ThreadPoolDefinition extends ComponentServiceNameFactory {
+public interface ThreadPoolDefinition extends ResourceServiceNameFactory {
 
     Attribute getMinThreads();