diff --git a/SConscript b/SConscript
index 7afb84e679..49f06af7d5 100644
--- a/SConscript
+++ b/SConscript
@@ -322,7 +322,7 @@ syscall_emulation_sources = Split('''
 
 targetarch_files = Split('''
         alpha_linux_process.hh
-        memory.hh
+        alpha_memory.hh
         alpha_tru64_process.hh
         aout_machdep.h
         arguments.hh
diff --git a/arch/alpha/memory.cc b/arch/alpha/alpha_memory.cc
similarity index 100%
rename from arch/alpha/memory.cc
rename to arch/alpha/alpha_memory.cc
diff --git a/arch/alpha/memory.hh b/arch/alpha/alpha_memory.hh
similarity index 100%
rename from arch/alpha/memory.hh
rename to arch/alpha/alpha_memory.hh