[PATCH 22/22] Updated XCCDF/OVAL namings