Change var names to be accurate