Be consistent in naming vars