Renaming and refactoring in  client_map.py