diff --git a/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 837355e2e..6caaa68d4 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -163,7 +163,7 @@
                                     org.wso2.carbon:org.wso2.carbon.um.ws.service.server.feature:${carbon.platform.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.user.mgt.server.feature:${carbon.platform.version}
+                                    org.wso2.carbon:org.wso2.carbon.user.mgt.feature:${carbon.platform.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.oauth.feature:${carbon.platform.version}
@@ -259,16 +259,16 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.platform.version}
                                 </featureArtifactDef>
-                                
-				<featureArtifactDef>
+
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.identity.self.registration.server.feature:${carbon.platform.version}
                                 </featureArtifactDef>
-				
-				<!-- API Manager Publisher and Store Features -->
-				<featureArtifactDef>
+
+                                <!-- API Manager Publisher and Store Features -->
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.apimgt.publisher.feature:${carbon.platform.version}
                                 </featureArtifactDef>
-				<featureArtifactDef>
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.apimgt.store.feature:${carbon.platform.version}
                                 </featureArtifactDef>
 
@@ -396,7 +396,7 @@
                                     <version>${carbon.platform.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.user.mgt.server.feature.group</id>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
                                 <feature>
@@ -533,17 +533,17 @@
                                     <version>${carbon.platform.version}</version>
                                 </feature>
 
-				<!-- API Manager Publisher and Store Features -->
-				<feature>
+                                <!-- API Manager Publisher and Store Features -->
+                                <feature>
                                     <id>org.wso2.carbon.apimgt.publisher.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>org.wso2.carbon.apimgt.store.feature.group</id>
                                     <version>${carbon.platform.version}</version>
                                 </feature>
-                                
-				<!-- SSO Features -->
+
+                                <!-- SSO Features -->
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group