Index: arch/amd64/src/mm/page.c
===================================================================
--- arch/amd64/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/amd64/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -44,5 +44,5 @@
 
 	if (config.cpu_active == 1) {
-		page_operations = &page_pt_operations;
+		page_mapping_operations = &pt_mapping_operations;
 	
 		/*
Index: arch/ia32/src/mm/page.c
===================================================================
--- arch/ia32/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/ia32/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -48,5 +48,5 @@
 
 	if (config.cpu_active == 1) {
-		page_operations = &page_pt_operations;
+		page_mapping_operations = &pt_mapping_operations;
 	
 		/*
Index: arch/ia64/src/mm/page.c
===================================================================
--- arch/ia64/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/ia64/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -48,5 +48,5 @@
 void page_arch_init(void)
 {
-	page_operations = &page_ht_operations;
+	page_mapping_operations = &ht_mapping_operations;
 	pk_disable();
 	set_environment();
Index: arch/mips32/src/mm/page.c
===================================================================
--- arch/mips32/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/mips32/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -33,4 +33,4 @@
 void page_arch_init(void)
 {
-	page_operations = &page_pt_operations;
+	page_mapping_operations = &pt_mapping_operations;
 }
Index: arch/ppc32/src/mm/page.c
===================================================================
--- arch/ppc32/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/ppc32/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -36,4 +36,4 @@
 void page_arch_init(void)
 {
-	page_operations = &page_pt_operations;
+	page_mapping_operations = &pt_mapping_operations;
 }
Index: arch/sparc64/src/mm/frame.c
===================================================================
--- arch/sparc64/src/mm/frame.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/sparc64/src/mm/frame.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -34,6 +34,6 @@
 {
 	/*
-	 * Workaround to prevent slab allocator from allocating fram 0,
-	 * which is not, at that time, mapped.
+	 * Workaround to prevent slab allocator from allocating frame 0,
+	 * which is not mapped by OFW.
 	 */
 	frame_region_not_free(0, FRAME_SIZE);
Index: arch/sparc64/src/mm/page.c
===================================================================
--- arch/sparc64/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ arch/sparc64/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -32,4 +32,4 @@
 void page_arch_init(void)
 {
-	page_operations = &page_ht_operations;
+	page_mapping_operations = &ht_mapping_operations;
 }
Index: genarch/include/mm/page_ht.h
===================================================================
--- genarch/include/mm/page_ht.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/include/mm/page_ht.h	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -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 f5935ed33be88b71c675e1e444f606d26789d549)
@@ -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);
Index: genarch/src/mm/page_ht.c
===================================================================
--- genarch/src/mm/page_ht.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ genarch/src/mm/page_ht.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -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 f5935ed33be88b71c675e1e444f606d26789d549)
@@ -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
Index: generic/include/adt/hash_table.h
===================================================================
--- generic/include/adt/hash_table.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ generic/include/adt/hash_table.h	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -67,5 +67,5 @@
 };
 
-#define hash_table_get_instance(item,type,member)	list_get_instance((item),(type),(member))
+#define hash_table_get_instance(item, type, member)	list_get_instance((item), type, member)
 
 extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op);
Index: generic/include/mm/page.h
===================================================================
--- generic/include/mm/page.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ generic/include/mm/page.h	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -61,11 +61,11 @@
 
 /** Operations to manipulate page mappings. */
-struct page_operations {
+struct page_mapping_operations {
 	void (* mapping_insert)(as_t *as, __address page, __address frame, int flags);
 	pte_t *(* mapping_find)(as_t *as, __address page);
 };
-typedef struct page_operations page_operations_t;
+typedef struct page_mapping_operations page_mapping_operations_t;
 
-extern page_operations_t *page_operations;
+extern page_mapping_operations_t *page_mapping_operations;
 
 extern void page_init(void);
Index: generic/src/mm/page.c
===================================================================
--- generic/src/mm/page.c	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ generic/src/mm/page.c	(revision f5935ed33be88b71c675e1e444f606d26789d549)
@@ -44,5 +44,5 @@
 
 /** Virtual operations for page subsystem. */
-page_operations_t *page_operations = NULL;
+page_mapping_operations_t *page_mapping_operations = NULL;
 
 void page_init(void)
@@ -86,8 +86,8 @@
 void page_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
-	ASSERT(page_operations);
-	ASSERT(page_operations->mapping_insert);
+	ASSERT(page_mapping_operations);
+	ASSERT(page_mapping_operations->mapping_insert);
 	
-	page_operations->mapping_insert(as, page, frame, flags);
+	page_mapping_operations->mapping_insert(as, page, frame, flags);
 }
 
@@ -105,7 +105,7 @@
 pte_t *page_mapping_find(as_t *as, __address page)
 {
-	ASSERT(page_operations);
-	ASSERT(page_operations->mapping_find);
+	ASSERT(page_mapping_operations);
+	ASSERT(page_mapping_operations->mapping_find);
 
-	return page_operations->mapping_find(as, page);
+	return page_mapping_operations->mapping_find(as, page);
 }