Updated variable names to match our language syntax and the tests that use them.