changed some variable names in client classes