Added name support, fixed bug for displaying wrong names when in client mode