diff --git a/src/etc/natvis/libstd.natvis b/src/etc/natvis/libstd.natvis
index 216935a0ba5..2c05f9d7c12 100644
--- a/src/etc/natvis/libstd.natvis
+++ b/src/etc/natvis/libstd.natvis
@@ -50,22 +50,22 @@
   </Type>
 
   <Type Name="std::collections::hash::set::HashSet&lt;*,*&gt;">
-    <DisplayString>{{ len={base.map.table.items} }}</DisplayString>
+    <DisplayString>{{ len={base.map.table.table.items} }}</DisplayString>
     <Expand>
-      <Item Name="[len]">base.map.table.items</Item>
-      <Item Name="[capacity]">base.map.table.items + base.map.table.growth_left</Item>
+      <Item Name="[len]">base.map.table.table.items</Item>
+      <Item Name="[capacity]">base.map.table.table.items + base.map.table.table.growth_left</Item>
       <Item Name="[state]">base.map.hash_builder</Item>
 
       <CustomListItems>
         <Variable Name="i" InitialValue="0" />
-        <Variable Name="n" InitialValue="base.map.table.items" />
-        <Size>base.map.table.items</Size>
+        <Variable Name="n" InitialValue="base.map.table.table.items" />
+        <Size>base.map.table.table.items</Size>
         <Loop>
           <Break Condition="n == 0" />
-          <If Condition="(base.map.table.ctrl.pointer[i] &amp; 0x80) == 0">
+          <If Condition="(base.map.table.table.ctrl.pointer[i] &amp; 0x80) == 0">
             <!-- Bucket is populated -->
             <Exec>n--</Exec>
-            <Item>(($T1*)base.map.table.ctrl.pointer)[-(i + 1)]</Item>
+            <Item>(($T1*)base.map.table.table.ctrl.pointer)[-(i + 1)]</Item>
           </If>
           <Exec>i++</Exec>
         </Loop>