diff --git a/src/soc/intel/common/block/crashlog/crashlog.c b/src/soc/intel/common/block/crashlog/crashlog.c
index 5b098bb583..fa3603334b 100644
--- a/src/soc/intel/common/block/crashlog/crashlog.c
+++ b/src/soc/intel/common/block/crashlog/crashlog.c
@@ -114,13 +114,13 @@ int cpu_cl_poll_mailbox_ready(u32 cl_mailbox_addr)
 
 	do {
 		cl_mailbox_interface.data = read32((u32 *)cl_mailbox_addr);
-		udelay(CPU_CRASHLOG_MAILBOX_WAIT_STALL);
+		udelay(CPU_CRASHLOG_WAIT_STALL);
 		stall_cnt++;
 	} while ((cl_mailbox_interface.fields.busy == 1)
-		 && stall_cnt < CPU_CRASHLOG_MAILBOX_WAIT_TIMEOUT);
+		 && stall_cnt < CPU_CRASHLOG_WAIT_TIMEOUT);
 
 	if ((cl_mailbox_interface.fields.busy == 1)
-	    && (stall_cnt >= CPU_CRASHLOG_MAILBOX_WAIT_TIMEOUT)) {
+	    && (stall_cnt >= CPU_CRASHLOG_WAIT_TIMEOUT)) {
 		printk(BIOS_ERR, "CPU crashlog mailbox timed out.\n");
 		return 0;
 	}
diff --git a/src/soc/intel/common/block/include/intelblocks/crashlog.h b/src/soc/intel/common/block/include/intelblocks/crashlog.h
index ceaa9f1409..23d4861557 100644
--- a/src/soc/intel/common/block/include/intelblocks/crashlog.h
+++ b/src/soc/intel/common/block/include/intelblocks/crashlog.h
@@ -17,8 +17,8 @@
 /* CPU CrashLog Mailbox commands */
 #define CPU_CRASHLOG_CMD_DISABLE		0
 #define CPU_CRASHLOG_CMD_CLEAR			2
-#define CPU_CRASHLOG_MAILBOX_WAIT_STALL		1
-#define CPU_CRASHLOG_MAILBOX_WAIT_TIMEOUT	1000
+#define CPU_CRASHLOG_WAIT_STALL			1
+#define CPU_CRASHLOG_WAIT_TIMEOUT		1000
 #define CPU_CRASHLOG_DISC_TAB_GUID_VALID	0x1600
 
 #define CRASHLOG_SIZE_DEBUG_PURPOSE		0x640