--- a/hotspot/src/share/vm/gc/shared/space.hpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/space.hpp	Thu Jan 14 13:26:19 2016 +0100
@@ -676,7 +676,7 @@
 
 // A dirty card to oop closure that does filtering.
 // It knows how to filter out objects that are outside of the _boundary.
-class Filtering_DCTOC : public DirtyCardToOopClosure {
+class FilteringDCTOC : public DirtyCardToOopClosure {
 protected:
   // Override.
   void walk_mem_region(MemRegion mr,
@@ -697,7 +697,7 @@
                                        FilteringClosure* cl) = 0;
 
 public:
-  Filtering_DCTOC(Space* sp, ExtendedOopClosure* cl,
+  FilteringDCTOC(Space* sp, ExtendedOopClosure* cl,
                   CardTableModRefBS::PrecisionStyle precision,
                   HeapWord* boundary) :
     DirtyCardToOopClosure(sp, cl, precision, boundary) {}
@@ -713,7 +713,7 @@
 // 2. That the space is really made up of objects and not just
 //    blocks.
 
-class ContiguousSpaceDCTOC : public Filtering_DCTOC {
+class ContiguousSpaceDCTOC : public FilteringDCTOC {
 protected:
   // Overrides.
   HeapWord* get_actual_top(HeapWord* top, HeapWord* top_obj);
@@ -729,7 +729,7 @@
   ContiguousSpaceDCTOC(ContiguousSpace* sp, ExtendedOopClosure* cl,
                        CardTableModRefBS::PrecisionStyle precision,
                        HeapWord* boundary) :
-    Filtering_DCTOC(sp, cl, precision, boundary)
+    FilteringDCTOC(sp, cl, precision, boundary)
   {}
 };