Index: generic/include/adt/hash_table.h
===================================================================
--- generic/include/adt/hash_table.h	(revision c7ec94a41807d5fd556f2d26b42c6b816b3da7c8)
+++ generic/include/adt/hash_table.h	(revision 3d2d2fc2f1ea9da10c3b97db5c8db26818ba82cb)
@@ -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 3d2d2fc2f1ea9da10c3b97db5c8db26818ba82cb)
@@ -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);