diff --git a/arch/x86/core/cache.c b/arch/x86/core/cache.c
index c5b680b78b3..e3626875739 100644
--- a/arch/x86/core/cache.c
+++ b/arch/x86/core/cache.c
@@ -44,7 +44,7 @@
  * @return N/A
  */
 
-void _SysCacheFlush(VIRT_ADDR virt, size_t size)
+void _SysCacheFlush(vaddr_t virt, size_t size)
 {
 	int end;
 
diff --git a/arch/x86/core/cache_s.S b/arch/x86/core/cache_s.S
index f0162fd2452..188d354a360 100644
--- a/arch/x86/core/cache_s.S
+++ b/arch/x86/core/cache_s.S
@@ -36,7 +36,7 @@ This module contains functions for manipulating caches.
  *
  * C signature:
  *
- *   void _SysCacheFlush (VIRT_ADDR virt, size_t size)
+ *   void _SysCacheFlush (vaddr_t virt, size_t size)
  *
  * Both parameters are ignored in this implementation.
  *
diff --git a/include/arch/x86/addr_types.h b/include/arch/x86/addr_types.h
index 113ed94f6bd..4562985e2c3 100644
--- a/include/arch/x86/addr_types.h
+++ b/include/arch/x86/addr_types.h
@@ -19,7 +19,7 @@
 #ifndef _x86_addr_types__h_
 #define _x86_addr_types__h_
 
-typedef unsigned int PHYS_ADDR;
-typedef unsigned int VIRT_ADDR;
+typedef unsigned int paddr_t;
+typedef unsigned int vaddr_t;
 
 #endif /* _x86_addr_types__h_ */
diff --git a/include/linker-defs.h b/include/linker-defs.h
index f2681225578..50f5846d5df 100644
--- a/include/linker-defs.h
+++ b/include/linker-defs.h
@@ -115,7 +115,6 @@ extern int __data_num_words[];
 
 /* end address of image. */
 extern char _end[];
-#define _END_VPAGE (VIRT_ADDR) _end
 
 #endif /* ! _ASMLANGUAGE */