--- old/src/hotspot/share/gc/parallel/psScavenge.hpp	2018-05-02 11:08:27.582069897 +0200
+++ new/src/hotspot/share/gc/parallel/psScavenge.hpp	2018-05-02 11:08:27.298061185 +0200
@@ -65,7 +65,7 @@
 
  protected:
   // Flags/counters
-  static SpanSubjectToDiscoveryClosure _span_discoverer;
+  static SpanSubjectToDiscoveryClosure _span_based_discoverer;
   static ReferenceProcessor*           _ref_processor;        // Reference processor for scavenging.
   static PSIsAliveClosure              _is_alive_closure;     // Closure used for reference processing
   static PSCardTable*                  _card_table;           // We cache the card table for fast access.
@@ -104,7 +104,7 @@
   static CollectorCounters* counters()           { return _counters; }
 
   static void set_subject_to_discovery_span(MemRegion mr) {
-    _span_discoverer.set_span(mr);
+    _span_based_discoverer.set_span(mr);
   }
   // Used by scavenge_contents && psMarkSweep
   static ReferenceProcessor* const reference_processor() {