diff --git a/at25.c b/at25.c
index 817e769301d1b71769ae421bb14f4aa852dfd543..803e7e483a413e90d2675fbc9d1a36176bf3308f 100644
--- a/at25.c
+++ b/at25.c
@@ -86,7 +86,7 @@ int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash)
 	return spi_prettyprint_status_register_at25df(flash);
 }
 
-int spi_prettyprint_status_register_at25f(struct flashctx *flash)
+int spi_prettyprint_status_register_at25f512b(struct flashctx *flash)
 {
 	uint8_t status;
 
@@ -202,7 +202,7 @@ int spi_disable_blockprotect_at25df_sec(struct flashctx *flash)
 	return spi_disable_blockprotect_at25df(flash);
 }
 
-int spi_disable_blockprotect_at25f(struct flashctx *flash)
+int spi_disable_blockprotect_at25f512b(struct flashctx *flash)
 {
 	/* spi_disable_blockprotect_at25df is not really the right way to do
 	 * this, but the side effects of said function work here as well.
diff --git a/chipdrivers.h b/chipdrivers.h
index 0c78b0dd51cf7bf14dc9eb38b61b9536972b2e5a..b43e16e9fe67a64ad3739150d79b0d8e7a339493 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -77,13 +77,13 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashctx *flash);
 /* at25.c */
 int spi_prettyprint_status_register_at25df(struct flashctx *flash);
 int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash);
-int spi_prettyprint_status_register_at25f(struct flashctx *flash);
+int spi_prettyprint_status_register_at25f512b(struct flashctx *flash);
 int spi_prettyprint_status_register_at25fs010(struct flashctx *flash);
 int spi_prettyprint_status_register_at25fs040(struct flashctx *flash);
 int spi_prettyprint_status_register_atmel_at26df081a(struct flashctx *flash);
 int spi_disable_blockprotect_at25df(struct flashctx *flash);
 int spi_disable_blockprotect_at25df_sec(struct flashctx *flash);
-int spi_disable_blockprotect_at25f(struct flashctx *flash);
+int spi_disable_blockprotect_at25f512b(struct flashctx *flash);
 int spi_disable_blockprotect_at25fs010(struct flashctx *flash);
 int spi_disable_blockprotect_at25fs040(struct flashctx *flash);
 
diff --git a/flashchips.c b/flashchips.c
index 789f17f90a865051c86d61b3c3fe770b3c1b4be5..f658b4c5d230ade60fde40cf17f743b7179d2d91 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1697,8 +1697,8 @@ const struct flashchip flashchips[] = {
 				.block_erase = spi_block_erase_c7,
 			}
 		},
-		.printlock	= spi_prettyprint_status_register_at25f,
-		.unlock		= spi_disable_blockprotect_at25f,
+		.printlock	= spi_prettyprint_status_register_at25f512b,
+		.unlock		= spi_disable_blockprotect_at25f512b,
 		.write		= spi_chip_write_256,
 		.read		= spi_chip_read,
 		.voltage	= {2700, 3600},