From eef0184c43910d7b522be1dace4d9cc9641b176c Mon Sep 17 00:00:00 2001
From: Lubos Kocman <lkocman@redhat.com>
Date: Aug 01 2016 17:50:45 +0000
Subject: renamed rpms -> srpms


---

diff --git a/modules/base-runtime/base-runtime.yaml b/modules/base-runtime/base-runtime.yaml
index a0d4314..157eb51 100644
--- a/modules/base-runtime/base-runtime.yaml
+++ b/modules/base-runtime/base-runtime.yaml
@@ -32,7 +32,7 @@ data:
                     rationale: Allows the creation, destruction, resizeing, moveing, and copying of hard disk partitions
                 policycoreutils:
                     rationale: Policy core utilities required for basic operation of a SELinux system
-                selinux-policy-targeted:
+                selinux-policy:
                     rationale: SELinux Reference policy targeted base module
                 systemd:
                     rationale: System and service manager for Linux, compatible with SysV and LSB init script
diff --git a/modules/core/core.yaml b/modules/core/core.yaml
index 1a703c9..d65e5c2 100644
--- a/modules/core/core.yaml
+++ b/modules/core/core.yaml
@@ -31,13 +31,13 @@ data:
                 curl:
                     rationale: "A tool and a library (usable from many languages) for client-side URL transfers, supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP."
                     commit: "8e287a"
-                dhcp-client:
+                dhcp:
                     rationale: "Client/server protocol that automatically provides an Internet Protocol (IP) host with its IP address and other related configuration information such as the subnet mask and default gateway."
                     commit: "d6db3a"
                 dnf:
                     rationale: "Package manager"
                     commit: "c3ada3"
-                dnf-yum:
+                dnf:
                     rationale: "Package manager tool for converting yum commands to dnf commands"
                     commit: "bb550b"
                 e2fsprogs:
@@ -77,10 +77,7 @@ data:
                 ncurses:
                     rationale: "Terminal-independent method of updating character screens with reasonable optimization"
                     commit: "525439"
-                openssh-clients:
-                    rationale: "Program for logging into a remote machine and for executing commands in a remote machine"
-                    commit: "cb306d"
-                openssh-server:
+                openssh:
                     rationale: "Program for allowing a remote machine to log in"
                     commit: "cb306d"
                 parted:
@@ -95,7 +92,7 @@ data:
                 policycoreutils:
                     rationale: "Policy core utilities required for basic operation of a SELinux system"
                     commit: "a130a2"
-                prcops-ng:
+                procps-ng:
                     rationale: "Set of command line and full-screen utilities that provide information out of the pseudo-filesystem most commonly located at /proc"
                     repository: "https://gitlab.com/procps-ng/procps.git"
                     commit: "8a198e"
@@ -105,7 +102,7 @@ data:
                 rpm:
                     rationale: "Powerful command line driven package management system capable of installing, uninstalling, verifying, querying, and updating software packages"
                     commit: "c2b0fd"
-                selinux-policy-targeted:
+                selinux-policy:
                     rationale: "SELinux Reference policy targeted base module"
                     repository: "https://github.com/TresysTechnology/refpolicy.wiki.git"
                     commit: "b7c720"
@@ -127,6 +124,6 @@ data:
                 util-linux:
                     rationale: "Contains a large variety of low-level system utilities that are necessary for a Linux system to function"
                     commit: "cb4c21"
-                vim-minimal:
+                vim:
                     rationale: "Updated and improved version of the vi editor"
                     commit: "ab015b"