Merge refactor from p4paul/master

Refactor name 'p4_client' to 'p4'