--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Tue Apr 03 13:15:27 2018 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Tue Apr 03 12:05:49 2018 +0200
@@ -79,7 +79,7 @@
 class G1YoungRemSetSamplingThread;
 class HeapRegionRemSetIterator;
 class G1ConcurrentMark;
-class ConcurrentMarkThread;
+class G1ConcurrentMarkThread;
 class G1ConcurrentRefine;
 class GenerationCounters;
 class STWGCTimer;
@@ -766,7 +766,7 @@
 
   // The concurrent marker (and the thread it runs in.)
   G1ConcurrentMark* _cm;
-  ConcurrentMarkThread* _cmThread;
+  G1ConcurrentMarkThread* _cmThread;
 
   // The concurrent refiner.
   G1ConcurrentRefine* _cr;