GPII-784: Updated all NP sets to adhere to the new format with contexts