Rename pp to pretty and some API changes.