refactor: renamed client model vars