diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.cpp b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
index 522223981cd..47ff2d15900 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.cpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.cpp
@@ -486,7 +486,7 @@ void TenuredGeneration::object_iterate(ObjectClosure* blk) {
 
 void TenuredGeneration::complete_loaded_archive_space(MemRegion archive_space) {
   // Create the BOT for the archive space.
-  TenuredSpace* space = (TenuredSpace*)_the_space;
+  TenuredSpace* space = _the_space;
   space->initialize_threshold();
   HeapWord* start = archive_space.start();
   while (start < archive_space.end()) {
diff --git a/src/hotspot/share/gc/serial/tenuredGeneration.hpp b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
index 6f364a38f44..f897c00581e 100644
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp
@@ -65,13 +65,13 @@ class TenuredGeneration: public Generation {
 
   void assert_correct_size_change_locking();
 
-  ContiguousSpace*    _the_space;       // Actual space holding objects
+  TenuredSpace*       _the_space;       // Actual space holding objects
 
   GenerationCounters* _gen_counters;
   CSpaceCounters*     _space_counters;
 
   // Accessing spaces
-  ContiguousSpace* space() const { return _the_space; }
+  TenuredSpace* space() const { return _the_space; }
 
   // Attempt to expand the generation by "bytes".  Expand by at a
   // minimum "expand_bytes".  Return true if some amount (not
diff --git a/src/hotspot/share/gc/serial/vmStructs_serial.hpp b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
index 2fb7404f3e8..c8d43301f1c 100644
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp
@@ -37,7 +37,7 @@
   nonstatic_field(TenuredGeneration,           _capacity_at_prologue,  size_t)                  \
   nonstatic_field(TenuredGeneration,           _used_at_prologue,      size_t)                  \
   nonstatic_field(TenuredGeneration,           _min_heap_delta_bytes,  size_t)                  \
-  nonstatic_field(TenuredGeneration,           _the_space,             ContiguousSpace*)        \
+  nonstatic_field(TenuredGeneration,           _the_space,             TenuredSpace*)           \
                                                                                                 \
   nonstatic_field(DefNewGeneration,            _old_gen,               Generation*)             \
   nonstatic_field(DefNewGeneration,            _tenuring_threshold,    uint)                    \
diff --git a/src/hotspot/share/gc/shared/cardTableRS.cpp b/src/hotspot/share/gc/shared/cardTableRS.cpp
index a94a8b8c70e..c547c2960bc 100644
--- a/src/hotspot/share/gc/shared/cardTableRS.cpp
+++ b/src/hotspot/share/gc/shared/cardTableRS.cpp
@@ -111,7 +111,7 @@ void ClearNoncleanCardWrapper::do_MemRegion(MemRegion mr) {
   }
 }
 
-void CardTableRS::younger_refs_in_space_iterate(ContiguousSpace* sp,
+void CardTableRS::younger_refs_in_space_iterate(TenuredSpace* sp,
                                                 HeapWord* gen_boundary,
                                                 OopIterateClosure* cl) {
   verify_used_region_at_save_marks(sp);
@@ -440,7 +440,7 @@ void CardTableRS::initialize() {
   CardTable::initialize();
 }
 
-void CardTableRS::non_clean_card_iterate(ContiguousSpace* sp,
+void CardTableRS::non_clean_card_iterate(TenuredSpace* sp,
                                          HeapWord* gen_boundary,
                                          MemRegion mr,
                                          OopIterateClosure* cl,
diff --git a/src/hotspot/share/gc/shared/cardTableRS.hpp b/src/hotspot/share/gc/shared/cardTableRS.hpp
index 0e49d496b2d..41c634fbe26 100644
--- a/src/hotspot/share/gc/shared/cardTableRS.hpp
+++ b/src/hotspot/share/gc/shared/cardTableRS.hpp
@@ -29,10 +29,11 @@
 #include "memory/memRegion.hpp"
 #include "oops/oop.hpp"
 
-class ContiguousSpace;
 class DirtyCardToOopClosure;
 class Generation;
 class Space;
+class TenuredSpace;
+
 // This RemSet uses a card table both as shared data structure
 // for a mod ref barrier set and for the rem set information.
 
@@ -47,7 +48,7 @@ class CardTableRS : public CardTable {
 public:
   CardTableRS(MemRegion whole_heap);
 
-  void younger_refs_in_space_iterate(ContiguousSpace* sp, HeapWord* gen_boundary, OopIterateClosure* cl);
+  void younger_refs_in_space_iterate(TenuredSpace* sp, HeapWord* gen_boundary, OopIterateClosure* cl);
 
   virtual void verify_used_region_at_save_marks(Space* sp) const NOT_DEBUG_RETURN;
 
@@ -70,7 +71,7 @@ public:
   // Iterate over the portion of the card-table which covers the given
   // region mr in the given space and apply cl to any dirty sub-regions
   // of mr. Clears the dirty cards as they are processed.
-  void non_clean_card_iterate(ContiguousSpace* sp,
+  void non_clean_card_iterate(TenuredSpace* sp,
                               HeapWord* gen_boundary,
                               MemRegion mr,
                               OopIterateClosure* cl,
diff --git a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
index 2ed557f8e94..884f521a02f 100644
--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbField.java
@@ -56,7 +56,7 @@ public class ClhsdbField {
                 "field InstanceKlass _constants ConstantPool*",
                 "field Klass _name Symbol*",
                 "field JavaThread _osthread OSThread*",
-                "field TenuredGeneration _the_space ContiguousSpace*",
+                "field TenuredGeneration _the_space TenuredSpace*",
                 "field VirtualSpace _low_boundary char*",
                 "field MethodCounters _backedge_counter InvocationCounter",
                 "field nmethod _entry_bci int",