- prereq.c (ID2S), id.h (ID2PF): renamed ID2S to ID2PF and moved it to id.h - prereq.c (push, satisfies, resolve): change ID2S to ID2PF