Changed variable names to reasonable ones in client