diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml
index e598b01294..04e72daafc 100644
--- a/org.adempiere.payment.processor-feature/feature.xml
+++ b/org.adempiere.payment.processor-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin
diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml
index 48b1174abf..4c424f396a 100644
--- a/org.adempiere.pipo-feature/feature.xml
+++ b/org.adempiere.pipo-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin
diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml
index 973a5c95fb..2f7eeb37f5 100644
--- a/org.adempiere.replication-feature/feature.xml
+++ b/org.adempiere.replication-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index b1c477c71a..50911d07ce 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties">
-    <cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.adempiere.sdk.feature" componentType="eclipse.feature"/>
     <cq:property key="buckminster.download.source" value="true"/>
     <cq:property key="osgi.configuration.area.default" value="configuration"/>
     <cq:property key="osgi.user.area" value="${user.home}"/>
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 0a3d385308..a1a3020210 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -108,9 +108,12 @@
   </rm:searchPath>
   <rm:searchPath name="workspace.feature">
     <rm:provider componentTypes="eclipse.feature" readerType="local">
-      <rm:uri format="{0}/{1}-feature">
+      <rm:uri format="{0}/{1}">
         <bc:propertyRef key="workspace.root"/>
-        <bc:propertyRef key="buckminster.component"/>
+		    <bc:replace pattern=".feature" replacement="-feature">
+		      <bc:propertyRef key="buckminster.component"/>
+		    </bc:replace>
+			  
       </rm:uri>
     </rm:provider>
   </rm:searchPath>
diff --git a/org.adempiere.server-feature/buckminster.cspex b/org.adempiere.server-feature/buckminster.cspex
index bf4dc77641..2e90efa512 100644
--- a/org.adempiere.server-feature/buckminster.cspex
+++ b/org.adempiere.server-feature/buckminster.cspex
@@ -5,8 +5,8 @@
 	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
 	<dependencies>
 		<!-- Place your Dependencies here -->
-		<dependency name="org.idempiere.equinox.p2.director" componentType="eclipse.feature"/>
-		<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/>
+		<dependency name="org.idempiere.equinox.p2.director.feature" componentType="eclipse.feature"/>
+		<dependency name="org.idempiere.fitnesse.feature" componentType="eclipse.feature"/>
 		<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
 		<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
 		<dependency name="org.idempiere.fitrecorder" componentType="osgi.bundle"/>
@@ -76,13 +76,12 @@
 		<public name="bundle.jars">
 			<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
 			<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
-			<attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
 			<attribute name="bundle.jars" component="org.idempiere.fitrecorder"/>
 			<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
 		</public>
 		<public name="feature.references">
-		    <attribute name="feature.jars" component="org.idempiere.equinox.p2.director"/>
-			<attribute name="feature.jars" component="org.idempiere.fitnesse"/>
+		    <attribute name="feature.jars" component="org.idempiere.equinox.p2.director.feature"/>
+			<attribute name="feature.jars" component="org.idempiere.fitnesse.feature"/>
         </public>
 	</alterGroups>
 </cspecExtension>
diff --git a/org.adempiere.server-feature/buckminster.properties b/org.adempiere.server-feature/buckminster.properties
index 0af91deea8..3e54e500a0 100644
--- a/org.adempiere.server-feature/buckminster.properties
+++ b/org.adempiere.server-feature/buckminster.properties
@@ -10,7 +10,7 @@ target.os=*
 target.ws=*
 target.arch=*
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
index 512965b826..ba04fd770c 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
@@ -10,7 +10,7 @@ target.os=linux
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
index 22d5db826b..851713fed8 100644
--- a/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
@@ -10,7 +10,7 @@ target.os=linux
 target.ws=gtk
 target.arch=x86_64
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_macosx_x86.properties b/org.adempiere.server-feature/buckminster_macosx_x86.properties
index 9d1b4fb981..bf5677f953 100644
--- a/org.adempiere.server-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.server-feature/buckminster_macosx_x86.properties
@@ -10,7 +10,7 @@ target.os=macosx
 target.ws=cocoa
 target.arch=x86
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
index 223491493f..282e867c92 100644
--- a/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
+++ b/org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
@@ -10,7 +10,7 @@ target.os=solaris
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_win32_x86.properties b/org.adempiere.server-feature/buckminster_win32_x86.properties
index 02d08f0484..8a14052366 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86.properties
@@ -10,7 +10,7 @@ target.os=win32
 target.ws=win32
 target.arch=x86
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/buckminster_win32_x86_64.properties b/org.adempiere.server-feature/buckminster_win32_x86_64.properties
index ebdcc5d72b..d4236be41c 100644
--- a/org.adempiere.server-feature/buckminster_win32_x86_64.properties
+++ b/org.adempiere.server-feature/buckminster_win32_x86_64.properties
@@ -10,7 +10,7 @@ target.os=win32
 target.ws=win32
 target.arch=x86_64
 
-product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group
+product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
 product.profile=DefaultProfile
 product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director
 
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index af00fff7dd..63901f2f69 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -3,6 +3,7 @@
 
 <product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="5.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -17,23 +18,26 @@
 
    <windowImages/>
 
+
    <launcher name="idempiere">
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
+
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
    </vm>
 
+
    <plugins>
    </plugins>
 
    <features>
-      <feature id="org.adempiere.server"/>
-      <feature id="org.adempiere.target.platform"/>
-      <feature id="org.idempiere.eclipse.platform"/>
+      <feature id="org.adempiere.server.feature"/>
+      <feature id="org.adempiere.target.platform.feature"/>
+      <feature id="org.idempiere.eclipse.platform.feature"/>
    </features>
 
    <configurations>
diff --git a/org.adempiere.ui.swing-feature/buckminster.cspex b/org.adempiere.ui.swing-feature/buckminster.cspex
index 6e2126821d..7445dd47e6 100644
--- a/org.adempiere.ui.swing-feature/buckminster.cspex
+++ b/org.adempiere.ui.swing-feature/buckminster.cspex
@@ -5,7 +5,7 @@
 	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
 	<dependencies>
 		<!-- Place your Dependencies here -->
-		<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/>
+		<dependency name="org.idempiere.eclipse.platform.feature" componentType="eclipse.feature"/>
 	</dependencies>
 	<generators>
 		<!-- Place your Generators here -->
@@ -57,11 +57,8 @@
 		<!-- Place your Action alterations here -->
 	</alterActions>
 	<alterGroups>
-		<public name="bundle.jars">
-			<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
-		</public>
 		<public name="feature.references">
-			<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/>
+			<attribute name="feature.jars" component="org.idempiere.eclipse.platform.feature"/>
         </public>
 	</alterGroups>
 </cspecExtension>
diff --git a/org.adempiere.ui.swing-feature/buckminster.properties b/org.adempiere.ui.swing-feature/buckminster.properties
index 3df88687cd..4b7d8f980f 100644
--- a/org.adempiere.ui.swing-feature/buckminster.properties
+++ b/org.adempiere.ui.swing-feature/buckminster.properties
@@ -10,6 +10,6 @@ target.os=*
 target.ws=*
 target.arch=*
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
\ No newline at end of file
diff --git a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
index 0bc5e722af..ddfca90194 100644
--- a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
@@ -10,6 +10,6 @@ target.os=linux
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86_64.properties b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86_64.properties
index aec56eaf81..c73d4c1945 100644
--- a/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86_64.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86_64.properties
@@ -10,6 +10,6 @@ target.os=linux
 target.ws=gtk
 target.arch=x86_64
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
index c473099a1a..c6461dd26e 100644
--- a/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
@@ -10,6 +10,6 @@ target.os=macosx
 target.ws=cocoa
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_solaris_gtk_x86.properties b/org.adempiere.ui.swing-feature/buckminster_solaris_gtk_x86.properties
index 4eb6bcdc9f..b4e42cbb7d 100644
--- a/org.adempiere.ui.swing-feature/buckminster_solaris_gtk_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_solaris_gtk_x86.properties
@@ -10,6 +10,6 @@ target.os=solaris
 target.ws=gtk
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
index fcd68b1bb3..0534fbf6fa 100644
--- a/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
+++ b/org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
@@ -10,6 +10,6 @@ target.os=win32
 target.ws=win32
 target.arch=x86
 
-product.features=org.idempiere.eclipse.platform.feature.group  
+product.features=org.idempiere.eclipse.platform.feature.feature.group  
 product.profile=DefaultProfile
 product.id=org.adempiere.ui.swing.product
diff --git a/org.adempiere.ui.swing-feature/swingclient.product b/org.adempiere.ui.swing-feature/swingclient.product
index ba3b071073..769cdc5b33 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product
+++ b/org.adempiere.ui.swing-feature/swingclient.product
@@ -7,13 +7,15 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>--launcher.XXMaxPermSize 192m</programArgs>
-      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <programArgs>--launcher.XXMaxPermSize 192m
+      </programArgs>
+      <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true
+      </vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
    </launcherArgs>
 
    <launcher name="adempiere-client">
-      <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
@@ -26,10 +28,10 @@
    </plugins>
 
    <features>
-      <feature id="org.adempiere.base" version="5.1.0.qualifier"/>
-      <feature id="org.adempiere.ui.swing" version="5.1.0.qualifier"/>
-      <feature id="org.idempiere.hazelcast.service" version="5.1.0.qualifier"/>
-      <feature id="org.adempiere.pipo" version="5.1.0.qualifier"/>
+      <feature id="org.adempiere.base.feature" version="5.1.0.qualifier"/>
+      <feature id="org.adempiere.pipo.feature" version="5.1.0.qualifier"/>
+      <feature id="org.adempiere.ui.swing.feature" version="5.1.0.qualifier"/>
+      <feature id="org.idempiere.hazelcast.service.feature" version="5.1.0.qualifier"/>
    </features>
 
    <configurations>
diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml
index d06cde1e0d..cf3060d247 100644
--- a/org.compiere.db.provider-feature/feature.xml
+++ b/org.compiere.db.provider-feature/feature.xml
@@ -17,7 +17,7 @@
    </license>
 
    <requires>
-      <import feature="org.adempiere.base" version="0.0.0"/>
+      <import feature="org.adempiere.base.feature" version="0.0.0"/>
    </requires>
 
    <plugin