From 8d9a2ba66f41652a16920e53a56611d21b2ce94c Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Wed, 31 Jul 2013 16:30:15 +0800
Subject: [PATCH] IDEMPIERE-1223 Use ClassName as Name of OSGi component.

---
 org.adempiere.base/OSGI-INF/archivedb.xml                       | 2 +-
 org.adempiere.base/OSGI-INF/archivefile.xml                     | 2 +-
 org.adempiere.base/OSGI-INF/attachmentdb.xml                    | 2 +-
 org.adempiere.base/OSGI-INF/attachmentfile.xml                  | 2 +-
 org.adempiere.base/OSGI-INF/broadcastutil.xml                   | 2 +-
 org.adempiere.base/OSGI-INF/defaultcolumncalloutfactory.xml     | 2 +-
 org.adempiere.base/OSGI-INF/defaultdocfactory.xml               | 2 +-
 org.adempiere.base/OSGI-INF/defaultlookupfactory.xml            | 2 +-
 org.adempiere.base/OSGI-INF/defaultmodelfactory.xml             | 2 +-
 org.adempiere.base/OSGI-INF/defaultmodelvalidatorfactory.xml    | 2 +-
 org.adempiere.base/OSGI-INF/defaultpaymentprocessorfactory.xml  | 2 +-
 org.adempiere.base/OSGI-INF/defaultprocessfactory.xml           | 2 +-
 org.adempiere.base/OSGI-INF/defaultshipmentprocessorfactory.xml | 2 +-
 org.adempiere.base/OSGI-INF/dslocator.xml                       | 2 +-
 org.adempiere.base/OSGI-INF/eventmanager.xml                    | 2 +-
 org.adempiere.base/OSGI-INF/keystore.xml                        | 2 +-
 org.adempiere.base/OSGI-INF/serverbean.xml                      | 2 +-
 org.adempiere.base/OSGI-INF/statusbean.xml                      | 2 +-
 org.adempiere.pipo/OSGI-INF/dictionaryservice.xml               | 2 +-
 org.adempiere.replication.server/OSGI-INF/serverfactory.xml     | 2 +-
 org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml | 2 +-
 org.adempiere.server/OSGI-INF/acctprocessorfactory.xml          | 2 +-
 org.adempiere.server/OSGI-INF/alertprocessorfactory.xml         | 2 +-
 org.adempiere.server/OSGI-INF/ldapprocessorfactory.xml          | 2 +-
 org.adempiere.server/OSGI-INF/requestprocessorfactory.xml       | 2 +-
 org.adempiere.server/OSGI-INF/schedulerfactory.xml              | 2 +-
 org.adempiere.server/OSGI-INF/workflowprocessorfactory.xml      | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaultcreatefromfactory.xml    | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaulteditorfactory.xml        | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaultformfactory.xml          | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaultinfofactory.xml          | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaultpaymentformfactory.xml   | 2 +-
 org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml   | 2 +-
 org.adempiere.ui.swing/OSGI-INF/reportviewerprovider.xml        | 2 +-
 org.adempiere.ui.swing/OSGI-INF/resourcefinder.xml              | 2 +-
 org.adempiere.ui.swing/OSGI-INF/serverinterface.xml             | 2 +-
 org.adempiere.ui.swing/OSGI-INF/statusinterface.xml             | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml       | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml           | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml             | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml             | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml      | 2 +-
 org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml      | 2 +-
 org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml                | 2 +-
 org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml               | 2 +-
 org.adempiere.ui.zk/OSGI-INF/processfactory.xml                 | 2 +-
 org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml           | 2 +-
 org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml                 | 2 +-
 org.compiere.db.oracle.provider/OSGI-INF/oracleprovider.xml     | 2 +-
 org.compiere.db.postgresql.provider/OSGI-INF/pgprovider.xml     | 2 +-
 org.idempiere.fitnesse.fixture/OSGI-INF/fitfixturefactory.xml   | 2 +-
 org.idempiere.fitnesse.fixture/OSGI-INF/slimfixturefactory.xml  | 2 +-
 org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml       | 2 +-
 org.idempiere.hazelcast.service/OSGI-INF/clusterservice.xml     | 2 +-
 org.idempiere.hazelcast.service/OSGI-INF/messageservice.xml     | 2 +-
 org.idempiere.ui.zk.selenium/OSGI-INF/fitfixturefactory.xml     | 2 +-
 56 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/org.adempiere.base/OSGI-INF/archivedb.xml b/org.adempiere.base/OSGI-INF/archivedb.xml
index 6f526e94a3..589bbcd8e1 100644
--- a/org.adempiere.base/OSGI-INF/archivedb.xml
+++ b/org.adempiere.base/OSGI-INF/archivedb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.archive.store.archivedb">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.model.ArchiveDB">
    <implementation class="org.compiere.model.ArchiveDB"/>
    <service>
       <provide interface="org.compiere.model.IArchiveStore"/>
diff --git a/org.adempiere.base/OSGI-INF/archivefile.xml b/org.adempiere.base/OSGI-INF/archivefile.xml
index 8db2274033..de71448ee3 100644
--- a/org.adempiere.base/OSGI-INF/archivefile.xml
+++ b/org.adempiere.base/OSGI-INF/archivefile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.archive.store.archivefile">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.model.ArchiveFileSystem">
    <implementation class="org.compiere.model.ArchiveFileSystem"/>
    <service>
       <provide interface="org.compiere.model.IArchiveStore"/>
diff --git a/org.adempiere.base/OSGI-INF/attachmentdb.xml b/org.adempiere.base/OSGI-INF/attachmentdb.xml
index 9a8be1e7b0..8675d48cf3 100644
--- a/org.adempiere.base/OSGI-INF/attachmentdb.xml
+++ b/org.adempiere.base/OSGI-INF/attachmentdb.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.attachment.store.attachmentdb">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.model.AttachmentDBSystem">
    <implementation class="org.compiere.model.AttachmentDBSystem"/>
    <service>
       <provide interface="org.compiere.model.IAttachmentStore"/>
diff --git a/org.adempiere.base/OSGI-INF/attachmentfile.xml b/org.adempiere.base/OSGI-INF/attachmentfile.xml
index f04bf80d2f..3e4ec76687 100644
--- a/org.adempiere.base/OSGI-INF/attachmentfile.xml
+++ b/org.adempiere.base/OSGI-INF/attachmentfile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.attachment.store.attachmentfile">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.model.AttachmentFileSystem">
    <implementation class="org.compiere.model.AttachmentFileSystem"/>
    <service>
       <provide interface="org.compiere.model.IAttachmentStore"/>
diff --git a/org.adempiere.base/OSGI-INF/broadcastutil.xml b/org.adempiere.base/OSGI-INF/broadcastutil.xml
index e45b0789e2..1aaa64030e 100644
--- a/org.adempiere.base/OSGI-INF/broadcastutil.xml
+++ b/org.adempiere.base/OSGI-INF/broadcastutil.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.broadcast.util">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.broadcast.BroadCastUtil">
    <implementation class="org.idempiere.broadcast.BroadCastUtil"/>
    <reference bind="bindMessageService" cardinality="1..1" interface="org.idempiere.distributed.IMessageService" name="IMessageService" policy="dynamic" unbind="unbindMessageService"/>
 </scr:component>
diff --git a/org.adempiere.base/OSGI-INF/defaultcolumncalloutfactory.xml b/org.adempiere.base/OSGI-INF/defaultcolumncalloutfactory.xml
index 3ed6c19f65..1be3c871b8 100644
--- a/org.adempiere.base/OSGI-INF/defaultcolumncalloutfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultcolumncalloutfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.columncallout.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultColumnCalloutFactory">
    <implementation class="org.adempiere.base.DefaultColumnCalloutFactory"/>
    <service>
       <provide interface="org.adempiere.base.IColumnCalloutFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultdocfactory.xml b/org.adempiere.base/OSGI-INF/defaultdocfactory.xml
index 806804c562..097416eec9 100644
--- a/org.adempiere.base/OSGI-INF/defaultdocfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultdocfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.doc.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultDocumentFactory">
    <implementation class="org.adempiere.base.DefaultDocumentFactory"/>
    <service>
       <provide interface="org.adempiere.base.IDocFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultlookupfactory.xml b/org.adempiere.base/OSGI-INF/defaultlookupfactory.xml
index 08c074aa56..c179b0e4fd 100644
--- a/org.adempiere.base/OSGI-INF/defaultlookupfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultlookupfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.lookup.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultLookupFactory">
    <implementation class="org.adempiere.base.DefaultLookupFactory"/>
    <service>
       <provide interface="org.adempiere.base.ILookupFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml b/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
index b9c2d6c074..a30e945dbc 100644
--- a/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultmodelfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.model.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultModelFactory">
    <implementation class="org.adempiere.base.DefaultModelFactory"/>
    <service>
       <provide interface="org.adempiere.base.IModelFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultmodelvalidatorfactory.xml b/org.adempiere.base/OSGI-INF/defaultmodelvalidatorfactory.xml
index f41c401212..0eb49cb1fc 100644
--- a/org.adempiere.base/OSGI-INF/defaultmodelvalidatorfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultmodelvalidatorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.modelvalidator.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultModelValidatorFactory">
    <implementation class="org.adempiere.base.DefaultModelValidatorFactory"/>
    <service>
       <provide interface="org.adempiere.base.IModelValidatorFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultpaymentprocessorfactory.xml b/org.adempiere.base/OSGI-INF/defaultpaymentprocessorfactory.xml
index a45ade46f8..7cfe6ce078 100644
--- a/org.adempiere.base/OSGI-INF/defaultpaymentprocessorfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultpaymentprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.paymentprocessor.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultPaymentProcessorFactory">
    <implementation class="org.adempiere.base.DefaultPaymentProcessorFactory"/>
    <service>
       <provide interface="org.adempiere.base.IPaymentProcessorFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultprocessfactory.xml b/org.adempiere.base/OSGI-INF/defaultprocessfactory.xml
index 9d9028fd00..cb9a088553 100644
--- a/org.adempiere.base/OSGI-INF/defaultprocessfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultprocessfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.process.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultProcessFactory">
    <implementation class="org.adempiere.base.DefaultProcessFactory"/>
    <service>
       <provide interface="org.adempiere.base.IProcessFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/defaultshipmentprocessorfactory.xml b/org.adempiere.base/OSGI-INF/defaultshipmentprocessorfactory.xml
index 6605feb4a3..e9cf0e5299 100644
--- a/org.adempiere.base/OSGI-INF/defaultshipmentprocessorfactory.xml
+++ b/org.adempiere.base/OSGI-INF/defaultshipmentprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.shipmentprocessor.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.DefaultShipmentProcessorFactory">
    <implementation class="org.adempiere.base.DefaultShipmentProcessorFactory"/>
    <service>
       <provide interface="org.adempiere.base.IShipmentProcessorFactory"/>
diff --git a/org.adempiere.base/OSGI-INF/dslocator.xml b/org.adempiere.base/OSGI-INF/dslocator.xml
index c318b703fb..b51caf07cf 100644
--- a/org.adempiere.base/OSGI-INF/dslocator.xml
+++ b/org.adempiere.base/OSGI-INF/dslocator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.ds.locator">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.ds.DynamicServiceLocator">
    <property name="service.ranking" type="Integer" value="1"/>
    <service>
       <provide interface="org.adempiere.base.IServiceLocator"/>
diff --git a/org.adempiere.base/OSGI-INF/eventmanager.xml b/org.adempiere.base/OSGI-INF/eventmanager.xml
index a36b0ccff3..4c5ab7a980 100644
--- a/org.adempiere.base/OSGI-INF/eventmanager.xml
+++ b/org.adempiere.base/OSGI-INF/eventmanager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.adempiere.base.event.manager">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.adempiere.base.event.EventManager">
    <implementation class="org.adempiere.base.event.EventManager"/>
    <reference bind="bindEventAdmin" cardinality="1..1" interface="org.osgi.service.event.EventAdmin" name="EventAdmin" policy="static" unbind="unbindEventAdmin"/>
    <service>
diff --git a/org.adempiere.base/OSGI-INF/keystore.xml b/org.adempiere.base/OSGI-INF/keystore.xml
index eb288e633e..98bab605b6 100644
--- a/org.adempiere.base/OSGI-INF/keystore.xml
+++ b/org.adempiere.base/OSGI-INF/keystore.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.keystore.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.util.DefaultKeyStore">
    <implementation class="org.compiere.util.DefaultKeyStore"/>
    <service>
       <provide interface="org.adempiere.base.IKeyStore"/>
diff --git a/org.adempiere.base/OSGI-INF/serverbean.xml b/org.adempiere.base/OSGI-INF/serverbean.xml
index 201af98d9b..75ba3fcc4e 100644
--- a/org.adempiere.base/OSGI-INF/serverbean.xml
+++ b/org.adempiere.base/OSGI-INF/serverbean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.interfaces.server">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.interfaces.impl.ServerBean">
    <implementation class="org.compiere.interfaces.impl.ServerBean"/>
    <service>
       <provide interface="org.compiere.interfaces.Server"/>
diff --git a/org.adempiere.base/OSGI-INF/statusbean.xml b/org.adempiere.base/OSGI-INF/statusbean.xml
index 5528079e58..1e63f707f1 100644
--- a/org.adempiere.base/OSGI-INF/statusbean.xml
+++ b/org.adempiere.base/OSGI-INF/statusbean.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.interfaces.status">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.interfaces.impl.StatusBean">
    <implementation class="org.compiere.interfaces.impl.StatusBean"/>
    <service>
       <provide interface="org.compiere.interfaces.Status"/>
diff --git a/org.adempiere.pipo/OSGI-INF/dictionaryservice.xml b/org.adempiere.pipo/OSGI-INF/dictionaryservice.xml
index 5ae14e2897..c6d3f25d68 100644
--- a/org.adempiere.pipo/OSGI-INF/dictionaryservice.xml
+++ b/org.adempiere.pipo/OSGI-INF/dictionaryservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.pipo.dictionary.service">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.pipo.srv.PipoDictionaryService">
    <implementation class="org.adempiere.pipo.srv.PipoDictionaryService"/>
    <service>
       <provide interface="org.adempiere.base.IDictionaryService"/>
diff --git a/org.adempiere.replication.server/OSGI-INF/serverfactory.xml b/org.adempiere.replication.server/OSGI-INF/serverfactory.xml
index 51272f5252..5a87004a14 100644
--- a/org.adempiere.replication.server/OSGI-INF/serverfactory.xml
+++ b/org.adempiere.replication.server/OSGI-INF/serverfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.replication.server.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.server.rpl.imp.ReplicationServerFactory">
    <implementation class="org.adempiere.server.rpl.imp.ReplicationServerFactory"/>
    <service>
       <provide interface="org.adempiere.server.IServerFactory"/>
diff --git a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
index 413fa59b41..d15ca6e471 100644
--- a/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.report.jasper.swing/OSGI-INF/jrviewerprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.report.jasper.swing.viewer.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.SwingJRViewerProvider">
    <implementation class="org.compiere.report.SwingJRViewerProvider"/>
    <service>
       <provide interface="org.compiere.report.JRViewerProvider"/>
diff --git a/org.adempiere.server/OSGI-INF/acctprocessorfactory.xml b/org.adempiere.server/OSGI-INF/acctprocessorfactory.xml
index ab965f7a41..13bb8bd797 100644
--- a/org.adempiere.server/OSGI-INF/acctprocessorfactory.xml
+++ b/org.adempiere.server/OSGI-INF/acctprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultacctprocessor">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultAcctProcessorFactory">
    <implementation class="org.idempiere.server.factory.DefaultAcctProcessorFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.server/OSGI-INF/alertprocessorfactory.xml b/org.adempiere.server/OSGI-INF/alertprocessorfactory.xml
index ef40ea2b28..8f59273fd2 100644
--- a/org.adempiere.server/OSGI-INF/alertprocessorfactory.xml
+++ b/org.adempiere.server/OSGI-INF/alertprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultalertprocessor">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultAlertProcessorFactory">
    <implementation class="org.idempiere.server.factory.DefaultAlertProcessorFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.server/OSGI-INF/ldapprocessorfactory.xml b/org.adempiere.server/OSGI-INF/ldapprocessorfactory.xml
index 7373533582..f53e45eccd 100644
--- a/org.adempiere.server/OSGI-INF/ldapprocessorfactory.xml
+++ b/org.adempiere.server/OSGI-INF/ldapprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultldapprocessor">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultLDAPProcessorFactory">
    <implementation class="org.idempiere.server.factory.DefaultLDAPProcessorFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.server/OSGI-INF/requestprocessorfactory.xml b/org.adempiere.server/OSGI-INF/requestprocessorfactory.xml
index edd62584bb..b629fcf88d 100644
--- a/org.adempiere.server/OSGI-INF/requestprocessorfactory.xml
+++ b/org.adempiere.server/OSGI-INF/requestprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultrequestprocessor">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultRequestProcessorFactory">
    <implementation class="org.idempiere.server.factory.DefaultRequestProcessorFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.server/OSGI-INF/schedulerfactory.xml b/org.adempiere.server/OSGI-INF/schedulerfactory.xml
index 4947ceef93..369c1bd34f 100644
--- a/org.adempiere.server/OSGI-INF/schedulerfactory.xml
+++ b/org.adempiere.server/OSGI-INF/schedulerfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultscheduler">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultSchedulerFactory">
    <implementation class="org.idempiere.server.factory.DefaultSchedulerFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.server/OSGI-INF/workflowprocessorfactory.xml b/org.adempiere.server/OSGI-INF/workflowprocessorfactory.xml
index e1c53aa8f1..1cac2215eb 100644
--- a/org.adempiere.server/OSGI-INF/workflowprocessorfactory.xml
+++ b/org.adempiere.server/OSGI-INF/workflowprocessorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.defaultworkflowprocessor">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.server.factory.DefaultWorkflowProcessorFactory">
    <implementation class="org.idempiere.server.factory.DefaultWorkflowProcessorFactory"/>
    <property name="service.ranking" type="Integer" value="0"/>
    <service>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaultcreatefromfactory.xml b/org.adempiere.ui.swing/OSGI-INF/defaultcreatefromfactory.xml
index d8241452e3..a8e8a3eab7 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaultcreatefromfactory.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaultcreatefromfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.createfrom.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.grid.DefaultCreateFromFactory">
    <implementation class="org.compiere.grid.DefaultCreateFromFactory"/>
    <service>
       <provide interface="org.compiere.grid.ICreateFromFactory"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaulteditorfactory.xml b/org.adempiere.ui.swing/OSGI-INF/defaulteditorfactory.xml
index 056127c492..b5b667baba 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaulteditorfactory.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaulteditorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.editor.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.factory.DefaultEditorFactory">
    <implementation class="org.adempiere.ui.swing.factory.DefaultEditorFactory"/>
    <service>
       <provide interface="org.adempiere.ui.swing.factory.IEditorFactory"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaultformfactory.xml b/org.adempiere.ui.swing/OSGI-INF/defaultformfactory.xml
index fda641665f..ecfac158fa 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaultformfactory.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaultformfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.form.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.factory.DefaultFormFactory">
    <implementation class="org.adempiere.ui.swing.factory.DefaultFormFactory"/>
    <service>
       <provide interface="org.adempiere.ui.swing.factory.IFormFactory"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaultinfofactory.xml b/org.adempiere.ui.swing/OSGI-INF/defaultinfofactory.xml
index 996086f617..4b7475506b 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaultinfofactory.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaultinfofactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.info.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.factory.DefaultInfoFactory">
    <implementation class="org.adempiere.ui.swing.factory.DefaultInfoFactory"/>
    <service>
       <provide interface="org.adempiere.ui.swing.factory.IInfoFactory"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaultpaymentformfactory.xml b/org.adempiere.ui.swing/OSGI-INF/defaultpaymentformfactory.xml
index 6d0322ebdc..e987a82e55 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaultpaymentformfactory.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaultpaymentformfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.payment.form.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.grid.DefaultPaymentFormFactory">
    <implementation class="org.compiere.grid.DefaultPaymentFormFactory"/>
    <service>
       <provide interface="org.compiere.grid.IPaymentFormFactory"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml b/org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml
index ca778e4fd2..2b14a97e99 100644
--- a/org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/defaultprintshippinglabel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.shipping.printlabel">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.process.DefaultPrintShippingLabel">
    <implementation class="org.adempiere.process.DefaultPrintShippingLabel"/>
    <service>
       <provide interface="org.adempiere.process.IPrintShippingLabel"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/reportviewerprovider.xml b/org.adempiere.ui.swing/OSGI-INF/reportviewerprovider.xml
index 2ccca5a51e..ff537236c1 100644
--- a/org.adempiere.ui.swing/OSGI-INF/reportviewerprovider.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/reportviewerprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.report.viewer.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.print.SwingViewerProvider">
    <implementation class="org.compiere.print.SwingViewerProvider"/>
    <service>
       <provide interface="org.compiere.print.ReportViewerProvider"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/resourcefinder.xml b/org.adempiere.ui.swing/OSGI-INF/resourcefinder.xml
index 1c6d4d1522..52e76f4703 100644
--- a/org.adempiere.ui.swing/OSGI-INF/resourcefinder.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/resourcefinder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.resource.finder">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.util.ResourceFinder">
    <implementation class="org.compiere.util.ResourceFinder"/>
    <service>
       <provide interface="org.adempiere.base.IResourceFinder"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml b/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml
index 7fdd25a815..6b37644416 100644
--- a/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/serverinterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.interfaces.server">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.client.ServerInterface">
    <implementation class="org.adempiere.client.ServerInterface"/>
    <service>
       <provide interface="org.compiere.interfaces.Server"/>
diff --git a/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml b/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml
index 59ac0ed555..e69803a13c 100644
--- a/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml
+++ b/org.adempiere.ui.swing/OSGI-INF/statusinterface.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.swing.interfaces.status">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.client.StatusInterface">
    <implementation class="org.adempiere.client.StatusInterface"/>
    <service>
       <provide interface="org.compiere.interfaces.Status"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
index 11e052760b..61d94a4f84 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultcreatefromfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.createfrom.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.apps.form.DefaultCreateFromFactory">
    <implementation class="org.adempiere.webui.apps.form.DefaultCreateFromFactory"/>
    <service>
       <provide interface="org.compiere.grid.ICreateFromFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
index d786feeb2c..1b6c3ec9e8 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaulteditorfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.editor.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultEditorFactory">
    <implementation class="org.adempiere.webui.factory.DefaultEditorFactory"/>
    <service>
       <provide interface="org.adempiere.webui.factory.IEditorFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
index 1ce0229c2e..e281eef03d 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultformfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.form.factory.default">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultFormFactory">
    <implementation class="org.adempiere.webui.factory.DefaultFormFactory"/>
    <service>
       <provide interface="org.adempiere.webui.factory.IFormFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
index bfcf4aa335..a5ed5f8f73 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultinfofactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.info.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultInfoFactory">
    <implementation class="org.adempiere.webui.factory.DefaultInfoFactory"/>
    <service>
       <provide interface="org.adempiere.webui.factory.IInfoFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml b/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
index 46febc59c2..91d13e16ac 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultpaymentformfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.payment.form.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.apps.form.DefaultPaymentFormFactory">
    <implementation class="org.adempiere.webui.apps.form.DefaultPaymentFormFactory"/>
    <service>
       <provide interface="org.compiere.grid.IPaymentFormFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml b/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
index 2f14bad4d9..7907584285 100644
--- a/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/defaultprintshippinglabel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.shipping.printlabel">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.process.DefaultPrintShippingLabel">
    <implementation class="org.adempiere.webui.process.DefaultPrintShippingLabel"/>
    <service>
       <provide interface="org.adempiere.process.IPrintShippingLabel"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml b/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
index 64c69dd91f..6fcf476799 100644
--- a/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/feedbackservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.factory.DefaultFeedbackService">
    <implementation class="org.adempiere.webui.factory.DefaultFeedbackService"/>
    <service>
       <provide interface="org.adempiere.webui.factory.IFeedbackService"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
index ed544e330f..33b21de28e 100644
--- a/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/jrviewerprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.jrviewer.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
    <service>
       <provide interface="org.compiere.report.JRViewerProvider"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/processfactory.xml b/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
index 04cbf3c7da..6d9924ebe1 100644
--- a/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/processfactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.process.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.util.ProcessFactoryImpl">
    <implementation class="org.adempiere.webui.util.ProcessFactoryImpl"/>
    <service>
       <provide interface="org.adempiere.base.IProcessFactory"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml b/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
index ccfc5b04bf..0a7f0eeff1 100644
--- a/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/reportviewerprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.reportviewer.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkReportViewerProvider">
    <implementation class="org.adempiere.webui.window.ZkReportViewerProvider"/>
    <service>
       <provide interface="org.compiere.print.ReportViewerProvider"/>
diff --git a/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml b/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
index 788cb7d615..bccaa1a058 100644
--- a/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
+++ b/org.adempiere.ui.zk/OSGI-INF/resourcefinder.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.ui.zk.resource.finder">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.util.WebUIResourceFinder">
    <implementation class="org.adempiere.webui.util.WebUIResourceFinder"/>
    <service>
       <provide interface="org.adempiere.base.IResourceFinder"/>
diff --git a/org.compiere.db.oracle.provider/OSGI-INF/oracleprovider.xml b/org.compiere.db.oracle.provider/OSGI-INF/oracleprovider.xml
index a0cf86b2c3..68ea4d6a50 100644
--- a/org.compiere.db.oracle.provider/OSGI-INF/oracleprovider.xml
+++ b/org.compiere.db.oracle.provider/OSGI-INF/oracleprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.db.oracle.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.db.DB_Oracle">
    <implementation class="org.compiere.db.DB_Oracle"/>
    <service>
       <provide interface="org.compiere.db.AdempiereDatabase"/>
diff --git a/org.compiere.db.postgresql.provider/OSGI-INF/pgprovider.xml b/org.compiere.db.postgresql.provider/OSGI-INF/pgprovider.xml
index 43984b4889..5783951866 100644
--- a/org.compiere.db.postgresql.provider/OSGI-INF/pgprovider.xml
+++ b/org.compiere.db.postgresql.provider/OSGI-INF/pgprovider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.db.postgresql.provider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.db.DB_PostgreSQL">
    <implementation class="org.compiere.db.DB_PostgreSQL"/>
    <service>
       <provide interface="org.compiere.db.AdempiereDatabase"/>
diff --git a/org.idempiere.fitnesse.fixture/OSGI-INF/fitfixturefactory.xml b/org.idempiere.fitnesse.fixture/OSGI-INF/fitfixturefactory.xml
index fdfb4037fd..4a8acc2856 100644
--- a/org.idempiere.fitnesse.fixture/OSGI-INF/fitfixturefactory.xml
+++ b/org.idempiere.fitnesse.fixture/OSGI-INF/fitfixturefactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.fitnesse.fixture.fit.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.fitnesse.fixture.FitFixtureFactory">
    <implementation class="org.idempiere.fitnesse.fixture.FitFixtureFactory"/>
    <service>
       <provide interface="org.idempiere.fitnesse.server.fit.IFitFixtureFactory"/>
diff --git a/org.idempiere.fitnesse.fixture/OSGI-INF/slimfixturefactory.xml b/org.idempiere.fitnesse.fixture/OSGI-INF/slimfixturefactory.xml
index 58b38ae24b..eea582a877 100644
--- a/org.idempiere.fitnesse.fixture/OSGI-INF/slimfixturefactory.xml
+++ b/org.idempiere.fitnesse.fixture/OSGI-INF/slimfixturefactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.fitnesse.fixture.slim.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.fitnesse.fixture.SlimFixtureFactory">
    <implementation class="org.idempiere.fitnesse.fixture.SlimFixtureFactory"/>
    <service>
       <provide interface="org.idempiere.fitnesse.server.slim.ISlimFixtureFactory"/>
diff --git a/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml b/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
index 5b1e36ec51..6d5ab88e98 100644
--- a/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
+++ b/org.idempiere.hazelcast.service/OSGI-INF/cacheservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.cache">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.CacheServiceImpl">
    <implementation class="org.idempiere.hazelcast.service.CacheServiceImpl"/>
    <service>
       <provide interface="org.idempiere.distributed.ICacheService"/>
diff --git a/org.idempiere.hazelcast.service/OSGI-INF/clusterservice.xml b/org.idempiere.hazelcast.service/OSGI-INF/clusterservice.xml
index 80236ee452..1ab0378e81 100644
--- a/org.idempiere.hazelcast.service/OSGI-INF/clusterservice.xml
+++ b/org.idempiere.hazelcast.service/OSGI-INF/clusterservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.cluster">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.ClusterServiceImpl">
    <implementation class="org.idempiere.hazelcast.service.ClusterServiceImpl"/>
    <service>
       <provide interface="org.idempiere.distributed.IClusterService"/>
diff --git a/org.idempiere.hazelcast.service/OSGI-INF/messageservice.xml b/org.idempiere.hazelcast.service/OSGI-INF/messageservice.xml
index 47af916129..a2a68454c3 100644
--- a/org.idempiere.hazelcast.service/OSGI-INF/messageservice.xml
+++ b/org.idempiere.hazelcast.service/OSGI-INF/messageservice.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.message">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.hazelcast.service.MessageServiceImpl">
    <implementation class="org.idempiere.hazelcast.service.MessageServiceImpl"/>
    <service>
       <provide interface="org.idempiere.distributed.IMessageService"/>
diff --git a/org.idempiere.ui.zk.selenium/OSGI-INF/fitfixturefactory.xml b/org.idempiere.ui.zk.selenium/OSGI-INF/fitfixturefactory.xml
index 1a3d2201c8..a916384ef3 100644
--- a/org.idempiere.ui.zk.selenium/OSGI-INF/fitfixturefactory.xml
+++ b/org.idempiere.ui.zk.selenium/OSGI-INF/fitfixturefactory.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.zk.selenium.fitnesse.fit.factory">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.idempiere.ui.zk.selenium.fitnesse.FitFixtureFactory">
    <implementation class="org.idempiere.ui.zk.selenium.fitnesse.FitFixtureFactory"/>
    <service>
       <provide interface="org.idempiere.fitnesse.server.fit.IFitFixtureFactory"/>