Update to NAI with suffix