diff --git a/util/mainboard/google/brya0/template/memory/Makefile.inc b/util/mainboard/google/brya0/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/brya0/template/memory/Makefile.inc rename to util/mainboard/google/brya0/template/memory/Makefile.mk diff --git a/util/mainboard/google/dalboz/template/Makefile.inc b/util/mainboard/google/dalboz/template/Makefile.mk similarity index 100% rename from util/mainboard/google/dalboz/template/Makefile.inc rename to util/mainboard/google/dalboz/template/Makefile.mk diff --git a/util/mainboard/google/dalboz/template/spd/Makefile.inc b/util/mainboard/google/dalboz/template/spd/Makefile.mk similarity index 100% rename from util/mainboard/google/dalboz/template/spd/Makefile.inc rename to util/mainboard/google/dalboz/template/spd/Makefile.mk diff --git a/util/mainboard/google/guybrush/template/Makefile.inc b/util/mainboard/google/guybrush/template/Makefile.mk similarity index 100% rename from util/mainboard/google/guybrush/template/Makefile.inc rename to util/mainboard/google/guybrush/template/Makefile.mk diff --git a/util/mainboard/google/guybrush/template/memory/Makefile.inc b/util/mainboard/google/guybrush/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/guybrush/template/memory/Makefile.inc rename to util/mainboard/google/guybrush/template/memory/Makefile.mk diff --git a/util/mainboard/google/hatch/template/Makefile.inc b/util/mainboard/google/hatch/template/Makefile.mk similarity index 100% rename from util/mainboard/google/hatch/template/Makefile.inc rename to util/mainboard/google/hatch/template/Makefile.mk diff --git a/util/mainboard/google/nissa/template/memory/Makefile.inc b/util/mainboard/google/nissa/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/nissa/template/memory/Makefile.inc rename to util/mainboard/google/nissa/template/memory/Makefile.mk diff --git a/util/mainboard/google/puff/template/Makefile.inc b/util/mainboard/google/puff/template/Makefile.mk similarity index 100% rename from util/mainboard/google/puff/template/Makefile.inc rename to util/mainboard/google/puff/template/Makefile.mk diff --git a/util/mainboard/google/rex0/template/Makefile.inc b/util/mainboard/google/rex0/template/Makefile.mk similarity index 100% rename from util/mainboard/google/rex0/template/Makefile.inc rename to util/mainboard/google/rex0/template/Makefile.mk diff --git a/util/mainboard/google/rex0/template/memory/Makefile.inc b/util/mainboard/google/rex0/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/rex0/template/memory/Makefile.inc rename to util/mainboard/google/rex0/template/memory/Makefile.mk diff --git a/util/mainboard/google/trembyle/template/Makefile.inc b/util/mainboard/google/trembyle/template/Makefile.mk similarity index 100% rename from util/mainboard/google/trembyle/template/Makefile.inc rename to util/mainboard/google/trembyle/template/Makefile.mk diff --git a/util/mainboard/google/trembyle/template/spd/Makefile.inc b/util/mainboard/google/trembyle/template/spd/Makefile.mk similarity index 100% rename from util/mainboard/google/trembyle/template/spd/Makefile.inc rename to util/mainboard/google/trembyle/template/spd/Makefile.mk diff --git a/util/mainboard/google/volteer/template/memory/Makefile.inc b/util/mainboard/google/volteer/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/volteer/template/memory/Makefile.inc rename to util/mainboard/google/volteer/template/memory/Makefile.mk diff --git a/util/mainboard/google/waddledee/template/memory/Makefile.inc b/util/mainboard/google/waddledee/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/waddledee/template/memory/Makefile.inc rename to util/mainboard/google/waddledee/template/memory/Makefile.mk diff --git a/util/mainboard/google/waddledoo/template/memory/Makefile.inc b/util/mainboard/google/waddledoo/template/memory/Makefile.mk similarity index 100% rename from util/mainboard/google/waddledoo/template/memory/Makefile.inc rename to util/mainboard/google/waddledoo/template/memory/Makefile.mk