Changed variables names

Matched Eric's variable names