--- old/src/hotspot/share/prims/jvmti.xml	2017-10-02 10:17:43.289532269 -0700
+++ new/src/hotspot/share/prims/jvmti.xml	2017-10-02 10:17:42.917533517 -0700
@@ -11539,7 +11539,7 @@
   <category id="heap_monitoring" label="Heap Monitoring">
     <typedef id="jvmtiStackTrace" label="Stack Trace">
       <field id="frames">
-        <allocfieldbuf outcount="trace_count">
+        <allocfieldbuf outcount="frame_count">
           <struct>jvmtiFrameInfo</struct>
         </allocfieldbuf>
         <description>Pointer to the call frames.</description>
@@ -11645,10 +11645,10 @@
             only be used when knowing it may impact performance.
           </description>
         </param>
-        <param id="max_storage">
+        <param id="max_gc_storage">
           <jint/>
           <description>
-            The maximum storage used for the sampler. By default, the value is 200.
+            The maximum storage used for the GC samples in the sampler. By default, the value is 200.
           </description>
         </param>
       </parameters>