diff --git a/python/ray/autoscaler/_private/fake_multi_node/node_provider.py b/python/ray/autoscaler/_private/fake_multi_node/node_provider.py
index c5bac12b9..6a2e679b2 100644
--- a/python/ray/autoscaler/_private/fake_multi_node/node_provider.py
+++ b/python/ray/autoscaler/_private/fake_multi_node/node_provider.py
@@ -322,7 +322,7 @@ class FakeMultiNodeProvider(NodeProvider):
                     ray._private.services.get_node_ip_address()
                 ),
                 env_vars={
-                    "RAY_OVERRIDE_NODE_ID_FOR_TESTING": next_id,
+                    "RAY_RAYLET_NODE_ID": next_id,
                     "RAY_OVERRIDE_RESOURCES": json.dumps(resources),
                 },
             )
@@ -472,7 +472,7 @@ class FakeMultiNodeDockerProvider(FakeMultiNodeProvider):
             host_client_port=self._host_client_port,
             resources=resources,
             env_vars={
-                "RAY_OVERRIDE_NODE_ID_FOR_TESTING": node_id,
+                "RAY_RAYLET_NODE_ID": node_id,
                 "RAY_OVERRIDE_RESOURCES": resource_str,
                 **self.provider_config.get("env_vars", {}),
             },
diff --git a/python/ray/scripts/scripts.py b/python/ray/scripts/scripts.py
index 489999f9a..840c71716 100644
--- a/python/ray/scripts/scripts.py
+++ b/python/ray/scripts/scripts.py
@@ -675,9 +675,7 @@ def start(
         ray_params.gcs_server_port = port
 
         if os.environ.get("RAY_FAKE_CLUSTER"):
-            ray_params.env_vars = {
-                "RAY_OVERRIDE_NODE_ID_FOR_TESTING": FAKE_HEAD_NODE_ID
-            }
+            ray_params.env_vars = {"RAY_RAYLET_NODE_ID": FAKE_HEAD_NODE_ID}
 
         num_redis_shards = None
         # Start Ray on the head node.
diff --git a/src/ray/common/ray_internal_flag_def.h b/src/ray/common/ray_internal_flag_def.h
index 0f42d63d3..540985fda 100644
--- a/src/ray/common/ray_internal_flag_def.h
+++ b/src/ray/common/ray_internal_flag_def.h
@@ -29,4 +29,4 @@ RAY_INTERNAL_FLAG(std::string, JOB_ID, "")
 RAY_INTERNAL_FLAG(std::string, RAYLET_PID, "")
 
 /// Override the random node ID for testing.
-RAY_INTERNAL_FLAG(std::string, OVERRIDE_NODE_ID_FOR_TESTING, "")
+RAY_INTERNAL_FLAG(std::string, RAYLET_NODE_ID, "")
diff --git a/src/ray/raylet/raylet.cc b/src/ray/raylet/raylet.cc
index e7171661b..3419c89c5 100644
--- a/src/ray/raylet/raylet.cc
+++ b/src/ray/raylet/raylet.cc
@@ -64,10 +64,9 @@ Raylet::Raylet(instrumented_io_context &main_service,
                std::shared_ptr<gcs::GcsClient> gcs_client,
                int metrics_export_port)
     : main_service_(main_service),
-      self_node_id_(
-          !RayConfig::instance().OVERRIDE_NODE_ID_FOR_TESTING().empty()
-              ? NodeID::FromHex(RayConfig::instance().OVERRIDE_NODE_ID_FOR_TESTING())
-              : NodeID::FromRandom()),
+      self_node_id_(!RayConfig::instance().RAYLET_NODE_ID().empty()
+                        ? NodeID::FromHex(RayConfig::instance().RAYLET_NODE_ID())
+                        : NodeID::FromRandom()),
       gcs_client_(gcs_client),
       node_manager_(main_service,
                     self_node_id_,