Remove references to pdf2john which is now gone
Rename npdf to pdf