Index: arch/amd64/src/mm/page.c
===================================================================
--- arch/amd64/src/mm/page.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ arch/amd64/src/mm/page.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -54,5 +54,5 @@
 		 */
 		for (i = 0; i < config.memory_size/FRAME_SIZE; i++) {
-			map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
+			page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE | PAGE_EXEC, KA2PA(dba));
 		}
 
Index: arch/ia32/src/drivers/ega.c
===================================================================
--- arch/ia32/src/drivers/ega.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ arch/ia32/src/drivers/ega.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -50,5 +50,5 @@
 	__u8 hi, lo;
 
-	map_page_to_frame(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
+	page_mapping_insert(PA2KA(VIDEORAM), VIDEORAM, PAGE_NOT_CACHEABLE, 0);
 	outb(0x3d4,0xe);
 	hi = inb(0x3d5);
Index: arch/ia32/src/mm/page.c
===================================================================
--- arch/ia32/src/mm/page.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ arch/ia32/src/mm/page.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -57,5 +57,5 @@
 		 */
 		for (i = 0; i < config.memory_size/PAGE_SIZE; i++)
-			map_page_to_frame(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
+			page_mapping_insert(PA2KA(i * PAGE_SIZE), i * PAGE_SIZE, PAGE_CACHEABLE, KA2PA(dba));
 
 		trap_register(14, page_fault);
Index: arch/ia32/src/smp/smp.c
===================================================================
--- arch/ia32/src/smp/smp.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ arch/ia32/src/smp/smp.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -64,7 +64,7 @@
 
 	if (config.cpu_count > 1) {		
-		map_page_to_frame((__address)l_apic, (__address)l_apic, 
+		page_mapping_insert((__address)l_apic, (__address)l_apic, 
 				  PAGE_NOT_CACHEABLE, 0);
-		map_page_to_frame((__address) io_apic,
+		page_mapping_insert((__address) io_apic,
 				  (__address) io_apic,
 				  PAGE_NOT_CACHEABLE, 0);
Index: arch/mips32/src/mm/tlb.c
===================================================================
--- arch/mips32/src/mm/tlb.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ arch/mips32/src/mm/tlb.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -367,5 +367,5 @@
 	 * Handler cannot succeed if badvaddr has no mapping.
 	 */
-	pte = find_mapping(badvaddr, 0);
+	pte = page_mapping_find(badvaddr, 0);
 	if (!pte) {
 		printf("No such mapping.\n");
Index: genarch/src/acpi/acpi.c
===================================================================
--- genarch/src/acpi/acpi.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ genarch/src/acpi/acpi.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -80,5 +80,5 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-	map_page_to_frame((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+	page_mapping_insert((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
 	map_structure((__address) sdt, sdt->length);
 }
Index: generic/include/mm/page.h
===================================================================
--- generic/include/mm/page.h	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ generic/include/mm/page.h	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -108,6 +108,6 @@
 
 extern void page_init(void);
-extern void map_page_to_frame(__address page, __address frame, int flags, __address root);
-extern pte_t *find_mapping(__address page, __address root);
+extern void page_mapping_insert(__address page, __address frame, int flags, __address root);
+extern pte_t *page_mapping_find(__address page, __address root);
 extern void map_structure(__address s, size_t size);
 
Index: generic/src/mm/page.c
===================================================================
--- generic/src/mm/page.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ generic/src/mm/page.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -38,5 +38,5 @@
 {
 	page_arch_init();
-	map_page_to_frame(0x0, 0x0, PAGE_NOT_PRESENT, 0);
+	page_mapping_insert(0x0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -58,5 +58,5 @@
 
 	for (i = 0; i < cnt; i++)
-		map_page_to_frame(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+		page_mapping_insert(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -72,5 +72,5 @@
  * @param root Explicit PTL0 address.
  */
-void map_page_to_frame(__address page, __address frame, int flags, __address root)
+void page_mapping_insert(__address page, __address frame, int flags, __address root)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -119,5 +119,5 @@
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *find_mapping(__address page, __address root)
+pte_t *page_mapping_find(__address page, __address root)
 {
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
Index: generic/src/mm/vm.c
===================================================================
--- generic/src/mm/vm.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ generic/src/mm/vm.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -162,5 +162,5 @@
 	ASSERT(m->ptl0);
 	for (i=0; i<a->size; i++)
-		map_page_to_frame(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
+		page_mapping_insert(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
 		
 	spinlock_unlock(&a->lock);
@@ -180,5 +180,5 @@
 	ASSERT(m->ptl0);
 	for (i=0; i<a->size; i++)		
-		map_page_to_frame(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
+		page_mapping_insert(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
 	
 	spinlock_unlock(&a->lock);
Index: test/mm/mapping1/test.c
===================================================================
--- test/mm/mapping1/test.c	(revision db79676b6e013c2949140b944a6c7ec725db1d00)
+++ test/mm/mapping1/test.c	(revision 39539da93686d95cdb2334c202ac8cb2ad77347e)
@@ -56,7 +56,7 @@
 	
 	printf("Mapping virtual address %P to physical address %P.\n", PAGE0, KA2PA(frame0));
-	map_page_to_frame(PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
+	page_mapping_insert(PAGE0, KA2PA(frame0), PAGE_PRESENT | PAGE_WRITE, 0);
 	printf("Mapping virtual address %P to physical address %P.\n", PAGE1, KA2PA(frame1));	
-	map_page_to_frame(PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
+	page_mapping_insert(PAGE1, KA2PA(frame1), PAGE_PRESENT | PAGE_WRITE, 0);
 	
 	printf("Value at virtual address %P is %L.\n", PAGE0, v0 = *((__u32 *) PAGE0));