--- old/src/hotspot/share/gc/shared/gcArguments.cpp	2017-11-06 12:09:11.256837406 +0100
+++ new/src/hotspot/share/gc/shared/gcArguments.cpp	2017-11-06 12:09:11.012841643 +0100
@@ -39,7 +39,7 @@
 
 GCArguments* GCArguments::_instance = NULL;
 
-GCArguments* GCArguments::instance() {
+GCArguments* GCArguments::arguments() {
   assert(is_initialized(), "Heap factory not yet created");
   return _instance;
 }
@@ -103,7 +103,7 @@
 #endif // INCLUDE_ALL_GCS
 }
 
-jint GCArguments::create_instance() {
+jint GCArguments::initialize() {
   assert(!is_initialized(), "GC arguments already initialized");
 
   select_gc();
--- old/src/hotspot/share/gc/shared/gcArguments.hpp	2017-11-06 12:09:11.741828985 +0100
+++ new/src/hotspot/share/gc/shared/gcArguments.hpp	2017-11-06 12:09:11.482833482 +0100
@@ -36,9 +36,9 @@
   static bool gc_selected();
 
 public:
-  static jint create_instance();
+  static jint initialize();
   static bool is_initialized();
-  static GCArguments* instance();
+  static GCArguments* arguments();
 
   virtual void initialize_flags();
 
--- old/src/hotspot/share/runtime/arguments.cpp	2017-11-06 12:09:12.220820668 +0100
+++ new/src/hotspot/share/runtime/arguments.cpp	2017-11-06 12:09:11.969825026 +0100
@@ -1588,7 +1588,7 @@
   // the alignments imposed by several sources: any requirements from the heap
   // itself, the collector policy and the maximum page size we may run the VM
   // with.
-  size_t heap_alignment = GCArguments::instance()->conservative_max_heap_alignment();
+  size_t heap_alignment = GCArguments::arguments()->conservative_max_heap_alignment();
   _conservative_max_heap_alignment = MAX4(heap_alignment,
                                           (size_t)os::vm_allocation_granularity(),
                                           os::max_page_size(),
@@ -1654,7 +1654,7 @@
   }
 #endif
 
-  jint gc_result = GCArguments::create_instance();
+  jint gc_result = GCArguments::initialize();
   if (gc_result != JNI_OK) {
     return gc_result;
   }
@@ -1691,7 +1691,7 @@
 
 void Arguments::set_gc_specific_flags() {
   // Set GC flags
-  GCArguments::instance()->initialize_flags();
+  GCArguments::arguments()->initialize_flags();
 }
 
 julong Arguments::limit_by_allocatable_memory(julong limit) {