diff --git a/comps-f26.xml.in b/comps-f26.xml.in
index a19e42cf..6ddc0e66 100644
--- a/comps-f26.xml.in
+++ b/comps-f26.xml.in
@@ -35,7 +35,6 @@
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-keyboard</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4501,7 +4500,6 @@
       <packagereq>seahorse</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-printer</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4736,7 +4734,7 @@
     <packagelist>
       <!-- This is the preferred DHCP client so that NetworkManager won't
            fall back to the internal one in full installations. -->
-      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcp-client</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
       <packagereq type="default">dnsmasq</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
@@ -4906,10 +4904,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="system-config-date">system-config-date-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-nfs">system-config-nfs-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-samba">system-config-samba-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-services">system-config-services-docs</packagereq>
       <packagereq type="conditional" requires="system-config-users">system-config-users-docs</packagereq>
     </packagelist>
   </group>
@@ -5037,7 +5031,6 @@
       <packagereq type="default">foomatic-db-ppds</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-cups</packagereq>
-      <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">nss-mdns</packagereq>
@@ -5535,9 +5528,6 @@
     <packagelist>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">system-config-httpd</packagereq>
-      <packagereq type="default">system-config-nfs</packagereq>
-      <packagereq type="default">system-config-samba</packagereq>
-      <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>
       <packagereq type="optional">system-config-printer</packagereq>
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
@@ -5851,7 +5841,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinfo</packagereq>
@@ -6608,7 +6597,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinentry-gnome3</packagereq>
diff --git a/comps-f27.xml.in b/comps-f27.xml.in
index 45d71980..08a92c50 100644
--- a/comps-f27.xml.in
+++ b/comps-f27.xml.in
@@ -35,7 +35,6 @@
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-keyboard</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4509,7 +4508,6 @@
       <packagereq>seahorse</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-printer</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4744,7 +4742,7 @@
     <packagelist>
       <!-- This is the preferred DHCP client so that NetworkManager won't
            fall back to the internal one in full installations. -->
-      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcp-client</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
       <packagereq type="default">dnsmasq</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
@@ -4914,10 +4912,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="system-config-date">system-config-date-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-nfs">system-config-nfs-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-samba">system-config-samba-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-services">system-config-services-docs</packagereq>
       <packagereq type="conditional" requires="system-config-users">system-config-users-docs</packagereq>
     </packagelist>
   </group>
@@ -5045,7 +5039,6 @@
       <packagereq type="default">foomatic-db-ppds</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-cups</packagereq>
-      <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">nss-mdns</packagereq>
@@ -5543,9 +5536,6 @@
     <packagelist>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">system-config-httpd</packagereq>
-      <packagereq type="default">system-config-nfs</packagereq>
-      <packagereq type="default">system-config-samba</packagereq>
-      <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>
       <packagereq type="optional">system-config-printer</packagereq>
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
@@ -5859,7 +5849,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinfo</packagereq>
@@ -6617,7 +6606,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinentry-gnome3</packagereq>
diff --git a/comps-f28.xml.in b/comps-f28.xml.in
index b47e725b..a7f42854 100644
--- a/comps-f28.xml.in
+++ b/comps-f28.xml.in
@@ -35,7 +35,6 @@
       <packagereq>gnome-disk-utility</packagereq>
       <packagereq>recordmydesktop</packagereq>
       <packagereq>setroubleshoot</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-keyboard</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4478,7 +4477,6 @@
       <packagereq>setroubleshoot</packagereq>
       <packagereq>simple-scan</packagereq>
       <packagereq>slick-greeter</packagereq>
-      <packagereq>system-config-date</packagereq>
       <packagereq>system-config-language</packagereq>
       <packagereq>system-config-printer</packagereq>
       <packagereq>system-config-users</packagereq>
@@ -4713,7 +4711,7 @@
     <packagelist>
       <!-- This is the preferred DHCP client so that NetworkManager won't
            fall back to the internal one in full installations. -->
-      <packagereq type="default">dhclient</packagereq>
+      <packagereq type="default">dhcp-client</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
       <packagereq type="default">dnsmasq</packagereq>
       <!-- required for IPv4 connection sharing ("Hotspot") to work -->
@@ -4884,10 +4882,6 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq type="conditional" requires="system-config-date">system-config-date-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-nfs">system-config-nfs-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-samba">system-config-samba-docs</packagereq>
-      <packagereq type="conditional" requires="system-config-services">system-config-services-docs</packagereq>
       <packagereq type="conditional" requires="system-config-users">system-config-users-docs</packagereq>
     </packagelist>
   </group>
@@ -4999,7 +4993,6 @@
       <packagereq type="default">foomatic-db-ppds</packagereq>
       <packagereq type="default">gutenprint</packagereq>
       <packagereq type="default">gutenprint-cups</packagereq>
-      <packagereq type="default">hpijs</packagereq>
       <packagereq type="default">hplip</packagereq>
       <packagereq type="default">mpage</packagereq>
       <packagereq type="default">nss-mdns</packagereq>
@@ -5497,9 +5490,6 @@
     <packagelist>
       <packagereq type="default">cups-pk-helper</packagereq>
       <packagereq type="default">system-config-httpd</packagereq>
-      <packagereq type="default">system-config-nfs</packagereq>
-      <packagereq type="default">system-config-samba</packagereq>
-      <packagereq type="default">system-config-services</packagereq>
       <packagereq type="optional">system-config-bind</packagereq>
       <packagereq type="optional">system-config-printer</packagereq>
       <packagereq type="optional">system-switch-mail-gnome</packagereq>
@@ -5812,7 +5802,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinfo</packagereq>
@@ -6567,7 +6556,6 @@
       <packagereq>ntfs-3g</packagereq>
       <packagereq>ntfsprogs</packagereq>
       <packagereq>pam_krb5</packagereq>
-      <packagereq>pam_pkcs11</packagereq>
       <packagereq>passwdqc</packagereq>
       <packagereq>pciutils</packagereq>
       <packagereq>pinentry-gnome3</packagereq>