--- old/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2016-09-20 14:49:13.622045433 +0200
+++ new/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp	2016-09-20 14:49:13.486040123 +0200
@@ -2340,12 +2340,12 @@
   {
     StrongRootsScope srs(1);
 
-    gch->conc_process_roots(&srs,
-                            true,   // young gen as roots
-                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                            should_unload_classes(),
-                            &notOlder,
-                            NULL);
+    gch->cms_process_roots(&srs,
+                           true,   // young gen as roots
+                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                           should_unload_classes(),
+                           &notOlder,
+                           NULL);
   }
 
   // Now mark from the roots
@@ -2412,12 +2412,12 @@
   {
     StrongRootsScope srs(1);
 
-    gch->conc_process_roots(&srs,
-                            true,   // young gen as roots
-                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                            should_unload_classes(),
-                            &notOlder,
-                            &cld_closure);
+    gch->cms_process_roots(&srs,
+                           true,   // young gen as roots
+                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                           should_unload_classes(),
+                           &notOlder,
+                           &cld_closure);
   }
 
   // Now mark from the roots
@@ -2899,12 +2899,12 @@
 
       StrongRootsScope srs(1);
 
-      gch->conc_process_roots(&srs,
-                              true,   // young gen as roots
-                              GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                              should_unload_classes(),
-                              &notOlder,
-                              &cld_closure);
+      gch->cms_process_roots(&srs,
+                             true,   // young gen as roots
+                             GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                             should_unload_classes(),
+                             &notOlder,
+                             &cld_closure);
     }
   }
 
@@ -4284,12 +4284,12 @@
 
   CLDToOopClosure cld_closure(&par_mri_cl, true);
 
-  gch->conc_process_roots(_strong_roots_scope,
-                          false,     // yg was scanned above
-                          GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-                          _collector->should_unload_classes(),
-                          &par_mri_cl,
-                          &cld_closure);
+  gch->cms_process_roots(_strong_roots_scope,
+                         false,     // yg was scanned above
+                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
+                         _collector->should_unload_classes(),
+                         &par_mri_cl,
+                         &cld_closure);
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
          "if we didn't scan the code cache, we have to be ready to drop nmethods with expired weak oops");
@@ -4413,12 +4413,12 @@
   // ---------- remaining roots --------------
   _timer.reset();
   _timer.start();
-  gch->conc_process_roots(_strong_roots_scope,
-                          false,     // yg was scanned above
-                          GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
-                          _collector->should_unload_classes(),
-                          &par_mrias_cl,
-                          NULL);     // The dirty klasses will be handled below
+  gch->cms_process_roots(_strong_roots_scope,
+                         false,     // yg was scanned above
+                         GenCollectedHeap::ScanningOption(_collector->CMSCollector::roots_scanning_options()),
+                         _collector->should_unload_classes(),
+                         &par_mrias_cl,
+                         NULL);     // The dirty klasses will be handled below
 
   assert(_collector->should_unload_classes()
          || (_collector->CMSCollector::roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
@@ -4960,12 +4960,12 @@
     gch->rem_set()->prepare_for_younger_refs_iterate(false); // Not parallel.
     StrongRootsScope srs(1);
 
-    gch->conc_process_roots(&srs,
-                            true,  // young gen as roots
-                            GenCollectedHeap::ScanningOption(roots_scanning_options()),
-                            should_unload_classes(),
-                            &mrias_cl,
-                            NULL); // The dirty klasses will be handled below
+    gch->cms_process_roots(&srs,
+                           true,  // young gen as roots
+                           GenCollectedHeap::ScanningOption(roots_scanning_options()),
+                           should_unload_classes(),
+                           &mrias_cl,
+                           NULL); // The dirty klasses will be handled below
 
     assert(should_unload_classes()
            || (roots_scanning_options() & GenCollectedHeap::SO_AllCodeCache),
--- old/src/share/vm/gc/shared/genCollectedHeap.cpp	2016-09-20 14:49:14.482079011 +0200
+++ new/src/share/vm/gc/shared/genCollectedHeap.cpp	2016-09-20 14:49:14.342073545 +0200
@@ -666,7 +666,7 @@
   _process_strong_tasks->all_tasks_completed(scope->n_threads());
 }
 
-void GenCollectedHeap::conc_process_roots(StrongRootsScope* scope,
+void GenCollectedHeap::cms_process_roots(StrongRootsScope* scope,
                                          bool young_gen_as_roots,
                                          ScanningOption so,
                                          bool only_strong_roots,
--- old/src/share/vm/gc/shared/genCollectedHeap.hpp	2016-09-20 14:49:15.218107748 +0200
+++ new/src/share/vm/gc/shared/genCollectedHeap.hpp	2016-09-20 14:49:15.070101969 +0200
@@ -403,12 +403,12 @@
   // scan the younger generations itself.  (For example, a generation might
   // explicitly mark reachable objects in younger generations, to avoid
   // excess storage retention.)
-  void conc_process_roots(StrongRootsScope* scope,
-                          bool young_gen_as_roots,
-                          ScanningOption so,
-                          bool only_strong_roots,
-                          OopsInGenClosure* root_closure,
-                          CLDClosure* cld_closure);
+  void cms_process_roots(StrongRootsScope* scope,
+                         bool young_gen_as_roots,
+                         ScanningOption so,
+                         bool only_strong_roots,
+                         OopsInGenClosure* root_closure,
+                         CLDClosure* cld_closure);
 
   void full_process_roots(StrongRootsScope* scope,
                           bool only_strong_roots,