diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 76b9dc4a..7c90401f 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -946,8 +946,8 @@
       <packagereq>fcoe-utils</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>grub</packagereq>
-      <packagereq>grub-efi</packagereq>
       <packagereq>grub2</packagereq>
+      <packagereq>grub2-efi</packagereq>
       <packagereq>hfsplus-tools</packagereq>
       <packagereq>iscsi-initiator-utils</packagereq>
       <packagereq>lvm2</packagereq>
@@ -957,6 +957,7 @@
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>s390utils</packagereq>
       <packagereq>s390utils-base</packagereq>
+      <packagereq>shim</packagereq>
       <packagereq>silo</packagereq>
       <packagereq>system-config-firewall-base</packagereq>
       <packagereq>tboot</packagereq>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 4e92679b..98b5a92b 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -946,8 +946,8 @@
       <packagereq>fcoe-utils</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>grub</packagereq>
-      <packagereq>grub-efi</packagereq>
       <packagereq>grub2</packagereq>
+      <packagereq>grub2-efi</packagereq>
       <packagereq>hfsplus-tools</packagereq>
       <packagereq>iscsi-initiator-utils</packagereq>
       <packagereq>lvm2</packagereq>
@@ -957,6 +957,7 @@
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>s390utils</packagereq>
       <packagereq>s390utils-base</packagereq>
+      <packagereq>shim</packagereq>
       <packagereq>silo</packagereq>
       <packagereq>system-config-firewall-base</packagereq>
       <packagereq>tboot</packagereq>