diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
index 376ed91c77..e2885cf65f 100644
--- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
+++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java
@@ -615,7 +615,7 @@ public void timeout(NHttpServerConnection conn) {
                     "STATE_DESCRIPTION = Socket Timeout occurred after accepting the request headers and the request "
                             + "body, INTERNAL_STATE = "
                             + state + ", DIRECTION = " + logDetails.get("direction") + ", "
-                            + "CAUSE_OF_ERROR = Connection between the client and the EI timeouts, HTTP_URL = "
+                            + "CAUSE_OF_ERROR = Connection between the client and the WSO2 server timeouts, HTTP_URL = "
                             + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                             + ", SOCKET_TIMEOUT = " + conn.getSocketTimeout() + ", CLIENT_ADDRESS = "
                             + getClientConnectionInfo(conn)
@@ -649,7 +649,7 @@ public void closed(NHttpServerConnection conn) {
             log.warn("STATE_DESCRIPTION = Connection closed while server accepting request headers but prior to "
                     + "finish reading the request body, INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails
                     .get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)
@@ -663,7 +663,7 @@ public void closed(NHttpServerConnection conn) {
             informWriterError(conn);
             log.warn("STATE_DESCRIPTION = Connection closed while server writing the response headers or body, "
                     + "INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails.get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)
@@ -676,7 +676,7 @@ public void closed(NHttpServerConnection conn) {
             informWriterError(conn);
             log.warn("STATE_DESCRIPTION = Connection closed after server accepting the request headers and the "
                     + "request body, INTERNAL_STATE = " + state + ", DIRECTION = " + logDetails.get("direction") + ", "
-                    + "CAUSE_OF_ERROR = Connection between EI and the Client has been closed, HTTP_URL = " + logDetails
+                    + "CAUSE_OF_ERROR = Connection between WSO2 Server and the Client has been closed, HTTP_URL = " + logDetails
                     .get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + ", CLIENT_ADDRESS = "
                     + getClientConnectionInfo(conn)
                     + ", CORRELATION_ID = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID)
diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java
index 8f09e82bf2..8ac63515c9 100644
--- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java
+++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java
@@ -775,7 +775,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails
@@ -790,7 +790,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails
@@ -803,7 +803,7 @@ public void timeout(NHttpClientConnection conn) {
                 log.warn("ERROR_CODE = " + ErrorCodes.CONNECTION_TIMEOUT + ", STATE_DESCRIPTION = Socket Timeout "
                         + "occurred " + logDetails.get("state_description") + ", INTERNAL_STATE = " + state
                         + ", DIRECTION = " + logDetails.get("direction") + ", "
-                        + "CAUSE_OF_ERROR = Connection between the EI and the BackEnd timeouts, TARGET_HOST = "
+                        + "CAUSE_OF_ERROR = Connection between the WSO2 Server and the BackEnd timeouts, TARGET_HOST = "
                         + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + ", TARGET_CONTEXT = "
                         + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method")
                         + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails