diff --git a/README.md b/README.md
index d48596524..0c9365cb5 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ This project contains compontents which implements realtime event processing fun
 #### carbon-event-processing repo contains following components.
 
 * event-processor      
-* execution-manager
+* template-manager
 * event-simulator
 * event-flow
 * siddhi-tryit
diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml
index 9ad0f9b55..3b5a4683b 100644
--- a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml
+++ b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon.analytics-common</groupId>
-            <artifactId>org.wso2.carbon.event.execution.manager.core</artifactId>
+            <artifactId>org.wso2.carbon.event.template.manager.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -92,7 +92,7 @@
                               !org.wso2.carbon.event.processor.template.deployer.internal.*,
                           </Export-Package>
                           <Import-Package>
-                              org.wso2.carbon.event.execution.manager.core,
+                              org.wso2.carbon.event.template.manager.core,
                               *;resolution:=optional,
                           </Import-Package>
 
diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/ExecutionPlanTemplateDeployer.java b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/ExecutionPlanTemplateDeployer.java
index 195306041..7966da275 100644
--- a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/ExecutionPlanTemplateDeployer.java
+++ b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/ExecutionPlanTemplateDeployer.java
@@ -18,9 +18,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.event.execution.manager.core.DeployableTemplate;
-import org.wso2.carbon.event.execution.manager.core.TemplateDeployer;
-import org.wso2.carbon.event.execution.manager.core.TemplateDeploymentException;
+import org.wso2.carbon.event.template.manager.core.DeployableTemplate;
+import org.wso2.carbon.event.template.manager.core.TemplateDeployer;
+import org.wso2.carbon.event.template.manager.core.TemplateDeploymentException;
 import org.wso2.carbon.event.processor.core.internal.util.EventProcessorConstants;
 import org.wso2.carbon.event.processor.template.deployer.internal.ExecutionPlanDeployerConstants;
 import org.wso2.carbon.event.processor.template.deployer.internal.ExecutionPlanDeployerValueHolder;
diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/internal/ds/ExecutionPlanDeployerDS.java b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/internal/ds/ExecutionPlanDeployerDS.java
index fd6847f45..22d2d6f7a 100644
--- a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/internal/ds/ExecutionPlanDeployerDS.java
+++ b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/java/org/wso2/carbon/event/processor/template/deployer/internal/ds/ExecutionPlanDeployerDS.java
@@ -18,7 +18,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.event.execution.manager.core.TemplateDeployer;
+import org.wso2.carbon.event.template.manager.core.TemplateDeployer;
 import org.wso2.carbon.event.processor.template.deployer.ExecutionPlanTemplateDeployer;
 import org.wso2.carbon.event.processor.template.deployer.internal.ExecutionPlanDeployerValueHolder;
 import org.wso2.carbon.event.processor.core.EventProcessorService;
diff --git a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/resources/META-INF/component.xml b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/resources/META-INF/component.xml
index 82356d4b7..578f35641 100644
--- a/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/resources/META-INF/component.xml
+++ b/components/event-processor/org.wso2.carbon.event.processor.template.deployer/src/main/resources/META-INF/component.xml
@@ -18,7 +18,7 @@
     <ManagementPermissions>
         <ManagementPermission>
             <DisplayName>Event processor template deploy</DisplayName>
-            <ResourceId>/permission/admin/manage/execution-manager</ResourceId>
+            <ResourceId>/permission/admin/manage/template-manager</ResourceId>
         </ManagementPermission>
     </ManagementPermissions>er
 
diff --git a/pom.xml b/pom.xml
index cf2e932a0..aec8753c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,22 +241,22 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.core</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.core</artifactId>
                 <version>${carbon.analytics.common.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.ui</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.ui</artifactId>
                 <version>${carbon.analytics.common.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.admin</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.admin</artifactId>
                 <version>${carbon.analytics.common.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.stub</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.stub</artifactId>
                 <version>${carbon.analytics.common.version}</version>
             </dependency>
             <!--analytics-common dependencies end-->
@@ -584,13 +584,13 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.server.feature</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.server.feature</artifactId>
                 <version>${carbon.analytics.common.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.event.execution.manager.ui.feature</artifactId>
+                <artifactId>org.wso2.carbon.event.template.manager.ui.feature</artifactId>
                 <version>${carbon.analytics.common.version}</version>
                 <type>zip</type>
             </dependency>
@@ -747,7 +747,7 @@
                 <module>components/event-flow</module>
                 <module>components/event-processor</module>
                 <module>components/event-simulator</module>
-                <module>components/execution-manager</module>
+                <module>components/template-manager</module>
             </modules>
         </profile>
     </profiles>