Changed some names in NORM