modified variable names to be consistent between server and client