Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/src/mm/page_ht.c	(revision 49a39c2c0d1933132d867a05b71cfac2264eab4b)
@@ -68,5 +68,6 @@
 };
 
-page_operations_t page_ht_operations = {
+/** Page mapping operations for page hash table architectures. */
+page_mapping_operations_t ht_mapping_operations = {
 	.mapping_insert = ht_mapping_insert,
 	.mapping_find = ht_mapping_find
@@ -120,5 +121,5 @@
 	 * Convert item to PTE.
 	 */
-	t = list_get_instance(item, pte_t, link);
+	t = hash_table_get_instance(item, pte_t, link);
 
 	if (keys == PAGE_HT_KEYS) {
@@ -142,5 +143,5 @@
 	 * Convert item to PTE.
 	 */
-	t = list_get_instance(item, pte_t, link);
+	t = hash_table_get_instance(item, pte_t, link);
 
 	free(t);
@@ -200,5 +201,5 @@
 	hlp = hash_table_find(&page_ht, key);
 	if (hlp)
-		t = list_get_instance(hlp, pte_t, link);
+		t = hash_table_get_instance(hlp, pte_t, link);
 
 	spinlock_unlock(&page_ht_lock);
Index: genarch/src/mm/page_pt.c
===================================================================
--- genarch/src/mm/page_pt.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/src/mm/page_pt.c	(revision 49a39c2c0d1933132d867a05b71cfac2264eab4b)
@@ -41,5 +41,5 @@
 static pte_t *pt_mapping_find(as_t *as, __address page);
 
-page_operations_t page_pt_operations = {
+page_mapping_operations_t pt_mapping_operations = {
 	.mapping_insert = pt_mapping_insert,
 	.mapping_find = pt_mapping_find