Rename client argument handling functions and update vty client
Resolve conflict