Index: genarch/include/mm/page_ht.h
===================================================================
--- genarch/include/mm/page_ht.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/include/mm/page_ht.h	(revision dd4d6b00d0c3e88b7dd79f5e3fcc541f04c5289e)
@@ -58,7 +58,6 @@
 };
 
-extern page_operations_t page_ht_operations;
+extern page_mapping_operations_t ht_mapping_operations;
 extern spinlock_t page_ht_lock;
-
 extern hash_table_t page_ht;
 extern hash_table_operations_t ht_operations;
Index: genarch/include/mm/page_pt.h
===================================================================
--- genarch/include/mm/page_pt.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/include/mm/page_pt.h	(revision dd4d6b00d0c3e88b7dd79f5e3fcc541f04c5289e)
@@ -85,5 +85,5 @@
 #define SET_FRAME_FLAGS(ptl3, i, x)	SET_FRAME_FLAGS_ARCH(ptl3, i, x)
 
-extern page_operations_t page_pt_operations;
+extern page_mapping_operations_t pt_mapping_operations;
 
 extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags);