diff --git a/src/api/environment.cc b/src/api/environment.cc
index 70b1c2e175fb..6b61b01d3567 100644
--- a/src/api/environment.cc
+++ b/src/api/environment.cc
@@ -814,7 +814,7 @@ Maybe<void> InitializeContextRuntime(Local<Context> context) {
   bool is_code_generation_from_strings_allowed =
       context->IsCodeGenerationFromStringsAllowed();
   context->AllowCodeGenerationFromStrings(false);
-  context->SetEmbedderData(
+  context->SetEmbedderDataV3(
       ContextEmbedderIndex::kAllowCodeGenerationFromStrings,
       Boolean::New(isolate, is_code_generation_from_strings_allowed));
 
@@ -910,9 +910,9 @@ Maybe<void> InitializeMainContextForSnapshot(Local<Context> context) {
   HandleScope handle_scope(isolate);
 
   // Initialize the default values.
-  context->SetEmbedderData(ContextEmbedderIndex::kAllowWasmCodeGeneration,
-                           True(isolate));
-  context->SetEmbedderData(
+  context->SetEmbedderDataV3(ContextEmbedderIndex::kAllowWasmCodeGeneration,
+                             True(isolate));
+  context->SetEmbedderDataV3(
       ContextEmbedderIndex::kAllowCodeGenerationFromStrings, True(isolate));
 
   if (InitializeBaseContextForSnapshot(context).IsNothing()) {
diff --git a/src/env.cc b/src/env.cc
index 87340112fbeb..0e095db67aa4 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -673,14 +673,15 @@ void TrackingTraceStateObserver::UpdateTraceCategoryState() {
 void Environment::AssignToContext(Local<v8::Context> context,
                                   Realm* realm,
                                   const ContextInfo& info) {
-  context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kEnvironment,
-                                           this,
-                                           EmbedderDataTag::kPerContextData);
-  context->SetAlignedPointerInEmbedderData(
+  context->SetAlignedPointerInEmbedderDataV2(
+      ContextEmbedderIndex::kEnvironment,
+      this,
+      EmbedderDataTag::kPerContextData);
+  context->SetAlignedPointerInEmbedderDataV2(
       ContextEmbedderIndex::kRealm, realm, EmbedderDataTag::kPerContextData);
 
   // ContextifyContexts will update this to a pointer to the native object.
-  context->SetAlignedPointerInEmbedderData(
+  context->SetAlignedPointerInEmbedderDataV2(
       ContextEmbedderIndex::kContextifyContext,
       nullptr,
       EmbedderDataTag::kPerContextData);
@@ -698,13 +699,15 @@ void Environment::AssignToContext(Local<v8::Context> context,
 
 void Environment::UnassignFromContext(Local<v8::Context> context) {
   if (!context.IsEmpty()) {
-    context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kEnvironment,
-                                             nullptr,
-                                             EmbedderDataTag::kPerContextData);
-    context->SetAlignedPointerInEmbedderData(ContextEmbedderIndex::kRealm,
-                                             nullptr,
-                                             EmbedderDataTag::kPerContextData);
-    context->SetAlignedPointerInEmbedderData(
+    context->SetAlignedPointerInEmbedderDataV2(
+        ContextEmbedderIndex::kEnvironment,
+        nullptr,
+        EmbedderDataTag::kPerContextData);
+    context->SetAlignedPointerInEmbedderDataV2(
+        ContextEmbedderIndex::kRealm,
+        nullptr,
+        EmbedderDataTag::kPerContextData);
+    context->SetAlignedPointerInEmbedderDataV2(
         ContextEmbedderIndex::kContextifyContext,
         nullptr,
         EmbedderDataTag::kPerContextData);
diff --git a/src/node_context_data.h b/src/node_context_data.h
index 02eae73cb2ca..71903d980598 100644
--- a/src/node_context_data.h
+++ b/src/node_context_data.h
@@ -134,7 +134,7 @@ class ContextEmbedderTag {
   static inline void TagNodeContext(v8::Local<v8::Context> context) {
     // Used by ContextEmbedderTag::IsNodeContext to know that we are on a node
     // context.
-    context->SetAlignedPointerInEmbedderData(
+    context->SetAlignedPointerInEmbedderDataV2(
         ContextEmbedderIndex::kContextTag,
         ContextEmbedderTag::kNodeContextTagPtr,
         EmbedderDataTag::kPerContextData);
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 8a813646bfcd..4d423a3bb30e 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -186,7 +186,7 @@ ContextifyContext::ContextifyContext(Environment* env,
   DCHECK_NULL(v8_context->GetAlignedPointerFromEmbedderData(
       ContextEmbedderIndex::kContextifyContext,
       EmbedderDataTag::kPerContextData));
-  v8_context->SetAlignedPointerInEmbedderData(
+  v8_context->SetAlignedPointerInEmbedderDataV2(
       ContextEmbedderIndex::kContextifyContext,
       this,
       EmbedderDataTag::kPerContextData);
@@ -293,21 +293,21 @@ ContextifyContext* ContextifyContext::New(Local<Context> v8_context,
   // to the ContextifyContext wrapper which in turn internally references
   // the context from its constructor.
   if (sandbox_obj.IsEmpty()) {
-    v8_context->SetEmbedderData(ContextEmbedderIndex::kSandboxObject,
-                                v8::Undefined(env->isolate()));
+    v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kSandboxObject,
+                                  v8::Undefined(env->isolate()));
   } else {
-    v8_context->SetEmbedderData(ContextEmbedderIndex::kSandboxObject,
-                                sandbox_obj);
+    v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kSandboxObject,
+                                  sandbox_obj);
   }
 
   // Delegate the code generation validation to
   // node::ModifyCodeGenerationFromStrings.
   v8_context->AllowCodeGenerationFromStrings(false);
-  v8_context->SetEmbedderData(
+  v8_context->SetEmbedderDataV3(
       ContextEmbedderIndex::kAllowCodeGenerationFromStrings,
       options->allow_code_gen_strings);
-  v8_context->SetEmbedderData(ContextEmbedderIndex::kAllowWasmCodeGeneration,
-                              options->allow_code_gen_wasm);
+  v8_context->SetEmbedderDataV3(ContextEmbedderIndex::kAllowWasmCodeGeneration,
+                                options->allow_code_gen_wasm);
 
   Utf8Value name_val(env->isolate(), options->name);
   ContextInfo info(name_val.ToString());