[PATCH 00/17] Updated NIST Mappings