Change var names to protected