Client thread shutdown doesn't need to be exposed publicly.
Renamed some methods to make their purpose clearer.