Finish updating code for NPP product.