Update to new sql variable names