diff --git a/board/bds/board.c b/board/bds/board.c
index e433b818d7..777e84c3e5 100644
--- a/board/bds/board.c
+++ b/board/bds/board.c
@@ -78,7 +78,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	GPIO_SIGNAL_NOT_IMPLEMENTED("PCH_SUSACKn"),
 	GPIO_SIGNAL_NOT_IMPLEMENTED("SHUNT_1_5V_DDR"),
 	GPIO_SIGNAL_NOT_IMPLEMENTED("RECOVERYn"),
-	GPIO_SIGNAL_NOT_IMPLEMENTED("WRITE_PROTECTn"),
+	GPIO_SIGNAL_NOT_IMPLEMENTED("WRITE_PROTECT"),
 	GPIO_SIGNAL_NOT_IMPLEMENTED("LIGHTBAR_RESETn"),
 };
 
diff --git a/board/bds/board.h b/board/bds/board.h
index 1aed0f314a..67aad5f401 100644
--- a/board/bds/board.h
+++ b/board/bds/board.h
@@ -118,7 +118,7 @@ enum gpio_signal {
 	GPIO_SHUNT_1_5V_DDR,      /* Shunt +1.5V_DDR; may also enable +3V_TP
 				   * depending on stuffing. */
 	GPIO_RECOVERYn,           /* Recovery signal from servo */
-	GPIO_WRITE_PROTECTn,      /* Write protect input */
+	GPIO_WRITE_PROTECT,       /* Write protect input */
 	GPIO_LIGHTBAR_RESETn,     /* Reset lightbar controllers (Proto1+) */
 
 	/* Number of GPIOs; not an actual GPIO */
diff --git a/board/link/board.c b/board/link/board.c
index faee2863fa..0b69b35d5f 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -68,7 +68,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
 	 power_button_interrupt},
 	{"USB1_STATUSn",        LM4_GPIO_E, (1<<7), 0, NULL},
 	{"USB2_STATUSn",        LM4_GPIO_E, (1<<1), 0, NULL},
-	{"WRITE_PROTECTn",      LM4_GPIO_J, (1<<4), GPIO_INT_BOTH,
+	{"WRITE_PROTECT",       LM4_GPIO_J, (1<<4), GPIO_INT_BOTH,
 	 power_button_interrupt},
 	/* Outputs; all unasserted by default except for reset signals */
 	{"CPU_PROCHOTn",        LM4_GPIO_F, (1<<2), GPIO_OUT_HIGH, NULL},
diff --git a/board/link/board.h b/board/link/board.h
index d98f2ce7ac..b0228961b7 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -127,7 +127,7 @@ enum gpio_signal {
 	GPIO_RECOVERYn,           /* Recovery signal from servo */
 	GPIO_USB1_STATUSn,        /* USB charger port 1 status output */
 	GPIO_USB2_STATUSn,        /* USB charger port 2 status output */
-	GPIO_WRITE_PROTECTn,      /* Write protect input */
+	GPIO_WRITE_PROTECT,       /* Write protect input */
 	/* Outputs */
 	GPIO_CPU_PROCHOTn,        /* Force CPU to think it's overheated */
 	GPIO_ENABLE_1_5V_DDR,     /* Enable +1.5V_DDR supply */
diff --git a/chip/lm4/power_button.c b/chip/lm4/power_button.c
index 6ad2561a20..7fdc5f633a 100644
--- a/chip/lm4/power_button.c
+++ b/chip/lm4/power_button.c
@@ -71,7 +71,7 @@ static uint8_t *memmap_switches;
 /* Update status of non-debounced switches */
 static void update_other_switches(void)
 {
-	if (gpio_get_level(GPIO_WRITE_PROTECTn) != 0)
+	if (gpio_get_level(GPIO_WRITE_PROTECT) == 0)
 		*memmap_switches |= EC_LPC_SWITCH_WRITE_PROTECT_DISABLED;
 	else
 		*memmap_switches &= ~EC_LPC_SWITCH_WRITE_PROTECT_DISABLED;
@@ -265,7 +265,7 @@ int power_button_init(void)
 	/* Enable interrupts, now that we've initialized */
 	gpio_enable_interrupt(GPIO_POWER_BUTTONn);
 	gpio_enable_interrupt(GPIO_LID_SWITCHn);
-	gpio_enable_interrupt(GPIO_WRITE_PROTECTn);
+	gpio_enable_interrupt(GPIO_WRITE_PROTECT);
 	gpio_enable_interrupt(GPIO_RECOVERYn);
 
 	return EC_SUCCESS;
diff --git a/common/flash_common.c b/common/flash_common.c
index 244f25e1cf..0c458911ae 100644
--- a/common/flash_common.c
+++ b/common/flash_common.c
@@ -30,7 +30,7 @@ static struct persist_state pstate; /* RAM copy of pstate data */
 /* Return non-zero if the write protect pin is asserted */
 static int wp_pin_asserted(void)
 {
-	return gpio_get_level(GPIO_WRITE_PROTECTn) == 0 ? 1 : 0;
+	return gpio_get_level(GPIO_WRITE_PROTECT);
 }