Change var names to reflect types