Returned back  to more universal variable names