diff --git a/Makefile.common b/Makefile.common
index 39dd9e9..aef6d23 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -7,7 +7,7 @@ SOURCES_C := $(CORE_DIR)/gpsp_griffin.c
 else
 SOURCES_C := $(CORE_DIR)/main.c \
 				 $(CORE_DIR)/cpu.c \
-				 $(CORE_DIR)/memory.c \
+				 $(CORE_DIR)/gba_memory.c \
 				 $(CORE_DIR)/video.c \
 				 $(CORE_DIR)/input.c \
 				 $(CORE_DIR)/sound.c \
diff --git a/memory.c b/gba_memory.c
similarity index 100%
rename from memory.c
rename to gba_memory.c