Xnp21 use np21rc, np21.sav and np21.s??, not np2rc, np2.sav, np2.s??.
Use correct define for resume.