lib: client renames and minor changes