diff --git a/Fedora/input/oval/chronyd_specify_multiple_servers.xml b/Fedora/input/oval/chronyd_specify_multiple_servers.xml
deleted file mode 100644
index 2dd5daa75a9..00000000000
--- a/Fedora/input/oval/chronyd_specify_multiple_servers.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<def-group>
-  <definition class="compliance" id="chronyd_specify_multiple_servers" version="1">
-    <metadata>
-      <title>Specify a Remote NTP Server for Time Data</title>
-      <affected family="unix">
-        <platform>multi_platform_fedora</platform>
-      </affected>
-      <description>Multiple NTP Servers for time synchronization should be
-      specified</description>
-      <reference source="galford" ref_id="20141107" ref_url="test_attestation" />
-    </metadata>
-    <criteria comment="chrony.conf conditions are met">
-      <criterion test_ref="test_chronyd_multiple_servers" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all" check_existence="all_exist"
-  comment="Ensure at least one chrony server is set" id="test_chronyd_multiple_servers"
-  version="1">
-    <ind:object object_ref="obj_chronyd_multiple_servers" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object comment="Ensure more than one chrony server is set"
-  id="obj_chronyd_multiple_servers" version="1">
-    <ind:filepath>/etc/chrony.conf</ind:filepath>
-    <ind:pattern operation="pattern match">^([\s]*server[\s]+.+$){2,}$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/Fedora/input/oval/chronyd_specify_remote_server.xml b/Fedora/input/oval/chronyd_specify_remote_server.xml
deleted file mode 100644
index 2bf12b72127..00000000000
--- a/Fedora/input/oval/chronyd_specify_remote_server.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<def-group>
-  <definition class="compliance" id="chronyd_specify_remote_server" version="1">
-    <metadata>
-      <title>Specify a Remote NTP Server for Time Data</title>
-      <affected family="unix">
-        <platform>multi_platform_fedora</platform>
-      </affected>
-      <description>A remote NTP Server for time synchronization should be
-      specified (and dependencies are met)</description>
-      <reference source="galford" ref_id="20141111" ref_url="test_attestation" />
-    </metadata>
-    <criteria comment="chrony.conf conditions are met">
-      <criterion test_ref="test_ntp_remote_server" />
-    </criteria>
-  </definition>
-  <ind:textfilecontent54_test check="all" check_existence="at_least_one_exists"
-  comment="Ensure at least one NTP server is set" id="test_ntp_remote_server"
-  version="1">
-    <ind:object object_ref="obj_ntp_remote_server" />
-  </ind:textfilecontent54_test>
-  <ind:textfilecontent54_object comment="Ensure at least one NTP server is set"
-  id="obj_ntp_remote_server" version="1">
-    <ind:filepath>/etc/chrony.conf</ind:filepath>
-    <ind:pattern operation="pattern match">^[\s]*server[\s]+.+$</ind:pattern>
-    <ind:instance datatype="int">1</ind:instance>
-  </ind:textfilecontent54_object>
-</def-group>
diff --git a/Fedora/input/oval/oval_5.11/package_audit_installed.xml b/Fedora/input/oval/oval_5.11/package_audit_installed.xml
deleted file mode 100644
index 7a86c90d80a..00000000000
--- a/Fedora/input/oval/oval_5.11/package_audit_installed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_audit_installed"
-  version="1">
-    <metadata>
-      <title>Package audit Installed</title>
-      <affected family="unix">
-        <platform>multi_platform_fedora</platform>
-      </affected>
-      <description>The RPM package audit should be installed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package audit is installed"
-      test_ref="test_package_audit_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_audit_installed" version="1"
-  comment="package audit is installed">
-    <linux:object object_ref="obj_package_audit_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_audit_installed" version="1">
-    <linux:name>audit</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/Fedora/input/oval/oval_5.11/package_chrony_installed.xml b/Fedora/input/oval/oval_5.11/package_chrony_installed.xml
deleted file mode 100644
index e3e160df21e..00000000000
--- a/Fedora/input/oval/oval_5.11/package_chrony_installed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_chrony_installed"
-  version="1">
-    <metadata>
-      <title>Package chrony Installed</title>
-      <affected family="unix">
-        <platform>multi_platform_fedora</platform>
-      </affected>
-      <description>The RPM package chrony should be installed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package chrony is installed"
-      test_ref="test_package_chrony_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_chrony_installed" version="1"
-  comment="package chrony is installed">
-    <linux:object object_ref="obj_package_chrony_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_chrony_installed" version="1">
-    <linux:name>chrony</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/Fedora/input/oval/oval_5.11/package_firewalld_installed.xml b/Fedora/input/oval/oval_5.11/package_firewalld_installed.xml
deleted file mode 100644
index 6ee30331a1e..00000000000
--- a/Fedora/input/oval/oval_5.11/package_firewalld_installed.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_firewalld_installed"
-  version="1">
-    <metadata>
-      <title>Package firewalld Installed</title>
-      <affected family="unix">
-        <platform>multi_platform_fedora</platform>
-      </affected>
-      <description>The RPM package firewalld should be installed.</description>
-      <reference source="JL" ref_id="RHEL7_20140921" ref_url="test_attestation"/>
-    </metadata>
-    <criteria>
-      <criterion comment="package firewalld is installed"
-      test_ref="test_package_firewalld_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_firewalld_installed" version="1"
-  comment="package firewalld is installed">
-    <linux:object object_ref="obj_package_firewalld_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_firewalld_installed" version="1">
-    <linux:name>firewalld</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL/5/input/oval/package_audit_installed.xml b/RHEL/5/input/oval/package_audit_installed.xml
deleted file mode 100644
index b0073670ee2..00000000000
--- a/RHEL/5/input/oval/package_audit_installed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_audit_installed"
-  version="1">
-    <metadata>
-      <title>Package audit Installed</title>
-      <affected family="unix">
-        <platform>CentOS 4</platform>
-		<platform>CentOS 5</platform>
-		<platform>Red Hat Enterprise Linux 4</platform>
-		<platform>Red Hat Enterprise Linux 5</platform>
-      </affected>
-      <description>The RPM package audit should be installed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package audit is installed"
-      test_ref="test_package_audit_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_audit_installed" version="1"
-  comment="package audit is installed">
-    <linux:object object_ref="obj_package_audit_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_audit_installed" version="1">
-    <linux:name>audit</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL/5/input/oval/package_ntp_installed.xml b/RHEL/5/input/oval/package_ntp_installed.xml
deleted file mode 100644
index f354d66d81d..00000000000
--- a/RHEL/5/input/oval/package_ntp_installed.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_ntp_installed"
-  version="1">
-    <metadata>
-      <title>Package ntp Installed</title>
-      <affected family="unix">
-        <platform>CentOS 4</platform>
-		<platform>CentOS 5</platform>
-		<platform>Red Hat Enterprise Linux 4</platform>
-		<platform>Red Hat Enterprise Linux 5</platform>
-      </affected>
-      <description>The RPM package ntp should be installed.</description>
-    </metadata>
-    <criteria>
-      <criterion comment="package ntp is installed"
-      test_ref="test_package_ntp_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_ntp_installed" version="1"
-  comment="package ntp is installed">
-    <linux:object object_ref="obj_package_ntp_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_ntp_installed" version="1">
-    <linux:name>ntp</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL/6/input/oval/ntpd_specify_multiple_servers.xml b/RHEL/6/input/oval/ntpd_specify_multiple_servers.xml
new file mode 100644
index 00000000000..6787f46e8cf
--- /dev/null
+++ b/RHEL/6/input/oval/ntpd_specify_multiple_servers.xml
@@ -0,0 +1,29 @@
+<def-group>
+  <definition class="compliance" id="ntpd_specify_multiple_servers" version="2">
+    <metadata>
+      <title>Specify Multiple Remote ntpd NTP Server for Time Data</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>Multiple ntpd NTP Servers for time synchronization should be specified.</description>
+      <reference source="galford" ref_id="RHEL6_20141107" ref_url="test_attestation" />
+    </metadata>
+    <criteria comment="ntp.conf conditions are met">
+      <criterion test_ref="test_ntpd_multiple_servers" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test check="all" check_existence="all_exist"
+  comment="Ensure more than one ntpd NTP server is set" id="test_ntpd_multiple_servers"
+  version="1">
+    <ind:object object_ref="obj_ntpd_multiple_servers" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object comment="Ensure more than one ntpd NTP server is set"
+  id="obj_ntpd_multiple_servers" version="1">
+    <ind:filepath>/etc/ntp.conf</ind:filepath>
+    <ind:pattern operation="pattern match">^([\s]*server[\s]+.+$){2,}$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/RHEL/6/input/oval/ntpd_specify_remote_server.xml b/RHEL/6/input/oval/ntpd_specify_remote_server.xml
new file mode 100644
index 00000000000..611662f4881
--- /dev/null
+++ b/RHEL/6/input/oval/ntpd_specify_remote_server.xml
@@ -0,0 +1,30 @@
+<def-group>
+  <definition class="compliance" id="ntpd_specify_remote_server" version="2">
+    <metadata>
+      <title>Specify a Remote ntpd NTP Server for Time Data</title>
+      <affected family="unix">
+        <platform>Red Hat Enterprise Linux 6</platform>
+      </affected>
+      <description>A remote ntpd NTP Server for time synchronization should be
+      specified (and dependencies are met)</description>
+      <reference source="galford" ref_id="RHEL6_20141111" ref_url="test_attestation" />
+    </metadata>
+    <criteria comment="ntp.conf conditions are met">
+      <criterion test_ref="test_ntp_remote_server" />
+    </criteria>
+  </definition>
+
+  <ind:textfilecontent54_test check="all" check_existence="at_least_one_exists"
+  comment="Ensure at least one ntpd NTP server is set" id="test_ntp_remote_server"
+  version="1">
+    <ind:object object_ref="obj_ntp_remote_server" />
+  </ind:textfilecontent54_test>
+
+  <ind:textfilecontent54_object comment="Ensure at least one ntpd NTP server is set"
+  id="obj_ntp_remote_server" version="1">
+    <ind:filepath>/etc/ntp.conf</ind:filepath>
+    <ind:pattern operation="pattern match">^[\s]*server[\s]+.+$</ind:pattern>
+    <ind:instance datatype="int">1</ind:instance>
+  </ind:textfilecontent54_object>
+
+</def-group>
diff --git a/shared/oval/package_abrt_removed.xml b/RHEL/6/input/oval/package_abrt_removed.xml
similarity index 86%
rename from shared/oval/package_abrt_removed.xml
rename to RHEL/6/input/oval/package_abrt_removed.xml
index ca10cd99d4e..96925881221 100644
--- a/shared/oval/package_abrt_removed.xml
+++ b/RHEL/6/input/oval/package_abrt_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package abrt Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package abrt should be removed.</description>
-      <reference source="JL" ref_id="20140921" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="RHEL6_20160221" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package abrt is removed"
diff --git a/shared/oval/package_at_removed.xml b/RHEL/6/input/oval/package_at_removed.xml
similarity index 87%
rename from shared/oval/package_at_removed.xml
rename to RHEL/6/input/oval/package_at_removed.xml
index 3b6487a2485..9ee5fdb5971 100644
--- a/shared/oval/package_at_removed.xml
+++ b/RHEL/6/input/oval/package_at_removed.xml
@@ -5,11 +5,10 @@
     <metadata>
       <title>Package at Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package at should be removed.</description>
       <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20150606" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package at is removed"
diff --git a/shared/oval/package_bluez_removed.xml b/RHEL/6/input/oval/package_bluez_removed.xml
similarity index 87%
rename from shared/oval/package_bluez_removed.xml
rename to RHEL/6/input/oval/package_bluez_removed.xml
index 25f9cc56a18..6b4b02c9bec 100644
--- a/shared/oval/package_bluez_removed.xml
+++ b/RHEL/6/input/oval/package_bluez_removed.xml
@@ -4,11 +4,10 @@
     <metadata>
       <title>Package bluez Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package bluez should be removed.</description>
       <reference source="JL" ref_id="RHEL6_20141107" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20141107" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package bluez is removed"
diff --git a/RHEL/6/input/oval/package_cronie_installed.xml b/RHEL/6/input/oval/package_cronie_installed.xml
index 9cc6b9a3b3d..95f818ded6d 100644
--- a/RHEL/6/input/oval/package_cronie_installed.xml
+++ b/RHEL/6/input/oval/package_cronie_installed.xml
@@ -8,7 +8,7 @@
         <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package cronie should be installed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package cronie is installed"
diff --git a/shared/oval/package_iputils_removed.xml b/RHEL/6/input/oval/package_iputils_removed.xml
similarity index 88%
rename from shared/oval/package_iputils_removed.xml
rename to RHEL/6/input/oval/package_iputils_removed.xml
index 9dc0bcb4866..c242fe9b178 100644
--- a/shared/oval/package_iputils_removed.xml
+++ b/RHEL/6/input/oval/package_iputils_removed.xml
@@ -5,11 +5,10 @@
     <metadata>
       <title>Package iputils Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package iputils should be removed.</description>
       <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20150605" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package iputils is removed"
diff --git a/shared/oval/package_nfs-utils_removed.xml b/RHEL/6/input/oval/package_nfs-utils_removed.xml
similarity index 86%
rename from shared/oval/package_nfs-utils_removed.xml
rename to RHEL/6/input/oval/package_nfs-utils_removed.xml
index 0e1bdb6257d..fbc9cfe1f50 100644
--- a/shared/oval/package_nfs-utils_removed.xml
+++ b/RHEL/6/input/oval/package_nfs-utils_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package nfs-utils Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package nfs-utils should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package nfs-utils is removed"
diff --git a/shared/oval/package_oddjob_removed.xml b/RHEL/6/input/oval/package_oddjob_removed.xml
similarity index 88%
rename from shared/oval/package_oddjob_removed.xml
rename to RHEL/6/input/oval/package_oddjob_removed.xml
index 7aed49b8603..448186bf09d 100644
--- a/shared/oval/package_oddjob_removed.xml
+++ b/RHEL/6/input/oval/package_oddjob_removed.xml
@@ -5,11 +5,10 @@
     <metadata>
       <title>Package oddjob Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package oddjob should be removed.</description>
       <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20150606" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package oddjob is removed"
diff --git a/shared/oval/package_qpid-cpp-server_removed.xml b/RHEL/6/input/oval/package_qpid-cpp-server_removed.xml
similarity index 89%
rename from shared/oval/package_qpid-cpp-server_removed.xml
rename to RHEL/6/input/oval/package_qpid-cpp-server_removed.xml
index 59bfb46e56c..6b3573dbafd 100644
--- a/shared/oval/package_qpid-cpp-server_removed.xml
+++ b/RHEL/6/input/oval/package_qpid-cpp-server_removed.xml
@@ -5,11 +5,10 @@
     <metadata>
       <title>Package qpid-cpp-server Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package qpid-cpp-server should be removed.</description>
       <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20150606" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package qpid-cpp-server is removed"
diff --git a/RHEL/7/Makefile b/RHEL/7/Makefile
index dad886453a2..bd790e104c2 100644
--- a/RHEL/7/Makefile
+++ b/RHEL/7/Makefile
@@ -139,7 +139,19 @@ validate-xml:
 	oscap ds sds-validate $(OUT)/$(ID)-sl7-ds.xml
 
 validate: validate-xml
-	cd $(OUT); ../$(SHARED)/$(UTILS)/verify-references.py --rules-with-invalid-checks --ovaldefs-unused ssg-$(PROD)-xccdf.xml
+ifeq ($(OVAL_5_11), 0)
+	cd $(OUT); ../$(SHARED)/$(UTILS)/verify-references.py --rules-with-invalid-checks --ovaldefs-unused $(ID)-$(PROD)-xccdf.xml
+else
+	# If we are building against oscap version not supporting OVAL-5.11 language version yet,
+	# don't call verify-references.py with "--rules-with-invalid-checks" argument, since the
+	# OVAL checks using the 5.11 OVAL version will not be included in that case
+	@echo -e "\nWarning:\n"
+	@echo -e "\tRHEL/7 content build using oscap not supporting OVAL-5.11 language version detected!"
+	@echo -e "\tSince the OVAL-5.11 RHEL/7 OVAL checks are missing, will skip test for referenced,"
+	@echo -e "\tbut undefined OVAL definitions during content validation. Consider building RHEL/7"
+	@echo -e "\tcontent with version OpenSCAP-1.2.2, or newer in order to perform full content validation!\n"
+	cd $(OUT); ../$(SHARED)/$(UTILS)/verify-references.py --ovaldefs-unused $(ID)-$(PROD)-xccdf.xml
+endif
 
 eval-test:
 	# Rebuild the content indicating the 'test' profile should be included
diff --git a/RHEL/7/input/oval/oval_5.11/package_abrt_removed.xml b/RHEL/7/input/oval/oval_5.11/package_abrt_removed.xml
index 0c978bed7dd..39b39faab9e 100644
--- a/RHEL/7/input/oval/oval_5.11/package_abrt_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_abrt_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package abrt Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package abrt should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="RHEL7_20160221" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package abrt is removed"
diff --git a/RHEL/7/input/oval/oval_5.11/package_at_removed.xml b/RHEL/7/input/oval/oval_5.11/package_at_removed.xml
index b2aec5c2bda..a78764605b7 100644
--- a/RHEL/7/input/oval/oval_5.11/package_at_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_at_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package at Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package at should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL7_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package at is removed"
diff --git a/RHEL/7/input/oval/oval_5.11/package_bluez_removed.xml b/RHEL/7/input/oval/oval_5.11/package_bluez_removed.xml
index d3f603c294f..2d8736a933d 100644
--- a/RHEL/7/input/oval/oval_5.11/package_bluez_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_bluez_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package bluez Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package bluez should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL7_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package bluez is removed"
diff --git a/RHEL/7/input/oval/oval_5.11/package_iputils_removed.xml b/RHEL/7/input/oval/oval_5.11/package_iputils_removed.xml
index 1304cab7db7..746488c9fc2 100644
--- a/RHEL/7/input/oval/oval_5.11/package_iputils_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_iputils_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package iputils Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package iputils should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="RHEL7_20150605" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package iputils is removed"
diff --git a/RHEL/7/input/oval/oval_5.11/package_nfs-utils_removed.xml b/RHEL/7/input/oval/oval_5.11/package_nfs-utils_removed.xml
index 0e1bdb6257d..d2237490ae3 100644
--- a/RHEL/7/input/oval/oval_5.11/package_nfs-utils_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_nfs-utils_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package nfs-utils Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package nfs-utils should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL7_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package nfs-utils is removed"
diff --git a/RHEL/7/input/oval/package_ntp_installed.xml b/RHEL/7/input/oval/oval_5.11/package_ntp_installed.xml
similarity index 100%
rename from RHEL/7/input/oval/package_ntp_installed.xml
rename to RHEL/7/input/oval/oval_5.11/package_ntp_installed.xml
diff --git a/RHEL/7/input/oval/oval_5.11/package_oddjob_removed.xml b/RHEL/7/input/oval/oval_5.11/package_oddjob_removed.xml
index b88121ec0f0..c43cc125f3c 100644
--- a/RHEL/7/input/oval/oval_5.11/package_oddjob_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_oddjob_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package oddjob Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package oddjob should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="RHEL7_20150606" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package oddjob is removed"
diff --git a/RHEL/7/input/oval/oval_5.11/package_qpid-cpp-server_removed.xml b/RHEL/7/input/oval/oval_5.11/package_qpid-cpp-server_removed.xml
index 373d3248555..166ef48e03d 100644
--- a/RHEL/7/input/oval/oval_5.11/package_qpid-cpp-server_removed.xml
+++ b/RHEL/7/input/oval/oval_5.11/package_qpid-cpp-server_removed.xml
@@ -5,10 +5,10 @@
     <metadata>
       <title>Package qpid-cpp-server Removed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>The RPM package qpid-cpp-server should be removed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="RHEL7_20150606" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package qpid-cpp-server is removed"
diff --git a/RHEL/7/input/oval/package_firewalld_installed.xml b/RHEL/7/input/oval/package_firewalld_installed.xml
deleted file mode 100644
index f3397dcd90b..00000000000
--- a/RHEL/7/input/oval/package_firewalld_installed.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<def-group>
- <!-- THIS FILE IS GENERATED by create_package_installed.py.  DO NOT EDIT.  -->
-  <definition class="compliance" id="package_firewalld_installed"
-  version="1">
-    <metadata>
-      <title>Package firewalld Installed</title>
-      <affected family="unix">
-        <platform>Red Hat Enterprise Linux 7</platform>
-      </affected>
-      <description>The RPM package firewalld should be installed.</description>
-      <reference source="JL" ref_id="RHEL7_20140921" ref_url="test_attestation"/>
-    </metadata>
-    <criteria>
-      <criterion comment="package firewalld is installed"
-      test_ref="test_package_firewalld_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_firewalld_installed" version="1"
-  comment="package firewalld is installed">
-    <linux:object object_ref="obj_package_firewalld_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_firewalld_installed" version="1">
-    <linux:name>firewalld</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/RHEL/7/input/oval/chronyd_specify_multiple_servers.xml b/shared/oval/oval_5.11/chronyd_specify_multiple_servers.xml
similarity index 90%
rename from RHEL/7/input/oval/chronyd_specify_multiple_servers.xml
rename to shared/oval/oval_5.11/chronyd_specify_multiple_servers.xml
index 00fae2b3518..835751ed5b1 100644
--- a/RHEL/7/input/oval/chronyd_specify_multiple_servers.xml
+++ b/shared/oval/oval_5.11/chronyd_specify_multiple_servers.xml
@@ -4,9 +4,11 @@
       <title>Specify Multiple Remote chronyd NTP Servers for Time Data</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
+        <platform>multi_platform_fedora</platform>
       </affected>
       <description>Multiple chronyd NTP Servers for time synchronization should be specified.</description>
       <reference source="JL" ref_id="RHEL7_20150824" ref_url="test_attestation" />
+      <reference source="JL" ref_id="FEDORA22_20160221" ref_url="test_attestation" />
     </metadata>
     <criteria comment="chrony.conf conditions are met">
       <criterion test_ref="test_chronyd_multiple_servers" />
diff --git a/RHEL/7/input/oval/chronyd_specify_remote_server.xml b/shared/oval/oval_5.11/chronyd_specify_remote_server.xml
similarity index 90%
rename from RHEL/7/input/oval/chronyd_specify_remote_server.xml
rename to shared/oval/oval_5.11/chronyd_specify_remote_server.xml
index e2eb60b1ae7..2d4469d69ad 100644
--- a/RHEL/7/input/oval/chronyd_specify_remote_server.xml
+++ b/shared/oval/oval_5.11/chronyd_specify_remote_server.xml
@@ -4,10 +4,12 @@
       <title>Specify a Remote NTP Server for Time Data</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
+        <platform>multi_platform_fedora</platform>
       </affected>
       <description>A remote NTP Server for time synchronization should be
       specified (and dependencies are met)</description>
       <reference source="JL" ref_id="RHEL7_20150824" ref_url="test_attestation" />
+      <reference source="JL" ref_id="FEDORA22_20160221" ref_url="test_attestation" />
     </metadata>
     <criteria comment="chrony.conf conditions are met">
       <criterion test_ref="test_chronyd_remote_server" />
diff --git a/shared/oval/ntpd_specify_multiple_servers.xml b/shared/oval/oval_5.11/ntpd_specify_multiple_servers.xml
similarity index 88%
rename from shared/oval/ntpd_specify_multiple_servers.xml
rename to shared/oval/oval_5.11/ntpd_specify_multiple_servers.xml
index db183955c8f..9ec6955c3e5 100644
--- a/shared/oval/ntpd_specify_multiple_servers.xml
+++ b/shared/oval/oval_5.11/ntpd_specify_multiple_servers.xml
@@ -3,10 +3,10 @@
     <metadata>
       <title>Specify Multiple Remote ntpd NTP Server for Time Data</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>Multiple ntpd NTP Servers for time synchronization should be specified.</description>
-      <reference source="galford" ref_id="20141107" ref_url="test_attestation" />
+      <reference source="JL" ref_id="RHEL7_20160221" ref_url="test_attestation" />
     </metadata>
     <criteria comment="ntp.conf conditions are met">
       <criterion test_ref="test_ntpd_multiple_servers" />
diff --git a/shared/oval/ntpd_specify_remote_server.xml b/shared/oval/oval_5.11/ntpd_specify_remote_server.xml
similarity index 89%
rename from shared/oval/ntpd_specify_remote_server.xml
rename to shared/oval/oval_5.11/ntpd_specify_remote_server.xml
index 41a8cef0fbc..4b9dddf49db 100644
--- a/shared/oval/ntpd_specify_remote_server.xml
+++ b/shared/oval/oval_5.11/ntpd_specify_remote_server.xml
@@ -3,11 +3,11 @@
     <metadata>
       <title>Specify a Remote ntpd NTP Server for Time Data</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>Red Hat Enterprise Linux 7</platform>
       </affected>
       <description>A remote ntpd NTP Server for time synchronization should be
       specified (and dependencies are met)</description>
-      <reference source="galford" ref_id="20141111" ref_url="test_attestation" />
+      <reference source="JL" ref_id="RHEL7_20160221" ref_url="test_attestation" />
     </metadata>
     <criteria comment="ntp.conf conditions are met">
       <criterion test_ref="test_ntp_remote_server" />
diff --git a/RHEL/7/input/oval/package_audit_installed.xml b/shared/oval/oval_5.11/package_audit_installed.xml
similarity index 88%
rename from RHEL/7/input/oval/package_audit_installed.xml
rename to shared/oval/oval_5.11/package_audit_installed.xml
index 581d2a347a8..a057dadf55c 100644
--- a/RHEL/7/input/oval/package_audit_installed.xml
+++ b/shared/oval/oval_5.11/package_audit_installed.xml
@@ -6,9 +6,11 @@
       <title>Package audit Installed</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
+        <platform>multi_platform_fedora</platform>
       </affected>
       <description>The RPM package audit should be installed.</description>
       <reference source="JL" ref_id="RHEL7_20140921" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="FEDORA22_20160221" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package audit is installed"
diff --git a/RHEL/7/input/oval/package_chrony_installed.xml b/shared/oval/oval_5.11/package_chrony_installed.xml
similarity index 88%
rename from RHEL/7/input/oval/package_chrony_installed.xml
rename to shared/oval/oval_5.11/package_chrony_installed.xml
index 6bb88442011..9bd8d92aff1 100644
--- a/RHEL/7/input/oval/package_chrony_installed.xml
+++ b/shared/oval/oval_5.11/package_chrony_installed.xml
@@ -6,9 +6,11 @@
       <title>Package chrony Installed</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
+        <platform>multi_platform_fedora</platform>
       </affected>
       <description>The RPM package chrony should be installed.</description>
       <reference source="JL" ref_id="RHEL7_20140921" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="FEDORA22_20160221" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package chrony is installed"
diff --git a/Fedora/input/oval/oval_5.11/package_cronie_installed.xml b/shared/oval/oval_5.11/package_cronie_installed.xml
similarity index 79%
rename from Fedora/input/oval/oval_5.11/package_cronie_installed.xml
rename to shared/oval/oval_5.11/package_cronie_installed.xml
index 295dd2251f7..e0ff52afbf1 100644
--- a/Fedora/input/oval/oval_5.11/package_cronie_installed.xml
+++ b/shared/oval/oval_5.11/package_cronie_installed.xml
@@ -4,10 +4,12 @@
     <metadata>
       <title>Package cronie Installed</title>
       <affected family="unix">
+        <platform>Red Hat Enterprise Linux 7</platform>
         <platform>multi_platform_fedora</platform>
       </affected>
       <description>The RPM package cronie should be installed.</description>
-      <reference source="galford" ref_id="20150923" ref_url="test_attestation"/>
+      <reference source="galford" ref_id="RHEL7_20150923" ref_url="test_attestation"/>
+      <reference source="galford" ref_id="FEDORA22_20150923" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package cronie is installed"
diff --git a/shared/oval/package_firewalld_installed.xml b/shared/oval/oval_5.11/package_firewalld_installed.xml
similarity index 88%
rename from shared/oval/package_firewalld_installed.xml
rename to shared/oval/oval_5.11/package_firewalld_installed.xml
index f3397dcd90b..3277374543a 100644
--- a/shared/oval/package_firewalld_installed.xml
+++ b/shared/oval/oval_5.11/package_firewalld_installed.xml
@@ -6,9 +6,11 @@
       <title>Package firewalld Installed</title>
       <affected family="unix">
         <platform>Red Hat Enterprise Linux 7</platform>
+        <platform>multi_platform_fedora</platform>
       </affected>
       <description>The RPM package firewalld should be installed.</description>
       <reference source="JL" ref_id="RHEL7_20140921" ref_url="test_attestation"/>
+      <reference source="JL" ref_id="FEDORA22_20160221" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package firewalld is installed"
diff --git a/shared/oval/package_audit_installed.xml b/shared/oval/package_audit_installed.xml
index e1ea5d50b86..a989febfd97 100644
--- a/shared/oval/package_audit_installed.xml
+++ b/shared/oval/package_audit_installed.xml
@@ -5,11 +5,14 @@
     <metadata>
       <title>Package audit Installed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>CentOS 4</platform>
+        <platform>CentOS 5</platform>
+        <platform>Red Hat Enterprise Linux 4</platform>
+        <platform>Red Hat Enterprise Linux 5</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package audit should be installed.</description>
       <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
-      <reference source="JL" ref_id="RHEL7_20150605" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package audit is installed"
diff --git a/shared/oval/package_cronie_installed.xml b/shared/oval/package_cronie_installed.xml
deleted file mode 100644
index 36852a15086..00000000000
--- a/shared/oval/package_cronie_installed.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<def-group>
-  <definition class="compliance" id="package_cronie_installed"
-  version="1">
-    <metadata>
-      <title>Package cronie Installed</title>
-      <affected family="unix">
-        <platform>multi_platform_rhel</platform>
-      </affected>
-      <description>The RPM package cronie should be installed.</description>
-      <reference source="galford" ref_id="20150923" ref_url="test_attestation"/>
-    </metadata>
-    <criteria>
-      <criterion comment="package cronie is installed"
-      test_ref="test_package_cronie_installed" />
-    </criteria>
-  </definition>
-  <linux:rpminfo_test check="all" check_existence="all_exist"
-  id="test_package_cronie_installed" version="1"
-  comment="package cronie is installed">
-    <linux:object object_ref="obj_package_cronie_installed" />
-  </linux:rpminfo_test>
-  <linux:rpminfo_object id="obj_package_cronie_installed" version="1">
-    <linux:name>cronie</linux:name>
-  </linux:rpminfo_object>
-</def-group>
diff --git a/shared/oval/package_ntp_installed.xml b/shared/oval/package_ntp_installed.xml
index 0cd7b1785b9..fdfe04e85bf 100644
--- a/shared/oval/package_ntp_installed.xml
+++ b/shared/oval/package_ntp_installed.xml
@@ -5,10 +5,14 @@
     <metadata>
       <title>Package ntp Installed</title>
       <affected family="unix">
-        <platform>multi_platform_rhel</platform>
+        <platform>CentOS 4</platform>
+        <platform>CentOS 5</platform>
+        <platform>Red Hat Enterprise Linux 4</platform>
+        <platform>Red Hat Enterprise Linux 5</platform>
+        <platform>Red Hat Enterprise Linux 6</platform>
       </affected>
       <description>The RPM package ntp should be installed.</description>
-      <reference source="swells" ref_id="20130829" ref_url="test_attestation"/>
+      <reference source="swells" ref_id="RHEL6_20130829" ref_url="test_attestation"/>
     </metadata>
     <criteria>
       <criterion comment="package ntp is installed"