diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index 55746a5..4520ce7 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -6,8 +6,8 @@
 	common.c mtd.c \
 	%reldir%/tmpf.c
 
-test_erase_flash_SOURCES = \
-	%reldir%/erase_flash.c \
+test_flash_erase_SOURCES = \
+	%reldir%/flash_erase.c \
 	flash.c \
 	common.c \
 	%reldir%/tmpf.c
@@ -100,7 +100,7 @@
 check_PROGRAMS += \
 		%reldir%/sanity \
 		%reldir%/flash_copy \
-		%reldir%/erase_flash \
+		%reldir%/flash_erase \
 		%reldir%/write_flash \
 		%reldir%/get_mbox_info_v2 \
 		%reldir%/reset_state \
diff --git a/test/erase_flash.c b/test/flash_erase.c
similarity index 91%
rename from test/erase_flash.c
rename to test/flash_erase.c
index eae2627..9dfdb05 100644
--- a/test/erase_flash.c
+++ b/test/flash_erase.c
@@ -112,7 +112,7 @@
 	flash_dev_init(&context);
 
 	/* Erase from an unknown state */
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 1);
@@ -124,7 +124,7 @@
 	n_ioctls = 0;
 
 	/* Erase an erased flash */
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 0);
@@ -134,7 +134,7 @@
 	/* Erase written flash */
 	rc = write_flash(&context, 0, data, sizeof(data));
 	assert(rc == 0);
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 1);
@@ -148,7 +148,7 @@
 	/* Erase the start of flash */
 	rc = write_flash(&context, 0, data, sizeof(data) - 1);
 	assert(rc == 0);
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 1);
@@ -162,7 +162,7 @@
 	/* Erase the end of flash */
 	rc = write_flash(&context, 1, data, sizeof(data) - 1);
 	assert(rc == 0);
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 1);
@@ -177,7 +177,7 @@
 	rc = write_flash(&context, 0, data, 1);
 	rc = write_flash(&context, 2, data, 1);
 	assert(rc == 0);
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 2);
@@ -193,7 +193,7 @@
 	/* Erase the middle of flash */
 	rc = write_flash(&context, 1, data, 1);
 	assert(rc == 0);
-	rc = erase_flash(&context, 0, sizeof(data));
+	rc = flash_erase(&context, 0, sizeof(data));
 
 	assert(rc == 0);
 	assert(n_ioctls == 1);