Changed client to give _ delmited names