Client name fix