Fix NfNamingCode and remove NfcNamingCodes