diff --git a/distro/adaptation/centos b/distro/adaptation/centos
index ed9a528c1..3fb4bb4ed 100644
--- a/distro/adaptation/centos
+++ b/distro/adaptation/centos
@@ -1,33 +1,40 @@
 apache2: httpd
 apt-file:
-autopoint: gettext-devel
+arping: iputils
+autopoint: gettext
 autotools-dev: autoconf
 bind9: bind
 binutils-dev: binutils-devel
 btrfs-tools: btrfs-progs
 build-essential: make automake gcc gcc-c++ kernel-devel rpm-build
 cgroup-bin: libcgroup
+cgroupfs-mount:
 clang-6.0: clang.x86_64
 cmake: cmake cmake3
+cron: cronie
 dbench=4.0-2: dbench
+default-jdk: java-1.8.0-openjdk-devel 
 dnsutils: bind-utils
-dpkg-dev: dpkg-devel
+dpkg-dev: 
 e2fslibs-dev: e2fsprogs-devel
+exfat-fuse:
 f2fs-tools: f2fs-tools
 freeglut3: freeglut
-fsmark: fs_mark
+fsmark: 
 gcc-4.9: gcc
 gcc-5: gcc
 gcc-6-multilib:
 gcc-6: gcc
-gcc-multilib: libgcc.i686
-gfortran: gcc-c++
+gcc-multilib:
+gdbserver: gdb-gdbserver
+gfortran: gcc-gfortran
 heirloom-mailx: mailx
 hpcc:
 initramfs-tools: dracut
 install-info: info
-iozone3: gnuplot*
+iozone3: 
 iproute2: iproute
+junit4: junit
 klibc-utils:
 libacl1-dev: libacl-devel
 libaio-dev: libaio-devel
@@ -39,20 +46,24 @@ libarchive13: libarchive
 libattr1-dev: libattr-devel
 libattr1: libattr
 libaudit-dev: audit-libs-devel
+libasound2-dev: alsa-lib-devel
 libbabeltrace-dev:
-libblas3: liblas-libs
+libbinutils:
+libblas3: blas
 libblkid-dev: libblkid-devel
-libbsd-dev: libbsd-devel
-libbsd0: libbsd
+libbsd-dev: 
+libbsd0: 
 libbz2-dev: bzip2-devel
 libc-bin: glibc-common
 libc-dev-bin: glibc-common
 libc-dev: glibc-devel
-libc6-dev-i386: glibc-devel.i686 glibc-static.i686
+libc6-dev-i386: 
 libc6-dev-x32:
 libc6-dev: glibc-devel glibc-static
 libc6-dev:i386: glibc-devel.i686 glibc-static.i686
-libc6: glibc.x86_64
+libc6: 
+libc6-dbg:
+libc6-i386: 
 libcairo2-dev: cairo-devel
 libcap-dev: libcap-devel
 libcap-ng-dev: libcap-ng-devel
@@ -64,11 +75,14 @@ libdbd-mysql-perl: perl-DBD-MySQL
 libdbi-perl: perl-DBI
 libdbus-1-dev: dbus-devel
 libdrm-dev: libdrm-devel
-libdw-dev: libdwarf-devel.x86_64
+libdw-dev: elfutils-devel
+libedit-dev: libedit-devel
 libegl1-mesa-dev: mesa-libEGL-devel
-libelf-dev: elfutils-libelf-devel
+libelf-dev: elfutils-devel
+libelf1: elfutils-libelf
 libevent-2: libevent
 libevent-dev: libevent-devel
+libexpat1-dev: expat-devel
 libfabric-dev: libfabric-devel
 libfdt-dev:
 libffi-dev: libffi-devel
@@ -80,15 +94,15 @@ libgcrypt20: libgcrypt
 libgdbm-dev: gdbm-devel
 libgl1-mesa-dev: mesa-libGL-devel
 libgles2-mesa: mesa-libGLES
-libglib2.0-0: glib
+libglib2.0-0: 
 libglib2.0-dev: glib2-devel
 libglu-dev: mesa-libGLU-devel
 libgmp-dev: gmp-devel
 libgomp1: libgomp
-libgtk2.0-dev: gtk2-devel.x86_64
+libgtk2.0-dev: gtk2-devel
 libhwloc-dev: hwloc-devel
-libiberty-dev:
-libibverbs-dev: libibverbs-devel
+libiberty-dev: binutils-devel
+libibverbs-dev: 
 libicu: libicu57
 libipc-run-perl: perl-IPC-Run
 libipsec-mb-dev:
@@ -100,24 +114,29 @@ libkeyutils1: keyutils-libs
 libklibc-dev:
 libkmod-dev: kmod-devel
 libkmod2: kmod-libs
+libldap2-dev: openldap-devel
 liblsan0:
 liblz-dev:
 liblzma-dev: xz-devel
 libmariadbclient-dev: mysql-devel
 libmariadbclient18: mariadb-connector-c
+libmnl-dev: libmnl-devel
 libmount-dev: libmount-devel
 libmpx2:
+libmpfr6: mpfr
 libncurses5-dev: ncurses-devel
 libnl-3-200: libnl3
 libnl-3-dev: libnl3-devel
 libnl-genl-3-200: libnl3
 libnl-genl-3-dev: libnl3-devel
 libnl-route-3-dev: libnl3-devel
+libntfs:
 libnuma-dev: numactl-devel
 libnuma1: numactl
+liboath-dev:
 libobjc-7-dev: libobjc.x86_64
 liboop-dev:
-liboop-dev: liboop
+libopencryptoki0: opencryptoki-libs
 libopenmpi-dev: openmpi-devel
 libopenmpi2: openmpi
 libpcap-dev: libpcap-devel
@@ -126,25 +145,33 @@ libpcap0.8: libpcap
 libpci-dev: pciutils-devel
 libpci3: pciutils
 libpciaccess-dev: libpciaccess-devel
-libperl-dev: perl-devel.x86_64
+libperl-dev: perl-devel
 libperl5: perl-libs
+libpfm4-dev: libpfm-devel
+libpfm4: libpfm
 libpixman-1-dev: pixman-devel
+libpmem-dev: libpmem-devel
+libpmem1: libpmem
 libpng-dev: libpng-devel
 libpng12-dev: libpng12-devel
 libpng16-16: libpng
 libpopt-dev: popt-devel
 libpopt0: popt
 libprocps-dev: procps-ng-devel
-libpython2.7: python2-libs
+libprotobuf-dev: protobuf-devel
+libpython2.7: python3-libs
+libpython3.9: python3-libs
 libquadmath0: libquadmath.x86_64
-librdmacm-dev: librdmacm-devel
+librdmacm-dev: 
 libreadline-dev: readline-devel
 libreadline5: readline
 libsctp-dev: lksctp-tools-devel
 libsctp1: lksctp-tools
+libseccomp2:
 libselinux1:
-libslang2-dev:
+libslang2-dev: slang-devel
 libsmbclient-dev: libsmbclient-devel
+libsnappy-dev: snappy-devel
 libsqlite3-dev: sqlite-devel
 libssl-dev: openssl-devel
 libssl: openssl-devel
@@ -160,14 +187,20 @@ libunwind-dev: libunwind-devel
 libunwind8: libunwind
 libuuid1: libuuid
 libuv1-dev: libuv-devel
+libvirt-clients: libvirt-client
+libvirt-daemon-system: libvirt-client libvirt-daemon
+libvirt-dev: libvirt-devel
 libwaffle-dev: waffle-devel
 libx11-dev: libX11-devel
 libx11-xcb-dev: libX11-devel
 libxkbcommon-dev: libxkbcommon-devel
 libxml2-dev: libxml2-devel
+libyaml-cpp-dev: 
+libyaml-dev: libyaml-devel
 libzstd-dev: zlib-devel
-linux-libc-dev:
-linux-libc-dev:i386:
+linux-base:
+linux-libc-dev: kernel-headers
+linux-libc-dev:i386: kernel-headers
 linux-perf: perf
 linux-tools: perf
 llvm-6.0: llvm7.0.x86_64
@@ -181,22 +214,27 @@ netpipe-mpich2:
 netpipe-openmpi:
 netpipe-pvm:
 netpipe-tcp:
+network-manager: NetworkManager
 nfs-common: nfs-utils
 nfs-kernel-server: nfs-utils
 ocfs2-tools-dev: ocfs2-tools-devel
 openbsd-inetd: xinetd
 openjdk: java-1.8.0-openjdk-devel
 perl-base: perl
-perl-modules-5: perl-CPAN
+perl-modules-5: perl
 pixz: pxz
 pkg-config: pkgconfig
 plzip:
 postmark:
-python-dev: platform-python-devel.x86_64
+protobuf-compiler: protobuf
+python-dev: python3-devel
+python-gi-cairo:
+python-gi:
 python-minimal: python2
 python-numpy: numpy
 python-openssl: pyOpenSSL
 python-pkg-resources: python-setuptools
+python2-libs:
 python3-mako: python-pyramid-mako
 python3-markupsafe: python34-markupsafe
 python3-numpy: python36-numpy
@@ -204,29 +242,30 @@ python3-six: python36-six
 python3: python34
 python: python2
 qemu-utils: qemu-img
+rng-tools5: rng-tools
 rpcsvc-proto: rpcgen
 rstatd: rusers-server
 rt-tests: numactl-devel
 ruby-dev: ruby-devel
 ruby-git:
 ruby-gnuplot:
-rusersd: rusers-server rusers
+rusersd: rusers-server
 samba-dev: samba-devel
 sg3-utils: sg3_utils
 stress-ng: stress-ng
-systemtap-sdt-dev: systemtap-sdt-devel.x86_64
+systemtap-sdt-dev: systemtap-sdt-devel
 trinity:
 tshark: wireshark
 update-inetd: xinetd
 uuid-dev: libuuid-devel
-uuid-runtime:
+uuid-runtime: util-linux
 wireless-regdb: crda
 wpasupplicant: wpa_supplicant
 xfslibs-dev: xfsprogs-devel
 xinit: xorg-x11-xinit
 xorg:
 xsltproc: libxslt
-xutils-dev: imake xorg-x11-util-macros
+xutils-dev: imake
 xz-utils: xz
 zlib1g-dev: zlib-devel
 zlib1g: zlib
diff --git a/distro/adaptation/centos-7 b/distro/adaptation/centos-7
index e7271b47e..fbce7c9bd 100644
--- a/distro/adaptation/centos-7
+++ b/distro/adaptation/centos-7
@@ -1,13 +1,24 @@
 default-jdk:
+cgroup-tools: libcgroup-tools
 g++: gcc-c++
 ibtraceevent-dev:
-libclang-dev: clang-devel
+libclang-dev:
+libcunit1-dev: 
+libbabeltrace-ctf-dev:
+libbabeltrace-ctf1:
+libdw1: 
+libgoogle-perftools-dev: gperftools-devel
+libmariadbclient-dev:
+libmariadbclient18:  
 libmpfr6: mpfr
 libpfm4: libpfm
 libpfm4-dev: libpfm-devel
 libpython3.9: python3-libs
 libtraceevent1:
 libtraceevent-dev:
-llvm-dev: llvm-devel
+libuv1-dev:
+llvm-dev: 
 python-dev: python-devel
+python3-dev: python3-devel
+python-minimal: python3
 rng-tools5: rng-tools
diff --git a/distro/adaptation/centos-8 b/distro/adaptation/centos-8
index 800a3eb98..a7b09f37d 100644
--- a/distro/adaptation/centos-8
+++ b/distro/adaptation/centos-8
@@ -1 +1,24 @@
+btrfs-tools:
+cgroup-tools: libcgroup-tools
+libbabeltrace-ctf-dev: libbabeltrace-devel
+libbabeltrace-ctf1: libbabeltrace
+libbabeltrace-dev: libbabeltrace-devel
+libclang-dev: clang-devel
+libcunit1-dev: CUnit-devel
+libdw1: libdwarves1
+libfdt-dev: libfdt-devel
+libgles2-mesa:
+libgoogle-perftools-dev: 
+libpng12-dev:
+libtraceevent-dev: libtraceevent-devel 
+libtraceevent1: 
+libunwind-dev:
+libunwind8:
+llvm-dev: llvm-devel
+pkg-config:
+python-dev:
+python-pkg-resources: 
 python-setuptools: python2-setuptools
+python3-dev:
+rusersd:
+rstatd: 
diff --git a/distro/adaptation/centos-9 b/distro/adaptation/centos-9
index a3213b91e..042f5e3b6 100644
--- a/distro/adaptation/centos-9
+++ b/distro/adaptation/centos-9
@@ -1,19 +1,41 @@
+btrfs-tools:
+cgroup-bin:
+cgroup-tools:
 default-jdk:
 libclang-dev: clang-devel
+libbabeltrace-ctf-dev: libbabeltrace-devel
+libbabeltrace-ctf1: libbabeltrace
+libbabeltrace-dev: libbabeltrace-devel
+libcunit1-dev: CUnit-devel
+libdw1: libdwarves1
+libfdt-dev: libfdt-devel
+libgles2-mesa:
+libgoogle-perftools-dev:  
 libipsec-mb0:
 libjudy-dev: Judy-devel
 libjudydebian1: Judy
 libmpfr6: mpfr
 libpfm4-dev: libpfm-devel
 libpfm4: libpfm
+libpng12-dev:
 libpython2.7: python3-libs
 libpython3.9: python3-libs
 libtraceevent-dev: libtraceevent-devel
 libtraceevent1: libtraceevent
+libunwind-dev:
+libunwind8:  
 llvm-dev: llvm-devel
+openbsd-inetd:
+pkg-config:
 python-dev: python3-devel
 python-minimal: python3
+python-pkg-resources: 
 python-setuptools: python3-setuptools
-python3: python3 
+python3: python3
+python3-dev: python3-devel 
 python: python3
 rng-tools5: rng-tools
+rusersd:
+rstatd:
+update-inetd: 
+xutils-dev: