diff --git a/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java b/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
index 0af80f1..6a7ef45 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/components/felix3680/Main.java
@@ -173,7 +173,17 @@
             _disabledLatch = new CountDownLatch(11); // for B,C,D,E,F,G,H,I,J,K and Main.unbindA()
 
             EnableManager manager =
-                    new EnableManager(new String[] { "B", "C", "D", "E", "F", "G", "H", "I", "J", "K" });
+                    new EnableManager(new String[] { 
+                        "org.apache.felix.scr.integration.components.felix3680.B", 
+                        "org.apache.felix.scr.integration.components.felix3680.C", 
+                        "org.apache.felix.scr.integration.components.felix3680.D", 
+                        "org.apache.felix.scr.integration.components.felix3680.E", 
+                        "org.apache.felix.scr.integration.components.felix3680.F", 
+                        "org.apache.felix.scr.integration.components.felix3680.G", 
+                        "org.apache.felix.scr.integration.components.felix3680.H", 
+                        "org.apache.felix.scr.integration.components.felix3680.I", 
+                        "org.apache.felix.scr.integration.components.felix3680.J", 
+                        "org.apache.felix.scr.integration.components.felix3680.K" });
             manager.enableComponents(exec);
 
             try
@@ -215,17 +225,17 @@
     private void dumpComponents()
     {
         StringWriter sw = new StringWriter();
-        dumpState(sw, "A");
-        dumpState(sw, "B");
-        dumpState(sw, "C");
-        dumpState(sw, "D");
-        dumpState(sw, "E");
-        dumpState(sw, "F");
-        dumpState(sw, "G");
-        dumpState(sw, "H");
-        dumpState(sw, "I");
-        dumpState(sw, "J");
-        dumpState(sw, "K");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.A");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.B");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.C");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.D");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.E");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.F");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.G");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.H");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.I");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.J");
+        dumpState(sw, "org.apache.felix.scr.integration.components.felix3680.K");
         _logService.log(LogService.LOG_WARNING, sw.toString());
     }
 
diff --git a/scr/src/test/resources/integration_test_FELIX_3680.xml b/scr/src/test/resources/integration_test_FELIX_3680.xml
index da8cb0f..9098b80 100644
--- a/scr/src/test/resources/integration_test_FELIX_3680.xml
+++ b/scr/src/test/resources/integration_test_FELIX_3680.xml
@@ -35,7 +35,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='B' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.B' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.B' />
 		<service>
@@ -44,7 +44,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='C' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.C' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.C' />
 		<service>
@@ -53,7 +53,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='D' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.D' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.D' />
 		<service>
@@ -62,7 +62,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='E' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.E' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.E' />
 		<service>
@@ -71,7 +71,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='F' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.F' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.F' />
 		<service>
@@ -83,7 +83,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='G' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.G' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.G' />
 		<service>
@@ -95,7 +95,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='H' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.H' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.H' />
 		<service>
@@ -107,7 +107,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='I' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.I' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.I' />
 		<service>
@@ -119,7 +119,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='J' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.J' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.J' />
 		<service>
@@ -131,7 +131,7 @@
 	</scr:component>
 
 	<scr:component xmlns:scr='http://www.osgi.org/xmlns/scr/v1.1.0'
-		name='K' enabled='false' activate='start' deactivate='stop'>
+		name='org.apache.felix.scr.integration.components.felix3680.K' enabled='false' activate='start' deactivate='stop'>
 		<implementation
 			class='org.apache.felix.scr.integration.components.felix3680.K' />
 		<service>