include systematics in rest category and update NP naming