Update to use new variable names