Minor modification on var names