There were already both legacy and new PM RUN lines. Also make the NPM RUN line actually match the legacy PM RUN line.