diff --git a/Makefile b/Makefile
index 14cdc88c..4aeecaec 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ libcyclone.so.1: runtime.c include/cyclone/runtime.h
 	gcc $(CFLAGS) -c -fPIC runtime.c -o runtime.o
 	gcc -shared -Wl,-soname,libcyclone.so.1 -o libcyclone.so.1.0.1 runtime.o
 
-libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c dispatch.c mem-streams.c
+libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c dispatch.c mstreams.c
 #	echo $(CC_PROG)
 #	echo $(CC_EXEC)
 #	echo $(CC_LIB)
@@ -74,7 +74,7 @@ libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c d
 	$(CC) $(CFLAGS) -std=gnu99 -c gc.c -o gc.o
 	$(CC) $(CFLAGS) -c \
                   -DCYC_HAVE_OPEN_MEMSTREAM=$(CYC_PLATFORM_HAS_MEMSTREAM) \
-                  mem-streams.c -o mem-streams.o
+                  mstreams.c -o mstreams.o
 	$(CC) $(CFLAGS) -c \
                   -DCYC_INSTALL_DIR=\"$(PREFIX)\" \
                   -DCYC_INSTALL_LIB=\"$(LIBDIR)\" \
@@ -84,7 +84,7 @@ libcyclone.a: runtime.c include/cyclone/runtime.h include/cyclone/types.h gc.c d
                   -DCYC_CC_EXEC=\"$(CC_EXEC)\" \
                   -DCYC_CC_LIB=\"$(CC_LIB)\" \
                   runtime.c -o runtime.o
-	$(AR) rcs libcyclone.a runtime.o gc.o dispatch.o mem-streams.o
+	$(AR) rcs libcyclone.a runtime.o gc.o dispatch.o mstreams.o
 # Instructions from: http://www.adp-gmbh.ch/cpp/gcc/create_lib.html
 # Note compiler will have to link to this, eg:
 #Linking against static library
@@ -106,7 +106,7 @@ bootstrap: icyc
 	cp srfi/*.sld $(BOOTSTRAP_DIR)/srfi
 	cp srfi/*.scm $(BOOTSTRAP_DIR)/srfi
 	cp runtime.c $(BOOTSTRAP_DIR)
-	cp mem-streams.c $(BOOTSTRAP_DIR)
+	cp mstreams.c $(BOOTSTRAP_DIR)
 	cp gc.c $(BOOTSTRAP_DIR)
 	cp dispatch.c $(BOOTSTRAP_DIR)
 	cp scheme/base.c $(BOOTSTRAP_DIR)/scheme
@@ -167,7 +167,7 @@ tags:
 indent:
 	indent -linux -l80 -i2 -nut gc.c
 	indent -linux -l80 -i2 -nut runtime.c
-	indent -linux -l80 -i2 -nut mem-streams.c
+	indent -linux -l80 -i2 -nut mstreams.c
 	indent -linux -l80 -i2 -nut include/cyclone/*.h
 
 .PHONY: clean
diff --git a/mem-streams.c b/mstreams.c
similarity index 100%
rename from mem-streams.c
rename to mstreams.c