diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index b6de3180ca..19f7d20b10 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.product" application="org.adempiere.server.application" version="1.0.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="1.0.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.adempiere.server/plugin.xml b/org.adempiere.server/plugin.xml
index c64a74dbd7..c5a7c2b58a 100644
--- a/org.adempiere.server/plugin.xml
+++ b/org.adempiere.server/plugin.xml
@@ -2,14 +2,6 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension-point id="org.adempiere.server.IServerFactory" name="Adempiere Server Factory" schema="schema/org.adempiere.server.IServerFactory.exsd"/>
-   <extension
-         id="org.adempiere.server.product"
-         point="org.eclipse.core.runtime.products">
-      <product
-            application="org.adempiere.server.application"
-            name="name">
-      </product>
-   </extension>
    <extension
          id="org.adempiere.server.application"
          point="org.eclipse.core.runtime.applications">
@@ -23,7 +15,7 @@
       </application>
    </extension>
    <extension
-         id="product"
+         id="server_product"
          point="org.eclipse.core.runtime.products">
       <product
             application="org.adempiere.server.application"
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index 2aec2efce9..ca60f97a18 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" application="org.adempiere.ui.swing.client" version="1.0.0" useFeatures="true" includeLaunchers="true">
+<product name="Adempiere Swing Client" uid="org.adempiere.ui.swing.product" id="org.adempiere.ui.swing.client_product" application="org.adempiere.ui.swing.client" version="1.0.0" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/org.adempiere.ui.swing/plugin.xml b/org.adempiere.ui.swing/plugin.xml
index 6a458c8500..f303326e2b 100644
--- a/org.adempiere.ui.swing/plugin.xml
+++ b/org.adempiere.ui.swing/plugin.xml
@@ -37,5 +37,17 @@
             class="org.adempiere.client.StatusInterface">
       </interface>
    </extension>
+   <extension
+         id="client_product"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.adempiere.ui.swing.client"
+            name="Adempiere Swing Client">
+         <property
+               name="appName"
+               value="Adempiere Swing Client">
+         </property>
+      </product>
+   </extension>
 
 </plugin>