diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml
index 5c936670..82a6af46 100644
--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@@ -79,7 +79,7 @@
 								<artifactItem>
 									<groupId>org.wso2.carbon</groupId>
 									<artifactId>wso2carbon-core</artifactId>
-									<version>${carbon.kernel.version.iotcore}</version>
+									<version>${carbon.kernel.version}</version>
 									<type>zip</type>
 									<overWrite>true</overWrite>
 									<outputDirectory>target</outputDirectory>
@@ -105,7 +105,7 @@
 							<tasks>
 								<echo message="########### Create Device Management H2 Schema ###########" />
 
-								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
 								<property name="userid" value="wso2carbon" />
 								<property name="password" value="wso2carbon" />
 								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@@ -115,7 +115,7 @@
 									<classpath refid="maven.compile.classpath" />
 									<classpath refid="maven.runtime.classpath" />
 
-									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm/h2.sql" />
+									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/h2.sql" />
 								</sql>
 								<echo message="##################### END ####################" />
 							</tasks>
@@ -132,7 +132,7 @@
                             <tasks>
                                 <echo message="########### Create Certificate Management H2 Schema ###########" />
 
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
                                 <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@@ -141,7 +141,7 @@
                                     <classpath refid="maven.dependency.classpath" />
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
-                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt/h2.sql" />
+                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt/h2.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </tasks>
@@ -158,7 +158,7 @@
 							<tasks>
 								<echo message="########### Create API Management H2 Schema ###########" />
 
-								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
 								<property name="userid" value="wso2carbon" />
 								<property name="password" value="wso2carbon" />
 								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@@ -168,7 +168,7 @@
 									<classpath refid="maven.compile.classpath" />
 									<classpath refid="maven.runtime.classpath" />
 
-									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt/h2.sql" />
+									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt/h2.sql" />
 								</sql>
 								<echo message="##################### END ####################" />
 							</tasks>
@@ -186,7 +186,7 @@
 							<tasks>
 								<echo message="########### Create App Management H2 Schema ###########" />
 
-								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
 								<property name="userid" value="wso2carbon" />
 								<property name="password" value="wso2carbon" />
 								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
@@ -196,7 +196,7 @@
 									<classpath refid="maven.compile.classpath" />
 									<classpath refid="maven.runtime.classpath" />
 
-									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt/h2.sql" />
+									<fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" />
 								</sql>
 								<echo message="##################### END ####################" />
 							</tasks>
@@ -214,7 +214,7 @@
                             <tasks>
                                 <echo message="########### Create JAGH2 Schema ###########" />
 
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
                                 <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />
@@ -225,7 +225,7 @@
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
 
-                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage/h2/h2.sql" />
+                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </tasks>
@@ -243,7 +243,7 @@
                             <tasks>
                                 <echo message="########### Create Social Plugin H2 Schema ###########" />
 
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database" />
+                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
                                 <property name="userid" value="wso2carbon" />
                                 <property name="password" value="wso2carbon" />
                                 <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />
@@ -253,7 +253,7 @@
                                     <classpath refid="maven.compile.classpath" />
                                     <classpath refid="maven.runtime.classpath" />
 
-                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social/h2/resource.sql" />
+                                    <fileset file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
                                 </sql>
                                 <echo message="##################### END ####################" />
                             </tasks>
@@ -281,7 +281,7 @@
 										<include name="${project.artifactId}-${project.version}.zip" />
 									</fileset>
 								</unzip>
-								<copy todir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components" overwrite="true">
+								<copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components" overwrite="true">
 									<fileset dir="${tempdir}/${project.artifactId}-${project.version}/repository/components" />
 								</copy>
 								<!--testing -->
@@ -310,7 +310,7 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps" />
+								<mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps" />
 							</tasks>
 						</configuration>
 						<goals>
@@ -327,8 +327,8 @@
 								<delete dir="target/archive-tmp" />
 								<delete dir="target/dependency-maven-plugin-markers" />
 								<delete dir="target/maven-archiver" />
-								<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
-								<delete dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}" />
+								<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
+								<delete dir="target/wso2carbon-core-${carbon.kernel.version}" />
 								<delete file="target/${project.artifactId}-${project.version}.jar" />
 								<delete dir="target/sources" />
 								<delete dir="target/site" />
@@ -347,7 +347,7 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <tasks>
-            			<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/">
+            			<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
               			   <include name="entitlement.properties" />
             			</replace>
                             </tasks>
@@ -422,7 +422,7 @@
 						</goals>
 						<configuration>
 							<file>
-								${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/api-manager.xml
+								${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/api-manager.xml
 							</file>
 							<replacements>
 								<replacement>
@@ -441,7 +441,7 @@
 						</goals>
 						<configuration>
 							<file>
-								${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
+								${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/site/conf/site.json
 							</file>
 							<replacements>
 								<replacement>
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 43806ba1..233f1d0c 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -48,7 +48,7 @@
 
     <fileSets>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.version.iotcore}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
@@ -120,7 +120,7 @@
         <!-- Copying Runtimes-->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/runtimes
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib/runtimes/</outputDirectory>
             <includes>
@@ -128,7 +128,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>target/wso2carbon-core-${carbon.kernel.version.iotcore}</directory>
+            <directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
@@ -143,7 +143,7 @@
         <!-- Multi-tenancy related file -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/multitenancy
             </outputDirectory>
@@ -157,7 +157,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/multitenancy/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <includes>
@@ -190,7 +190,7 @@
         </fileSet>
 
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/modules
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
@@ -228,7 +228,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/security
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security
             </outputDirectory>
@@ -254,7 +254,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources
             </outputDirectory>
@@ -264,7 +264,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/device-types
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/device-types
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/device-types
             </outputDirectory>
@@ -288,7 +288,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/service-provider
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/service-provider
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/service-provider</outputDirectory>
             <includes>
@@ -298,7 +298,7 @@
 
         <!-- Copying API management related dbscripts -->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/apimgt</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/apimgt</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/apimgt</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -306,14 +306,14 @@
         </fileSet>
         <!-- Copying APP management related dbscripts -->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/storage</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/storage</outputDirectory>
             <includes>
                 <include>*/**</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/appmgt</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/appmgt</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -323,7 +323,7 @@
         <!-- Copying Certificate management related dbscripts -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/certMgt
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/certMgt
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/certMgt</outputDirectory>
             <includes>
@@ -332,7 +332,7 @@
         </fileSet>
         <!-- Copying Social plugin related dbscripts -->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/social</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/social</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -356,7 +356,7 @@
         </fileSet>
         <!--Copying modules-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
                 <include>*/**</include>
@@ -382,7 +382,7 @@
         <!--Copying modules-->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/modules
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/modules
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/modules/</outputDirectory>
             <includes>
@@ -400,7 +400,7 @@
         <!-- Copying Device Management related dbscripts -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/cdm
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm</outputDirectory>
             <includes>
@@ -408,13 +408,13 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps
             </outputDirectory>
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/resources
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
             </outputDirectory>
@@ -436,7 +436,7 @@
         <!-- Copying Authentication Endpoint webapp -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps
             </outputDirectory>
@@ -450,7 +450,7 @@
         <!-- Copying mdm app from devicemgt app-->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -458,7 +458,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/devicemgt-cdmf/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -466,7 +466,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/uuf-template-app/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/uuf-template-app/
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/devicemgt
@@ -475,7 +475,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/webapps/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/
             </outputDirectory>
@@ -491,7 +491,7 @@
         <!-- Copying APP Manager Publisher and Store Jaggery apps -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/publisher/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/publisher/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/publisher
             </outputDirectory>
@@ -505,7 +505,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/store/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/store/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store
             </outputDirectory>
@@ -521,7 +521,7 @@
         <!-- Copying API Manager Store Jaggery app -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/api-store/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/api-store/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/api-store
             </outputDirectory>
@@ -552,7 +552,7 @@
         </fileSet>
 
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/social/</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/social/</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/social</outputDirectory>
         </fileSet>
 
@@ -577,7 +577,7 @@
         <!-- Copying RXTs corresponding API management related components -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/rxts
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/rxts
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/rxts
             </outputDirectory>
@@ -585,7 +585,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
             </outputDirectory>
@@ -606,7 +606,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/identity-providers
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity-providers
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
@@ -617,7 +617,7 @@
         </fileSet>
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/service-providers
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/service-providers
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/conf/identity/service-providers
@@ -631,7 +631,7 @@
 
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/dbscripts/metrics/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/metrics/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/metrics</outputDirectory>
             <includes>
@@ -643,7 +643,7 @@
         <!--QPID related configurations-->
         <!--fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/advanced/
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/advanced</outputDirectory>
             <includes>
@@ -657,7 +657,7 @@
         <!-- Dashboard portal Jaggery app. Should be copied to <DAS_HOME>/repository/deployment/server/jaggeryapps -->
         <fileSet>
             <directory>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/jaggeryapps/portal
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps/portal
             </directory>
             <outputDirectory>
                 ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal
@@ -772,14 +772,14 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/event-broker.xml
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/registry-event-broker.xml
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry-event-broker.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
@@ -810,13 +810,13 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/README.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/version.txt</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -824,7 +824,7 @@
         <!-- Copying logging-config.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/logging-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -839,13 +839,13 @@
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/README</source>
+            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/README</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/identity/oidc-scope-config.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/oidc-scope-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity/</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -885,7 +885,7 @@
         <!-- Copying governance.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/governance.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/governance.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <fileMode>644</fileMode>
@@ -911,7 +911,7 @@
         </file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
             </outputDirectory>
@@ -932,7 +932,7 @@
         <!--certificate config file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/certificate-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/certificate-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
@@ -940,31 +940,31 @@
         </file>
         <!--Metrics-->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.properties</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>false</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/metrics.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>false</filtered>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/datasources/metrics-datasources.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2METRICS_DB.h2.db</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <!-- nTask Component -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/tasks-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc/</outputDirectory>
             <fileMode>644</fileMode>
@@ -994,7 +994,7 @@
         <!--Webapp Authenticator Config file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/webapp-authenticator-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/webapp-authenticator-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1013,7 +1013,7 @@
         <!-- Copying email-sender-config.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/email-sender-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/email-sender-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1022,7 +1022,7 @@
         <!--cdm plugin config file-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/tomcat/webapp-classloading-environments.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat
             </outputDirectory>
@@ -1031,7 +1031,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/claim-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/
             </outputDirectory>
@@ -1041,7 +1041,7 @@
         <!-- Copying H2 database related files corresponding to default API management repository schema -->
         <file>
             <source>
-                target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2AM_DB.h2.db
+                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2AM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
             <destName>WSO2AM_DB.h2.db</destName>
@@ -1050,7 +1050,7 @@
         <!-- Copying H2 database related files corresponding to default App management repository schema -->
         <file>
             <source>
-                target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2APPM_DB.h2.db
+                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
             <destName>WSO2APPM_DB.h2.db</destName>
@@ -1059,7 +1059,7 @@
         <!-- Copying H2 database related files corresponding to default Device management repository schema -->
         <file>
             <source>
-                target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/database/WSO2DM_DB.h2.db
+                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
             <destName>WSO2DM_DB.h2.db</destName>
@@ -1076,7 +1076,7 @@
         <!-- Copying axis2-client.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/axis2/axis2_client.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/axis2/axis2_client.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/axis2
             </outputDirectory>
@@ -1111,21 +1111,21 @@
         <!-- Cipher Tool Files -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.sh
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.sh
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
             <fileMode>755</fileMode>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/bin/ciphertool.bat
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/bin/ciphertool.bat
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
             <fileMode>644</fileMode>
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/org.wso2.ciphertool-${cipher.tool.version}.jar
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
             <fileMode>644</fileMode>
@@ -1134,7 +1134,7 @@
         <!--DAS Files-->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/output-event-adapters.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/output-event-adapters.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
             </outputDirectory>
@@ -1143,7 +1143,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/input-event-adapters.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/input-event-adapters.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf
             </outputDirectory>
@@ -1152,7 +1152,7 @@
         </file>
         <!-- ************* Data bridge related files ********** -->
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-bridge-config.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-bridge-config.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1163,7 +1163,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/data-bridge/data-agent-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge
             </outputDirectory>
@@ -1183,7 +1183,7 @@
 
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/jwt.properties
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/jwt.properties
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1191,7 +1191,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/websocket-validation.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/websocket-validation.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1199,7 +1199,7 @@
         </file>
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/device-analytics-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/device-analytics-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1215,7 +1215,7 @@
         </file>
 
         <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/social.xml</source>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
             <fileMode>644</fileMode>
@@ -1233,7 +1233,7 @@
         <!-- Copying devi-appmanager-config.xml -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/conf/etc/remote-appmanager-config.xml
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/remote-appmanager-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
             <filtered>true</filtered>
@@ -1242,7 +1242,7 @@
         <!-- Adding IoT Analytics Dashboard and gadget CApps -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/carbonapps/org_wso2_carbon_analytics_cdmf-1.0.0.car
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/carbonapps/</outputDirectory>
             <fileMode>644</fileMode>
diff --git a/modules/core/distribution/src/assembly/dist.xml b/modules/core/distribution/src/assembly/dist.xml
index b3e35d24..1cc58910 100644
--- a/modules/core/distribution/src/assembly/dist.xml
+++ b/modules/core/distribution/src/assembly/dist.xml
@@ -25,7 +25,7 @@
     <fileSets>
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
-            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components</directory>
+            <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
diff --git a/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml
index dab42ddf..b177023e 100644
--- a/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml
+++ b/modules/core/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml
@@ -168,7 +168,7 @@
 								</properties>
 							</adviceFile>
 							<importFeatures>
-								<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+								<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
 								</importFeatureDef>
 								<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
 								</importFeatureDef>
diff --git a/modules/core/distribution/src/samples/connectedcup/pom.xml b/modules/core/distribution/src/samples/connectedcup/pom.xml
index 06d8d063..6f6f6caf 100644
--- a/modules/core/distribution/src/samples/connectedcup/pom.xml
+++ b/modules/core/distribution/src/samples/connectedcup/pom.xml
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -143,7 +143,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -208,7 +208,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -363,7 +363,7 @@
 
 
     <properties>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>1.2.6-SNAPSHOT</carbon.device.mgt.version>
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml b/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
index 5b213945..cc0a9897 100644
--- a/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
@@ -207,7 +207,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/connectedlap/pom.xml b/modules/core/distribution/src/samples/connectedlap/pom.xml
index b56ec0b3..348a5d32 100644
--- a/modules/core/distribution/src/samples/connectedlap/pom.xml
+++ b/modules/core/distribution/src/samples/connectedlap/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml b/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
index 299e1fd6..7ef7c651 100644
--- a/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
@@ -197,7 +197,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/currentsensor/pom.xml b/modules/core/distribution/src/samples/currentsensor/pom.xml
index 422afae8..5124b9f7 100644
--- a/modules/core/distribution/src/samples/currentsensor/pom.xml
+++ b/modules/core/distribution/src/samples/currentsensor/pom.xml
@@ -82,7 +82,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -173,10 +173,10 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -245,7 +245,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -306,7 +306,7 @@
                 </exclusions>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -375,17 +375,17 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.api</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
         </dependencies>
 
     </dependencyManagement>
     <properties>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml b/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
index 699e3b0c..d606e7b9 100644
--- a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
@@ -194,7 +194,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/digitaldisplay/pom.xml b/modules/core/distribution/src/samples/digitaldisplay/pom.xml
index 45f48d07..c7ff2152 100644
--- a/modules/core/distribution/src/samples/digitaldisplay/pom.xml
+++ b/modules/core/distribution/src/samples/digitaldisplay/pom.xml
@@ -81,7 +81,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -183,10 +183,10 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.ndatasource.core_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -255,7 +255,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -316,7 +316,7 @@
                 </exclusions>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.utils_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -385,10 +385,10 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.api</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version.iotcore}.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.user.api_${carbon.kernel.version}.jar
                 </systemPath>
             </dependency>
         </dependencies>
@@ -460,7 +460,7 @@
 
 
     <properties>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
 
         <!-- Carbon Device Management -->
         <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml b/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml
index a3ae93da..fa1a60c1 100644
--- a/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml
@@ -193,7 +193,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/doormanager/pom.xml b/modules/core/distribution/src/samples/doormanager/pom.xml
index 007e4480..b46bd46a 100644
--- a/modules/core/distribution/src/samples/doormanager/pom.xml
+++ b/modules/core/distribution/src/samples/doormanager/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,17 +196,17 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.api</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -394,7 +394,7 @@
         <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>
 
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml b/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
index 5d0e1293..356f0970 100644
--- a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
@@ -193,7 +193,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/droneanalyzer/pom.xml b/modules/core/distribution/src/samples/droneanalyzer/pom.xml
index af561b75..7187db4e 100644
--- a/modules/core/distribution/src/samples/droneanalyzer/pom.xml
+++ b/modules/core/distribution/src/samples/droneanalyzer/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -384,7 +384,7 @@
         <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>
 
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml b/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml
index 4383c168..86dc13f9 100644
--- a/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml
@@ -193,7 +193,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/firealarm/pom.xml b/modules/core/distribution/src/samples/firealarm/pom.xml
index 37a7e2d2..5ebd8fae 100644
--- a/modules/core/distribution/src/samples/firealarm/pom.xml
+++ b/modules/core/distribution/src/samples/firealarm/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -384,7 +384,7 @@
         <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>
 
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml b/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
index e3fbfbcf..99b8ef43 100644
--- a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
@@ -194,7 +194,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/geolocationTracker/pom.xml b/modules/core/distribution/src/samples/geolocationTracker/pom.xml
index b65111c4..2d8c805e 100644
--- a/modules/core/distribution/src/samples/geolocationTracker/pom.xml
+++ b/modules/core/distribution/src/samples/geolocationTracker/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -384,7 +384,7 @@
         <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>
 
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml b/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml
index 07bf986e..349ac994 100644
--- a/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml
+++ b/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml
@@ -193,7 +193,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/distribution/src/samples/watertank/pom.xml b/modules/core/distribution/src/samples/watertank/pom.xml
index 2dba6c58..67453059 100644
--- a/modules/core/distribution/src/samples/watertank/pom.xml
+++ b/modules/core/distribution/src/samples/watertank/pom.xml
@@ -57,7 +57,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -132,7 +132,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -197,7 +197,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -375,7 +375,7 @@
         <carbon.device.mgt.plugin.version>2.2.3-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
         <org.apache.httpcomponents.version>4.1</org.apache.httpcomponents.version>
 
diff --git a/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
index d91612cf..bdc7e9c9 100644
--- a/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
+++ b/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
@@ -68,7 +68,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 3f1d24dd..73c5c237 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -49,7 +49,7 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon</groupId>
                                     <artifactId>wso2carbon-core</artifactId>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
@@ -526,13 +526,13 @@
 
                                 <!--********************************************-->
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version.iotcore}
+                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version.iotcore}
+                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version.iotcore}
+                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
                                 </featureArtifactDef>
 
                                 <!-- Carbon Commons Features -->
@@ -733,7 +733,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <targetPath>
-                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </targetPath>
                             <profile>http-gateway</profile>
                         </configuration>
@@ -749,7 +749,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <targetPath>
-                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </targetPath>
                             <profile>device-key-manager</profile>
                         </configuration>
@@ -765,7 +765,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <targetPath>
-                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </targetPath>
                             <profile>devicetype-publisher</profile>
                         </configuration>
@@ -781,7 +781,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <targetPath>
-                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </targetPath>
                             <profile>devicetype-worker</profile>
                         </configuration>
@@ -797,7 +797,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -1319,15 +1319,15 @@
                                 <!--********************************************-->
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.ui.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
 
                                 <!-- Carbon Deployment Features -->
@@ -1519,7 +1519,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -1559,15 +1559,15 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.common.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
@@ -1893,7 +1893,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -1935,7 +1935,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -1988,7 +1988,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.common.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
@@ -1996,11 +1996,11 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.ntask.core.feature.group</id>
@@ -2339,7 +2339,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -2474,7 +2474,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -2494,7 +2494,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.common.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
@@ -2506,19 +2506,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.ui.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
@@ -2943,7 +2943,7 @@
                             <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
                             <destination>
-                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/components
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
@@ -3069,7 +3069,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.apache.axis2.transport.mail.feature.group</id>
@@ -3089,7 +3089,7 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.common.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.user.mgt.feature.group</id>
@@ -3101,19 +3101,19 @@
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.server.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.runtime.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.core.ui.feature.group</id>
-                                    <version>${carbon.kernel.version.iotcore}</version>
+                                    <version>${carbon.kernel.version}</version>
                                 </feature>
                                 <feature>
                                     <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
@@ -3513,7 +3513,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version.iotcore}/repository/components">
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
                                     <include name="**/bundles.info" />
                                 </replace>
                             </tasks>
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
index 775f45e7..b3bcd521 100644
--- a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
@@ -193,7 +193,7 @@
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
-                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version.iotcore}
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.device.mgt.version}
                                 </importFeatureDef>
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
index bb8dba8c..7bc3825d 100644
--- a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
@@ -56,7 +56,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.log4j.wso2</groupId>
@@ -131,7 +131,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
-                <version>${carbon.kernel.version.iotcore}</version>
+                <version>${carbon.kernel.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.bouncycastle.wso2</groupId>
@@ -380,7 +380,7 @@
         <!-- Carbon Device Management -->
         <carbon.devicemgt.version>1.1.0-SNAPSHOT</carbon.devicemgt.version>
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
-        <carbon.kernel.version.iotcore>4.4.3</carbon.kernel.version.iotcore>
+        <carbon.kernel.version>4.4.3</carbon.kernel.version>
         <carbon.device.mgt.version>1.2.3-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
         <carbon-p2-plugin.version>1.5.3</carbon-p2-plugin.version>
diff --git a/pom.xml b/pom.xml
index e358ab3b..45d9ab48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1454,7 +1454,6 @@
 
         <!--Carbon kernel versions-->
         <carbon.kernel.version>4.4.11</carbon.kernel.version>
-        <carbon.kernel.version.iotcore>4.4.11</carbon.kernel.version.iotcore>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>