--- a/hotspot/src/share/vm/aot/aotCodeHeap.hpp	Tue Aug 22 08:53:35 2017 -0700
+++ b/hotspot/src/share/vm/aot/aotCodeHeap.hpp	Tue Aug 22 11:50:51 2017 -0700
@@ -77,7 +77,7 @@
   int _version;
   int _class_count;
   int _method_count;
-  int _metaspace_got_size;
+  int _klasses_got_size;
   int _metadata_got_size;
   int _oop_got_size;
   int _jvm_version_offset;
@@ -180,11 +180,11 @@
   address _klasses_offsets;
   address _dependencies;
 
-  Metadata** _metaspace_got;
+  Metadata** _klasses_got;
   Metadata** _metadata_got;
   oop*    _oop_got;
 
-  int _metaspace_got_size;
+  int _klasses_got_size;
   int _metadata_got_size;
   int _oop_got_size;
 
@@ -251,7 +251,7 @@
 #ifdef ASSERT
   bool got_contains(Metadata **p) {
     return (p >= &_metadata_got[0] && p < &_metadata_got[_metadata_got_size]) ||
-           (p >= &_metaspace_got[0] && p < &_metaspace_got[_metaspace_got_size]);
+           (p >= &_klasses_got[0] && p < &_klasses_got[_klasses_got_size]);
   }
 #endif