move to new nsi 2.0 compliant error codes, while trying to keep compatible with some deprecated error codes for compat