Index: deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
===================================================================
--- deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java	(revision 106228)
+++ deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java	(working copy)
@@ -61,12 +61,14 @@
       if (informer.getModuleType(deploymentUnit).equals(org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer.ModuleType.EJB)
             && !deploymentUnit.getParent().isAttachmentPresent(JBossWebMetaData.class))
       {
-         BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_CompJndiBinder", JavaEEComponentJndiBinder.class.getName());
+         String uname = deploymentUnit.getName() + "_" + informer.getApplicationName(deploymentUnit);
+         //String uname = deploymentUnit.getName();
+         BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(uname + "_CompJndiBinder", JavaEEComponentJndiBinder.class.getName());
          AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData(getComponentBeanName(deploymentUnit));
          builder.addConstructorParameter(JavaEEComponent.class.getName(), javaComponent);
          builder.addConstructorParameter(String.class.getName(), deploymentUnit.getName());
          builder.addInstall("bindToJavaComp");
-         deploymentUnit.getParent().addAttachment(deploymentUnit.getName() + "_JavaCompBinder", builder.getBeanMetaData());
+         deploymentUnit.getParent().addAttachment(uname + "_JavaCompBinder", builder.getBeanMetaData());
       }
    }