Renaming pa_ap -> pa_ldp and pa_pp -> pa_advp