rename client
reword messages
wording