Better names for some client sections