[client] Use readable variable names