2 files changed, 5 insertions, 5 deletions
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index d02c78b22e..3a10a8d00f 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -83,7 +83,7 @@ class TransportManagerImpl : public TransportManager,
     TransportManagerImpl* transport_manager;
     TransportAdapter* transport_adapter;
     TimerSPtr timer;
-    bool shutDown;
+    bool shut_down;
     DeviceHandle device_handle_;
     int messages_count;
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 5cddefdb0b..0745e55583 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -297,7 +297,7 @@ int TransportManagerImpl::SendMessageToDevice(const ::protocol_handler::RawMessa
     return E_INVALID_HANDLE;
   }
 
-  if (connection->shutDown) {
+  if (connection->shut_down) {
     LOG4CXX_ERROR(logger_, "TransportManagerImpl::Disconnect: Connection is to shut down.");
     LOG4CXX_TRACE(logger_,
                   "exit with E_CONNECTION_IS_TO_SHUTDOWN. Condition: connection->shutDown");
@@ -696,7 +696,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) {
         break;
       }
       RaiseEvent(&TransportManagerListener::OnTMMessageSend, event.event_data);
-      if (connection->shutDown && --connection->messages_count == 0) {
+      if (connection->shut_down && --connection->messages_count == 0) {
         connection->timer->Stop();
         connection->transport_adapter->Disconnect(connection->device,
             connection->application);
@@ -864,7 +864,7 @@ TransportManagerImpl::ConnectionInternal::ConnectionInternal(TransportManagerImp
                 new ::timer::TimerTaskImpl<ConnectionInternal> (
                     this,
                     &ConnectionInternal::DisconnectFailedRoutine))),
-      shutDown(false),
+      shut_down(false),
       device_handle_(device_handle),
       messages_count(0) {
   Connection::id = id;
@@ -876,7 +876,7 @@ void TransportManagerImpl::ConnectionInternal::DisconnectFailedRoutine() {
   LOG4CXX_TRACE(logger_, "enter");
   transport_manager->RaiseEvent(&TransportManagerListener::OnDisconnectFailed,
                                 device_handle_, DisconnectDeviceError());
-  shutDown = false;
+  shut_down = false;
   timer->Stop();
   LOG4CXX_TRACE(logger_, "exit");
 }