Rename *_priv.* to *P.*