diff --git a/product/features/com.jboss.jbds.product.feature/p2.inf b/product/features/com.jboss.jbds.product.feature/p2.inf
index 3b47d6d..4b980e1 100644
--- a/product/features/com.jboss.jbds.product.feature/p2.inf
+++ b/product/features/com.jboss.jbds.product.feature/p2.inf
@@ -1,15 +1,7 @@
 # See also feature.xml files for product and product-soa and ensure all URLs are consistent
 # To remove a site, use instructions.unconfigure
+# JBDS-2367, JBDS-2294 do not enforce branding when installing Core Features feature com.jboss.jbds.product.feature
 instructions.configure=\
 org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Xms512m);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Xmx1024m);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:-showsplash);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.platform);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:-product);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.platform);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.epp.package.jee.product);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:com.jboss.jbds.product.product);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addProgramArg(programArg:-product);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addProgramArg(programArg:com.jboss.jbds.product.product);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Dosgi.splashPath=platform${#58}/base/plugins/com.jboss.jbds.product);
 
diff --git a/product/site/com.jboss.jbds.p2.inf b/product/site/com.jboss.jbds.p2.inf
index 694e425..5597a15 100644
--- a/product/site/com.jboss.jbds.p2.inf
+++ b/product/site/com.jboss.jbds.p2.inf
@@ -1,6 +1,16 @@
 # See also feature.xml files for product and product-soa and ensure all URLs are consistent
 # To remove a site, use instructions.unconfigure
+# JBDS-2367, JBDS-2294 enforce branding when installing Branded Product feature com.jboss.jbds.all
 instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:-showsplash);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.platform);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:-product);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.platform);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:org.eclipse.epp.package.jee.product);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeProgramArg(programArg:com.jboss.jbds.product.product);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addProgramArg(programArg:-product);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addProgramArg(programArg:com.jboss.jbds.product.product);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Dosgi.splashPath=platform${#58}/base/plugins/com.jboss.jbds.product);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:https${#58}//devstudio.jboss.com/updates/6.0/,name:JBoss Developer Studio 6.0 Updates);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:https${#58}//devstudio.jboss.com/updates/6.0/extras/,name:JBoss Developer Studio 6.0 Extras);\
@@ -14,7 +24,7 @@ units.1.provides.1.version=$version$
 units.1.properties.1.name=org.eclipse.equinox.p2.type.category
 units.1.properties.1.value=true
 units.1.properties.2.name=org.eclipse.equinox.p2.name
-units.1.properties.2.value=JBoss Developer Studio 5
+units.1.properties.2.value=JBoss Developer Studio
 units.1.requires.1.namespace=org.eclipse.equinox.p2.iu
 units.1.requires.1.name=com.jboss.jbds.all
 units.1.requires.1.range=[$version$,$version$]