Replace ClientMap
with Client
in Account
#582
Merged
ClientMap
with Client
in Account
#582