diff --git a/snapshot/cpu_context_mac.cc b/snapshot/cpu_context_mac.cc
index efd1c25d..04b9f03d 100644
--- a/snapshot/cpu_context_mac.cc
+++ b/snapshot/cpu_context_mac.cc
@@ -227,16 +227,16 @@ void InitializeCPUContextX86_64Thread(
 
 void InitializeCPUContextX86_64Float(
     CPUContextX86_64* context, const x86_float_state64_t* x86_float_state64) {
-  // This relies on both x86_float_state64_t and context->fxsave64 having
-  // identical (fxsave64) layout.
+  // This relies on both x86_float_state64_t and context->fxsave having
+  // identical (fxsave) layout.
   static_assert(offsetof(x86_float_state64_t, __fpu_reserved1) -
                          offsetof(x86_float_state64_t, __fpu_fcw) ==
-                     sizeof(context->fxsave64),
+                     sizeof(context->fxsave),
                 "types must be equivalent");
 
-  memcpy(&context->fxsave64,
+  memcpy(&context->fxsave,
          &x86_float_state64->__fpu_fcw,
-         sizeof(context->fxsave64));
+         sizeof(context->fxsave));
 }
 
 void InitializeCPUContextX86_64Debug(
diff --git a/snapshot/cpu_context_mac_test.cc b/snapshot/cpu_context_mac_test.cc
index 0968da86..16aab4a6 100644
--- a/snapshot/cpu_context_mac_test.cc
+++ b/snapshot/cpu_context_mac_test.cc
@@ -239,7 +239,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
                                          &x86_float_state64,
                                          &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -265,7 +265,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(13u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -283,7 +283,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(14u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(14u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -301,7 +301,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(15u, cpu_context_x86_64.dr0);
   }
 
@@ -328,7 +328,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(16u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -348,7 +348,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(17u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(17u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -368,7 +368,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(18u, cpu_context_x86_64.dr0);
   }
 
@@ -390,7 +390,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 
@@ -409,7 +409,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
         &x86_float_state64,
         &x86_debug_state64);
     EXPECT_EQ(10u, cpu_context_x86_64.rax);
-    EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw);
+    EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
     EXPECT_EQ(12u, cpu_context_x86_64.dr0);
   }
 }