Updating p2 after package refactoring.