diff --git a/Architecture.png b/Architecture.png
index c2c3ec795d..020defb5df 100644
Binary files a/Architecture.png and b/Architecture.png differ
diff --git a/README.md b/README.md
index d0525aae66..163fd576e9 100644
--- a/README.md
+++ b/README.md
@@ -86,13 +86,13 @@ curl -X GET "https://localhost:9095/v2/pet/1" -H "accept: application/json" -H "
 - **APICTL** : The APICTL is used to initiate Microgateway projects as well as to deploy APIs in to Microgateway. This is a developer tool used
  to deploy APIs into Microgateway
 
-- **Proxy** : The client facing component of the Microgateway. The downstream request will reach the proxy component and it will route the request 
+- **Router** : The client facing component of the Microgateway. The downstream request will reach the proxy component and it will route the request
 to the desired destination.
 
-- **Enforcer** : This component will intercept the request going through the proxy and applies security, rate limiting, publish analytics data and etc.
-Proxy will forward the request to this component in order to validate and to add additional QoS.
+- **Enforcer** : This component will intercept the request going through the Router and applies security, rate limiting, publish analytics data and etc.
+Router will forward the request to this component in order to validate and to add additional QoS.
 
-- **Adapter** : The component configures the proxy and the enforcer components dynamically during the runtime upon receiving an event for API
+- **Adapter** : The component configures the Router and the enforcer components dynamically during the runtime upon receiving an event for API
 creation or update.
 #### Architecture
 
diff --git a/pom.xml b/pom.xml
index a8cfb55615..5a55023fed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     <modules>
         <module>adapter</module>
         <module>enforcer</module>
-        <module>proxy</module>
+        <module>router</module>
         <module>distribution</module>
     </modules>
 
diff --git a/resources/docker-compose.yaml b/resources/docker-compose.yaml
index 28a360db6c..ce9de95c71 100644
--- a/resources/docker-compose.yaml
+++ b/resources/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
-  proxy:
-    image: wso2am/mg-proxy:4.0.0-SNAPSHOT
+  router:
+    image: wso2am/mg-router:4.0.0-SNAPSHOT
     ports:
       - "9095:9095"
       - "9000:9000"
diff --git a/proxy/pom.xml b/router/pom.xml
similarity index 92%
rename from proxy/pom.xml
rename to router/pom.xml
index 9eab05ee61..ab28d16d3d 100644
--- a/proxy/pom.xml
+++ b/router/pom.xml
@@ -23,10 +23,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>proxy</artifactId>
+    <artifactId>router</artifactId>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
-    <name>Micro Gateway - Proxy</name>
+    <name>Micro Gateway - Router</name>
 
     <build>
         <plugins>
@@ -37,8 +37,8 @@
                 <configuration>
                   <images>
                     <image>
-                        <alias>mg-proxy</alias>
-                        <name>wso2am/mg-proxy:${project.version}</name>
+                        <alias>mg-router</alias>
+                        <name>wso2am/mg-router:${project.version}</name>
                       <build>
                         <contextDir>${project.basedir}/src/main/resources</contextDir>
                         <assembly>
diff --git a/proxy/src/main/assembly/assembly.xml b/router/src/main/assembly/assembly.xml
similarity index 98%
rename from proxy/src/main/assembly/assembly.xml
rename to router/src/main/assembly/assembly.xml
index 85bf0e0dd6..487d8478e7 100644
--- a/proxy/src/main/assembly/assembly.xml
+++ b/router/src/main/assembly/assembly.xml
@@ -17,7 +17,7 @@
   <assembly>
     <includeBaseDirectory>false</includeBaseDirectory>
     <baseDirectory>/</baseDirectory>
-    <id>proxy</id>
+    <id>router</id>
     <formats>
         <format>dir</format>
     </formats>
diff --git a/proxy/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile
similarity index 100%
rename from proxy/src/main/resources/Dockerfile
rename to router/src/main/resources/Dockerfile