Fix NP engine model references