Rename client to agent, and server to master