diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index 4520ce7..7f8f6d7 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -12,8 +12,8 @@
 	common.c \
 	%reldir%/tmpf.c
 
-test_write_flash_SOURCES = \
-	%reldir%/write_flash.c \
+test_flash_write_SOURCES = \
+	%reldir%/flash_write.c \
 	flash.c \
 	common.c \
 	%reldir%/tmpf.c
@@ -101,7 +101,7 @@
 		%reldir%/sanity \
 		%reldir%/flash_copy \
 		%reldir%/flash_erase \
-		%reldir%/write_flash \
+		%reldir%/flash_write \
 		%reldir%/get_mbox_info_v2 \
 		%reldir%/reset_state \
 		%reldir%/get_flash_info_v2 \
diff --git a/test/flash_erase.c b/test/flash_erase.c
index 9dfdb05..acbf378 100644
--- a/test/flash_erase.c
+++ b/test/flash_erase.c
@@ -132,7 +132,7 @@
 	memset(data, 0xaa, sizeof(data));
 
 	/* Erase written flash */
-	rc = write_flash(&context, 0, data, sizeof(data));
+	rc = flash_write(&context, 0, data, sizeof(data));
 	assert(rc == 0);
 	rc = flash_erase(&context, 0, sizeof(data));
 
@@ -146,7 +146,7 @@
 	n_ioctls = 0;
 
 	/* Erase the start of flash */
-	rc = write_flash(&context, 0, data, sizeof(data) - 1);
+	rc = flash_write(&context, 0, data, sizeof(data) - 1);
 	assert(rc == 0);
 	rc = flash_erase(&context, 0, sizeof(data));
 
@@ -160,7 +160,7 @@
 	n_ioctls = 0;
 
 	/* Erase the end of flash */
-	rc = write_flash(&context, 1, data, sizeof(data) - 1);
+	rc = flash_write(&context, 1, data, sizeof(data) - 1);
 	assert(rc == 0);
 	rc = flash_erase(&context, 0, sizeof(data));
 
@@ -174,8 +174,8 @@
 	n_ioctls = 0;
 
 	/* Erase each end of flash */
-	rc = write_flash(&context, 0, data, 1);
-	rc = write_flash(&context, 2, data, 1);
+	rc = flash_write(&context, 0, data, 1);
+	rc = flash_write(&context, 2, data, 1);
 	assert(rc == 0);
 	rc = flash_erase(&context, 0, sizeof(data));
 
@@ -191,7 +191,7 @@
 	n_ioctls = 0;
 
 	/* Erase the middle of flash */
-	rc = write_flash(&context, 1, data, 1);
+	rc = flash_write(&context, 1, data, 1);
 	assert(rc == 0);
 	rc = flash_erase(&context, 0, sizeof(data));
 
diff --git a/test/write_flash.c b/test/flash_write.c
similarity index 87%
rename from test/write_flash.c
rename to test/flash_write.c
index f0c107c..cec6c92 100644
--- a/test/write_flash.c
+++ b/test/flash_write.c
@@ -70,31 +70,31 @@
 	assert(map != MAP_FAILED);
 
 	memset(src, 0xaa, sizeof(src));
-	rc = write_flash(context, 0, src, sizeof(src));
+	rc = flash_write(context, 0, src, sizeof(src));
 	assert(rc == 0);
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);
 
 	memset(src, 0x55, sizeof(src));
-	rc = write_flash(context, 0, src, sizeof(src));
+	rc = flash_write(context, 0, src, sizeof(src));
 	assert(rc == 0);
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);
 
 	src[0] = 0xff;
-	rc = write_flash(context, 0, src, 1);
+	rc = flash_write(context, 0, src, 1);
 	assert(rc == 0);
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);
 
 	src[1] = 0xff;
-	rc = write_flash(context, 1, &src[1], 1);
+	rc = flash_write(context, 1, &src[1], 1);
 	assert(rc == 0);
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);
 
 	src[2] = 0xff;
-	rc = write_flash(context, 2, &src[2], 1);
+	rc = flash_write(context, 2, &src[2], 1);
 	assert(rc == 0);
 	rc = memcmp(src, map, sizeof(src));
 	assert(rc == 0);