rename PB related functions to match its types (cont'd)