function naming is now consistent across P1 and P2