Modified non-standard variable names

Modified non-standard variable names