Index: generic/src/proc/scheduler.c
===================================================================
--- generic/src/proc/scheduler.c	(revision f275cb36e9500aaf4935ed3ac6c1ed56b5a25dc3)
+++ generic/src/proc/scheduler.c	(revision 204674ee3e573dfb433faf3ebf3f3faf43f34ed7)
@@ -33,5 +33,5 @@
 #include <mm/frame.h>
 #include <mm/page.h>
-#include <mm/vm.h>
+#include <mm/as.h>
 #include <arch/asm.h>
 #include <arch/faddr.h>
@@ -353,26 +353,26 @@
 	 */
 	if (TASK != THREAD->task) {
-		vm_t *m1 = NULL;
-		vm_t *m2;
+		as_t *as1 = NULL;
+		as_t *as2;
 
 		if (TASK) {
 			spinlock_lock(&TASK->lock);
-			m1 = TASK->vm;
+			as1 = TASK->as;
 			spinlock_unlock(&TASK->lock);
 		}
 
 		spinlock_lock(&THREAD->task->lock);
-		m2 = THREAD->task->vm;
+		as2 = THREAD->task->as;
 		spinlock_unlock(&THREAD->task->lock);
 		
 		/*
-		 * Note that it is possible for two tasks to share one vm mapping.
-		 */
-		if (m1 != m2) {
-			/*
-			 * Both tasks and vm mappings are different.
+		 * Note that it is possible for two tasks to share one address space.
+		 */
+		if (as1 != as2) {
+			/*
+			 * Both tasks and address spaces are different.
 			 * Replace the old one with the new one.
 			 */
-			vm_install(m2);
+			as_install(as2);
 		}
 		TASK = THREAD->task;	
Index: generic/src/proc/task.c
===================================================================
--- generic/src/proc/task.c	(revision f275cb36e9500aaf4935ed3ac6c1ed56b5a25dc3)
+++ generic/src/proc/task.c	(revision 204674ee3e573dfb433faf3ebf3f3faf43f34ed7)
@@ -29,5 +29,5 @@
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <mm/vm.h>
+#include <mm/as.h>
 #include <mm/heap.h>
 
@@ -55,10 +55,10 @@
  * Create new task with no threads.
  *
- * @param m Task's virtual memory structure.
+ * @param as Task's address space.
  *
  * @return New task's structure on success, NULL on failure.
  *
  */
-task_t *task_create(vm_t *m)
+task_t *task_create(as_t *as)
 {
 	ipl_t ipl;
@@ -70,5 +70,5 @@
 		list_initialize(&ta->th_head);
 		list_initialize(&ta->tasks_link);
-		ta->vm = m;
+		ta->as = as;
 		
 		ipl = interrupts_disable();
Index: generic/src/proc/the.c
===================================================================
--- generic/src/proc/the.c	(revision f275cb36e9500aaf4935ed3ac6c1ed56b5a25dc3)
+++ generic/src/proc/the.c	(revision 204674ee3e573dfb433faf3ebf3f3faf43f34ed7)
@@ -43,5 +43,5 @@
 	the->thread = NULL;
 	the->task = NULL;
-	the->vm = NULL;
+	the->as = NULL;
 }