Rename ClientState to ConnectionState