diff --git a/python/ray/includes/ray_config.pxd b/python/ray/includes/ray_config.pxd
index 0684e6374..12c0ae4a2 100644
--- a/python/ray/includes/ray_config.pxd
+++ b/python/ray/includes/ray_config.pxd
@@ -33,9 +33,9 @@ cdef extern from "ray/common/ray_config.h" nogil:
 
         int64_t actor_max_dummy_objects() const
 
-        int64_t num_connect_attempts() const
+        int64_t raylet_client_num_connect_attempts() const
 
-        int64_t connect_timeout_milliseconds() const
+        int64_t raylet_client_connect_timeout_milliseconds() const
 
         int64_t raylet_fetch_timeout_milliseconds() const
 
diff --git a/python/ray/includes/ray_config.pxi b/python/ray/includes/ray_config.pxi
index dbe76e6e9..fecfb1481 100644
--- a/python/ray/includes/ray_config.pxi
+++ b/python/ray/includes/ray_config.pxi
@@ -51,12 +51,12 @@ cdef class Config:
         return RayConfig.instance().actor_max_dummy_objects()
 
     @staticmethod
-    def num_connect_attempts():
-        return RayConfig.instance().num_connect_attempts()
+    def raylet_client_num_connect_attempts():
+        return RayConfig.instance().raylet_client_num_connect_attempts()
 
     @staticmethod
-    def connect_timeout_milliseconds():
-        return RayConfig.instance().connect_timeout_milliseconds()
+    def raylet_client_connect_timeout_milliseconds():
+        return RayConfig.instance().raylet_client_connect_timeout_milliseconds()
 
     @staticmethod
     def raylet_fetch_timeout_milliseconds():
diff --git a/src/ray/common/ray_config_def.h b/src/ray/common/ray_config_def.h
index 9b73a032f..92ef70650 100644
--- a/src/ray/common/ray_config_def.h
+++ b/src/ray/common/ray_config_def.h
@@ -149,9 +149,9 @@ RAY_CONFIG(uint64_t, max_lineage_size, 100)
 /// objects to store.
 RAY_CONFIG(int64_t, actor_max_dummy_objects, 1000)
 
-/// Number of times we try connecting to a socket.
-RAY_CONFIG(int64_t, num_connect_attempts, 5)
-RAY_CONFIG(int64_t, connect_timeout_milliseconds, 500)
+/// Number of times raylet client tries connecting to a raylet.
+RAY_CONFIG(int64_t, raylet_client_num_connect_attempts, 10)
+RAY_CONFIG(int64_t, raylet_client_connect_timeout_milliseconds, 1000)
 
 /// The duration that the raylet will wait before reinitiating a
 /// fetch request for a missing task dependency. This time may adapt based on
diff --git a/src/ray/raylet/raylet_client.cc b/src/ray/raylet/raylet_client.cc
index 611791d4a..054e12dfe 100644
--- a/src/ray/raylet/raylet_client.cc
+++ b/src/ray/raylet/raylet_client.cc
@@ -54,10 +54,10 @@ raylet::RayletConnection::RayletConnection(boost::asio::io_service &io_service,
     : conn_(io_service) {
   // Pick the default values if the user did not specify.
   if (num_retries < 0) {
-    num_retries = RayConfig::instance().num_connect_attempts();
+    num_retries = RayConfig::instance().raylet_client_num_connect_attempts();
   }
   if (timeout < 0) {
-    timeout = RayConfig::instance().connect_timeout_milliseconds();
+    timeout = RayConfig::instance().raylet_client_connect_timeout_milliseconds();
   }
   RAY_CHECK(!raylet_socket.empty());
   boost::system::error_code ec;