diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index b8ad37e187..e84700e2b2 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -260,8 +260,8 @@ ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/fadt.c
 endif
 endif
 ifeq ($(CONFIG_HAVE_SMI_HANDLER),y)
-ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard_smi.c),)
-smm-srcs += src/mainboard/$(MAINBOARDDIR)/mainboard_smi.c
+ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/smihandler.c),)
+smm-srcs += src/mainboard/$(MAINBOARDDIR)/smihandler.c
 endif
 endif
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c),)
diff --git a/src/mainboard/getac/p470/acpi/ec.asl b/src/mainboard/getac/p470/acpi/ec.asl
index 70faab2836..b8e2954558 100644
--- a/src/mainboard/getac/p470/acpi/ec.asl
+++ b/src/mainboard/getac/p470/acpi/ec.asl
@@ -425,14 +425,14 @@ Scope(\_SB)
 		Method(SBLL, 1, Serialized)
 		{
 			Store (Arg0, BRTL)
-			TRAP(0xd5)	// See mainboard_smi.c
+			TRAP(0xd5)	// See mainboard's smihandler.c
 			Return (0)
 		}
 
 		/* Get Brightness Level */
 		Method(GBLL, 0, Serialized)
 		{
-			TRAP(0xd6)	// See mainboard_smi.c
+			TRAP(0xd6)	// See mainboard's smihandler.c
 			Return (BRTL)
 		}
 
diff --git a/src/mainboard/getac/p470/mainboard_smi.c b/src/mainboard/getac/p470/smihandler.c
similarity index 100%
rename from src/mainboard/getac/p470/mainboard_smi.c
rename to src/mainboard/getac/p470/smihandler.c
diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc
index c4fb74dcd6..f2de43ea40 100644
--- a/src/mainboard/google/parrot/Makefile.inc
+++ b/src/mainboard/google/parrot/Makefile.inc
@@ -22,6 +22,4 @@ ramstage-y += ec.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
-
 SRC_ROOT = $(src)/mainboard/google/parrot
diff --git a/src/mainboard/google/parrot/mainboard_smi.c b/src/mainboard/google/parrot/smihandler.c
similarity index 100%
rename from src/mainboard/google/parrot/mainboard_smi.c
rename to src/mainboard/google/parrot/smihandler.c
diff --git a/src/mainboard/ibase/mb899/mainboard_smi.c b/src/mainboard/ibase/mb899/smihandler.c
similarity index 100%
rename from src/mainboard/ibase/mb899/mainboard_smi.c
rename to src/mainboard/ibase/mb899/smihandler.c
diff --git a/src/mainboard/intel/d945gclf/mainboard_smi.c b/src/mainboard/intel/d945gclf/smihandler.c
similarity index 100%
rename from src/mainboard/intel/d945gclf/mainboard_smi.c
rename to src/mainboard/intel/d945gclf/smihandler.c
diff --git a/src/mainboard/intel/emeraldlake2/mainboard_smi.c b/src/mainboard/intel/emeraldlake2/smihandler.c
similarity index 100%
rename from src/mainboard/intel/emeraldlake2/mainboard_smi.c
rename to src/mainboard/intel/emeraldlake2/smihandler.c
diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard_smi.c b/src/mainboard/iwave/iWRainbowG6/smihandler.c
similarity index 100%
rename from src/mainboard/iwave/iWRainbowG6/mainboard_smi.c
rename to src/mainboard/iwave/iWRainbowG6/smihandler.c
diff --git a/src/mainboard/kontron/986lcd-m/mainboard_smi.c b/src/mainboard/kontron/986lcd-m/smihandler.c
similarity index 100%
rename from src/mainboard/kontron/986lcd-m/mainboard_smi.c
rename to src/mainboard/kontron/986lcd-m/smihandler.c
diff --git a/src/mainboard/lenovo/t60/mainboard_smi.c b/src/mainboard/lenovo/t60/smihandler.c
similarity index 100%
rename from src/mainboard/lenovo/t60/mainboard_smi.c
rename to src/mainboard/lenovo/t60/smihandler.c
diff --git a/src/mainboard/lenovo/x60/mainboard_smi.c b/src/mainboard/lenovo/x60/smihandler.c
similarity index 100%
rename from src/mainboard/lenovo/x60/mainboard_smi.c
rename to src/mainboard/lenovo/x60/smihandler.c
diff --git a/src/mainboard/rca/rm4100/mainboard_smi.c b/src/mainboard/rca/rm4100/smihandler.c
similarity index 100%
rename from src/mainboard/rca/rm4100/mainboard_smi.c
rename to src/mainboard/rca/rm4100/smihandler.c
diff --git a/src/mainboard/roda/rk886ex/mainboard_smi.c b/src/mainboard/roda/rk886ex/smihandler.c
similarity index 100%
rename from src/mainboard/roda/rk886ex/mainboard_smi.c
rename to src/mainboard/roda/rk886ex/smihandler.c
diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc
index 9a2f0b17f5..1a6cb022a6 100644
--- a/src/mainboard/roda/rk9/Makefile.inc
+++ b/src/mainboard/roda/rk9/Makefile.inc
@@ -18,4 +18,3 @@
 ##
 
 ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c
-smm-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.c
diff --git a/src/mainboard/roda/rk9/mainboard_smi.c b/src/mainboard/roda/rk9/smihandler.c
similarity index 100%
rename from src/mainboard/roda/rk9/mainboard_smi.c
rename to src/mainboard/roda/rk9/smihandler.c
diff --git a/src/mainboard/samsung/lumpy/mainboard_smi.c b/src/mainboard/samsung/lumpy/smihandler.c
similarity index 100%
rename from src/mainboard/samsung/lumpy/mainboard_smi.c
rename to src/mainboard/samsung/lumpy/smihandler.c
diff --git a/src/mainboard/samsung/stumpy/mainboard_smi.c b/src/mainboard/samsung/stumpy/smihandler.c
similarity index 100%
rename from src/mainboard/samsung/stumpy/mainboard_smi.c
rename to src/mainboard/samsung/stumpy/smihandler.c
diff --git a/src/mainboard/thomson/ip1000/mainboard_smi.c b/src/mainboard/thomson/ip1000/smihandler.c
similarity index 100%
rename from src/mainboard/thomson/ip1000/mainboard_smi.c
rename to src/mainboard/thomson/ip1000/smihandler.c