diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java b/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
index 1282545efc..bd270c4857 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/MultiplexingCacheInstanceManager.java
@@ -104,12 +104,12 @@ public class MultiplexingCacheInstanceManager implements CacheInstanceManager {
      * Default value for {@link #CACHE_FACTORY_RESOURCE_PROP}. Specifies
      * the "jbc2-configs.xml" file in this package.
      */
-    public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc2/builder/jbc2-configs.xml";    
+    public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc-configs.xml";    
     /**
      * Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}. Specifies
      * the "jgroups-stacks.xml" file in this package.
      */
-    public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+    public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
     /**
      * Default value for {@link #ENTITY_CACHE_RESOURCE_PROP}.
      */
diff --git a/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java b/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
index 24a67b0925..ece0da8754 100644
--- a/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
+++ b/cache-jbosscache/src/main/java/org/hibernate/cache/jbc/builder/SharedCacheInstanceManager.java
@@ -79,7 +79,7 @@ public class SharedCacheInstanceManager implements CacheInstanceManager {
      * Default value for {@link #CHANNEL_FACTORY_RESOURCE_PROP}.  Specifies
      * the "jgroups-stacks.xml" file in this package.
      */
-    public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc2/builder/jgroups-stacks.xml";
+    public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
 
     private Cache cache;
     private ChannelFactory channelFactory;
diff --git a/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml b/cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
similarity index 100%
rename from cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc2-configs.xml
rename to cache-jbosscache/src/main/resources/org/hibernate/cache/jbc/builder/jbc-configs.xml
diff --git a/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java b/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java
similarity index 94%
rename from cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
rename to cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java
index 6c3e3da156..2f9205d137 100644
--- a/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/Jbc2ConfigsXmlValidityTestCase.java
+++ b/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/JbcConfigsXmlValidityTestCase.java
@@ -33,7 +33,7 @@ import org.jboss.cache.CacheManager;
  * @author <a href="brian.stansberry@jboss.com">Brian Stansberry</a>
  * @version $Revision: 1 $
  */
-public class Jbc2ConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
+public class JbcConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
 {
    private static final AtomicReference<CacheManager> cacheManagerRef = new AtomicReference<CacheManager>();
    
@@ -57,17 +57,17 @@ public class Jbc2ConfigsXmlValidityTestCase extends AbstractJBossCacheTestCase
    private Cache cache;
    
    /**
-    * Create a new Jbc2ConfigsXmlValidityTestCase.
+    * Create a new JbcConfigsXmlValidityTestCase.
     * 
     * @param name
     */
-   public Jbc2ConfigsXmlValidityTestCase(String name)
+   public JbcConfigsXmlValidityTestCase(String name)
    {
       super(name);
    }
    
    public static Test suite() throws Exception {
-       TestSuite suite = new TestSuite(Jbc2ConfigsXmlValidityTestCase.class);
+       TestSuite suite = new TestSuite(JbcConfigsXmlValidityTestCase.class);
        return new CacheManagerTestSetup(suite, cacheManagerRef);
    }
    
diff --git a/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java b/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
index 6d94e54249..20eb6a86d7 100644
--- a/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
+++ b/cache-jbosscache/src/test/java/org/hibernate/test/cache/jbc/functional/util/IsolatedCacheTestSetup.java
@@ -18,6 +18,7 @@ package org.hibernate.test.cache.jbc.functional.util;
 
 import junit.framework.Test;
 
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
 import org.hibernate.test.util.SelectedClassnameClassLoader;
 import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
 
@@ -31,8 +32,8 @@ import org.hibernate.test.util.SelectedClassnameClassLoaderTestSetup;
 public class IsolatedCacheTestSetup extends SelectedClassnameClassLoaderTestSetup
 {
 
-   public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml";
-   public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
+   public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
+   public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
    
    private String[] isolatedClasses;
    private String cacheConfig;
diff --git a/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java b/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
index d6e9e4bbe2..8894652c82 100644
--- a/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
+++ b/cache-jbosscache/src/test/java/org/hibernate/test/util/CacheManagerTestSetup.java
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
+import org.hibernate.cache.jbc.builder.MultiplexingCacheInstanceManager;
 import org.jboss.cache.CacheManager;
 import org.jboss.cache.CacheManagerImpl;
 import org.jgroups.ChannelFactory;
@@ -36,8 +37,8 @@ import org.jgroups.JChannelFactory;
  */
 public class CacheManagerTestSetup extends TestSetup
 {
-   public static final String DEF_CACHE_FACTORY_RESOURCE = "org/hibernate/cache/jbc/builder/jbc2-configs.xml";
-   public static final String DEF_JGROUPS_RESOURCE = "org/hibernate/cache/jbc/builder/jgroups-stacks.xml";
+   public static final String DEF_CACHE_FACTORY_RESOURCE = MultiplexingCacheInstanceManager.DEF_CACHE_FACTORY_RESOURCE;
+   public static final String DEF_JGROUPS_RESOURCE = MultiplexingCacheInstanceManager.DEF_JGROUPS_RESOURCE;
    
    private final String jbcConfig;
    private final String jgConfig;