diff --git a/Makefile.util.def b/Makefile.util.def
index e2101141b..94dfb1044 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -1,25 +1,29 @@
 AutoGen definitions Makefile.tpl;
 
 library = {
-  name = libemu.a;
+  name = libgrubkern.a;
   cflags = '$(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_GNULIB)';
 
   common = util/misc.c;
-  common = grub-core/kern/err.c;
-  common = grub-core/kern/env.c;
-  common = grub-core/kern/list.c;
-  common = grub-core/kern/misc.c;
+  common = grub-core/kern/command.c;
+  common = grub-core/kern/device.c;
   common = grub-core/kern/disk.c;
-  common = grub-core/kern/partition.c;
-  common = grub-core/kern/emu/mm.c;
-  common = grub-core/kern/emu/misc.c;
   common = grub-core/kern/emu/getroot.c;
   common = grub-core/kern/emu/hostdisk.c;
+  common = grub-core/kern/emu/misc.c;
+  common = grub-core/kern/emu/mm.c;
+  common = grub-core/kern/env.c;
+  common = grub-core/kern/err.c;
+  common = grub-core/kern/file.c;
+  common = grub-core/kern/fs.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/kern/partition.c;
 };
 
 library = {
-  name = libgrub.a;
+  name = libgrubmods.a;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 
@@ -66,10 +70,6 @@ library = {
   common = grub-core/fs/ufs2.c;
   common = grub-core/fs/ufs.c;
   common = grub-core/fs/xfs.c;
-  common = grub-core/kern/command.c;
-  common = grub-core/kern/device.c;
-  common = grub-core/kern/file.c;
-  common = grub-core/kern/fs.c;
   common = grub-core/lib/arg.c;
   common = grub-core/lib/crypto.c;
   common = grub-core/lib/envblk.c;
@@ -99,8 +99,8 @@ library = {
 program = {
   name = grub-bin2h;
   common = util/bin2h.c;
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
   mansection = 1;
@@ -114,8 +114,8 @@ program = {
   common = util/resolve.c;
   extra_dist = util/grub-mkimagexx.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBLZMA)';
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
@@ -128,8 +128,8 @@ program = {
 
   common = util/grub-mkrelpath.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -140,8 +140,8 @@ program = {
 
   common = util/grub-script-check.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -152,8 +152,8 @@ program = {
 
   common = util/grub-editenv.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -164,8 +164,8 @@ program = {
 
   common = util/grub-mkpasswd-pbkdf2.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
   cflags = '$(CFLAGS_GCRY)';
@@ -184,8 +184,8 @@ program = {
   mansection = 1;
   common = util/grub-pe2elf.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL)';
   condition = COND_GRUB_PE2ELF;
@@ -202,8 +202,8 @@ program = {
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -216,8 +216,8 @@ program = {
 
   cflags = '$(freetype_cflags)';
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(freetype_libs)';
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
@@ -236,8 +236,8 @@ program = {
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -248,8 +248,8 @@ program = {
   mansection = 8;
   common = util/grub-probe.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -265,8 +265,8 @@ program = {
 
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR)';
 
@@ -280,8 +280,8 @@ program = {
   ieee1275 = util/ieee1275/grub-ofpathname.c;
   ieee1275 = util/ieee1275/ofpath.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 
@@ -294,8 +294,8 @@ program = {
 
   common = util/grub-mklayout.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };
@@ -604,8 +604,8 @@ program = {
   common = grub-core/kern/misc.c;
   common = grub-core/tests/lib/test.c;
   cflags = -Wno-format;
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldadd = '$(LIBDEVMAPPER)';
 };
@@ -617,8 +617,8 @@ program = {
   common = grub-core/lib/legacy_parse.c;
   common = grub-core/lib/i386/pc/vesa_modes_table.c;
 
-  ldadd = libgrub.a;
-  ldadd = libemu.a;
+  ldadd = libgrubmods.a;
+  ldadd = libgrubkern.a;
   ldadd = grub-core/gnulib/libgnu.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 };