NIST mapping names added