Remove strong naming and update to latest NTS