diff --git a/ndb/include/util/OutputStream.hpp b/ndb/include/util/OutputStream.hpp
index 460915e12e7..35ef3c5fed4 100644
--- a/ndb/include/util/OutputStream.hpp
+++ b/ndb/include/util/OutputStream.hpp
@@ -42,10 +42,10 @@ public:
 
 class SocketOutputStream : public OutputStream {
   NDB_SOCKET_TYPE m_socket;
-  unsigned m_timeout;
+  unsigned m_timeout_ms;
 public:
-  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned writeTimeout = 1000);
-  
+  SocketOutputStream(NDB_SOCKET_TYPE socket, unsigned write_timeout_ms = 1000);
+
   int print(const char * fmt, ...);
   int println(const char * fmt, ...);
 };
diff --git a/ndb/src/common/util/OutputStream.cpp b/ndb/src/common/util/OutputStream.cpp
index cccd76eac2c..eada1452f02 100644
--- a/ndb/src/common/util/OutputStream.cpp
+++ b/ndb/src/common/util/OutputStream.cpp
@@ -42,16 +42,16 @@ FileOutputStream::println(const char * fmt, ...){
 }
 
 SocketOutputStream::SocketOutputStream(NDB_SOCKET_TYPE socket,
-				       unsigned timeout){
+				       unsigned write_timeout_ms){
   m_socket = socket;
-  m_timeout = timeout;
+  m_timeout_ms = write_timeout_ms;
 }
 
 int
 SocketOutputStream::print(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprint_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprint_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }
@@ -59,7 +59,7 @@ int
 SocketOutputStream::println(const char * fmt, ...){
   va_list ap;
   va_start(ap, fmt);
-  const int ret = vprintln_socket(m_socket, m_timeout, fmt, ap);
+  const int ret = vprintln_socket(m_socket, m_timeout_ms, fmt, ap);
   va_end(ap);
   return ret;
 }