diff --git a/caching/cache_dump.cc b/caching/cache_dump.cc
index 2702820..dfe7c2c 100644
--- a/caching/cache_dump.cc
+++ b/caching/cache_dump.cc
@@ -11,8 +11,8 @@
 
 using namespace std;
 using namespace caching;
-using namespace caching::mapping_array_detail;
-using namespace caching::superblock_detail;
+using namespace caching::mapping_array_damage;
+using namespace caching::superblock_damage;
 
 //----------------------------------------------------------------
 
diff --git a/caching/mapping_array.cc b/caching/mapping_array.cc
index 93e2d09..1477431 100644
--- a/caching/mapping_array.cc
+++ b/caching/mapping_array.cc
@@ -1,7 +1,8 @@
 #include "caching/mapping_array.h"
 #include "persistent-data/endian_utils.h"
 
-using namespace caching::mapping_array_detail;
+using namespace caching;
+using namespace caching::mapping_array_damage;
 
 //----------------------------------------------------------------
 
diff --git a/caching/mapping_array.h b/caching/mapping_array.h
index 9d22b26..fde0c28 100644
--- a/caching/mapping_array.h
+++ b/caching/mapping_array.h
@@ -6,26 +6,26 @@
 //----------------------------------------------------------------
 
 namespace caching {
-	namespace mapping_array_detail {
-		enum mapping_flags {
-			M_VALID = 1,
-			M_DIRTY = 2
-		};
+	enum mapping_flags {
+		M_VALID = 1,
+		M_DIRTY = 2
+	};
 
-		struct mapping {
-			uint64_t oblock_;
-			uint32_t flags_;
-		};
+	struct mapping {
+		uint64_t oblock_;
+		uint32_t flags_;
+	};
 
-		struct mapping_traits {
-			typedef base::le64 disk_type;
-			typedef mapping value_type;
-			typedef no_op_ref_counter<value_type> ref_counter;
+	struct mapping_traits {
+		typedef base::le64 disk_type;
+		typedef mapping value_type;
+		typedef no_op_ref_counter<value_type> ref_counter;
 
-			static void unpack(disk_type const &disk, value_type &value);
-			static void pack(value_type const &value, disk_type &disk);
-		};
+		static void unpack(disk_type const &disk, value_type &value);
+		static void pack(value_type const &value, disk_type &disk);
+	};
 
+	namespace mapping_array_damage {
 		class damage_visitor;
 
 		struct damage {
@@ -45,7 +45,7 @@ namespace caching {
 		public:
 			virtual ~damage_visitor() {}
 
-			virtual void visit(mapping_array_detail::damage const &d) {
+			virtual void visit(mapping_array_damage::damage const &d) {
 				d.visit(*this);
 			}
 
@@ -53,10 +53,10 @@ namespace caching {
 		};
 	}
 
-	typedef persistent_data::array<mapping_array_detail::mapping_traits> mapping_array;
+	typedef persistent_data::array<mapping_traits> mapping_array;
 
 	void check_mapping_array(mapping_array const &array,
-				 mapping_array_detail::damage_visitor &visitor);
+				 mapping_array_damage::damage_visitor &visitor);
 }
 
 //----------------------------------------------------------------
diff --git a/caching/restore_emitter.cc b/caching/restore_emitter.cc
index cdf1f4c..787163c 100644
--- a/caching/restore_emitter.cc
+++ b/caching/restore_emitter.cc
@@ -3,7 +3,6 @@
 #include "caching/mapping_array.h"
 
 using namespace caching;
-using namespace mapping_array_detail;
 using namespace std;
 using namespace superblock_damage;
 
@@ -59,7 +58,7 @@ namespace {
 		virtual void mapping(pd::block_address cblock,
 				     pd::block_address oblock,
 				     bool dirty) {
-			mapping_array_detail::mapping m;
+			typename caching::mapping m;
 			m.oblock_ = oblock;
 			m.flags_ = M_VALID;