diff --git a/core/mem/virtual/file.odin b/core/mem/virtual/file.odin
index c76b02626..5d7180588 100644
--- a/core/mem/virtual/file.odin
+++ b/core/mem/virtual/file.odin
@@ -2,7 +2,7 @@ package mem_virtual
 
 import "core:os"
 
-Mapped_File_Error :: enum {
+Map_File_Error :: enum {
 	None,
 	Open_Failure,
 	Stat_Failure,
@@ -11,18 +11,18 @@ Mapped_File_Error :: enum {
 	Map_Failure,
 }
 
-Mapped_File_Flag :: enum u32 {
+Map_File_Flag :: enum u32 {
 	Read,
 	Write,
 }
-Mapped_File_Flags :: distinct bit_set[Mapped_File_Flag; u32]
+Map_File_Flags :: distinct bit_set[Map_File_Flag; u32]
 
 map_file :: proc{
 	map_file_from_path,
 	map_file_from_file_descriptor,
 }
 
-map_file_from_path :: proc(filename: string, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+map_file_from_path :: proc(filename: string, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	fd, err := os.open(filename, os.O_RDWR)
 	if err != 0 {
 		return nil, .Open_Failure
@@ -32,7 +32,7 @@ map_file_from_path :: proc(filename: string, flags: Mapped_File_Flags) -> (data:
 	return map_file_from_file_descriptor(uintptr(fd), flags)
 }
 
-map_file_from_file_descriptor :: proc(fd: uintptr, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+map_file_from_file_descriptor :: proc(fd: uintptr, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	size, os_err := os.file_size(os.Handle(fd))
 	if os_err != 0 {
 		return nil, .Stat_Failure
diff --git a/core/mem/virtual/virtual_bsd.odin b/core/mem/virtual/virtual_bsd.odin
index b10c46c64..7568084c0 100644
--- a/core/mem/virtual/virtual_bsd.odin
+++ b/core/mem/virtual/virtual_bsd.odin
@@ -23,6 +23,6 @@ _platform_memory_init :: proc() {
 
 }
 
-_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	return nil, .Map_Failure
 }
diff --git a/core/mem/virtual/virtual_darwin.odin b/core/mem/virtual/virtual_darwin.odin
index 831b73d73..5be17c0f9 100644
--- a/core/mem/virtual/virtual_darwin.odin
+++ b/core/mem/virtual/virtual_darwin.odin
@@ -148,7 +148,7 @@ _platform_memory_init :: proc() {
 }
 
 
-_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	prot, mflags: c.int
 	if .Read in flags {
 		prot |= PROT_READ
diff --git a/core/mem/virtual/virtual_linux.odin b/core/mem/virtual/virtual_linux.odin
index cbe3e544f..43f4c52f5 100644
--- a/core/mem/virtual/virtual_linux.odin
+++ b/core/mem/virtual/virtual_linux.odin
@@ -50,7 +50,7 @@ _platform_memory_init :: proc() {
 }
 
 
-_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+_map_file :: proc "contextless" (fd: uintptr, size: i64, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	prot: linux.Mem_Protection
 	if .Read in flags {
 		prot += {.READ}
diff --git a/core/mem/virtual/virtual_windows.odin b/core/mem/virtual/virtual_windows.odin
index 7c25951c4..a600dbe01 100644
--- a/core/mem/virtual/virtual_windows.odin
+++ b/core/mem/virtual/virtual_windows.odin
@@ -149,7 +149,7 @@ _platform_memory_init :: proc() {
 }
 
 
-_map_file :: proc "contextless" (fd: os.Handle, size: i64, flags: Mapped_File_Flags) -> (data: []byte, error: Mapped_File_Error) {
+_map_file :: proc "contextless" (fd: os.Handle, size: i64, flags: Map_File_Flags) -> (data: []byte, error: Map_File_Error) {
 	page_flags: u32
 	if flags == {.Read} {
 		page_flags = PAGE_READONLY