updated some variable names in client classes