fixed client variable names